feat(controller): hard fork

Signed-off-by: Oliver Bähler <[email protected]>

Author: oliverbaehler

.github/workflows/coverage.yml

@@ -83,7 +83,7 @@ jobs:
         uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          slug: projectcapsule/cortex-tenant
+          slug: projectcapsule/cortex-proxy
           files: ./coverage.out
           fail_ci_if_error: true
           verbose: true

.github/workflows/docker-publish.yml

@@ -38,9 +38,9 @@ jobs:
           repository: ${{ github.repository_owner }}
           version: ${{ steps.extract_version.outputs.version }}
           sign-image: true
-          sbom-name: cortex-tenant
-          sbom-repository: ghcr.io/${{ github.repository_owner }}/cortex-tenant
-          signature-repository: ghcr.io/${{ github.repository_owner }}/cortex-tenant
+          sbom-name: cortex-proxy
+          sbom-repository: ghcr.io/${{ github.repository_owner }}/cortex-proxy
+          signature-repository: ghcr.io/${{ github.repository_owner }}/cortex-proxy
           main-path: ./cmd/
         env:
           REPOSITORY: ${{ github.repository }}
@@ -52,7 +52,7 @@ jobs:
       actions: read     # To read the workflow path.
     uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
     with:
-      image: ghcr.io/${{ github.repository_owner }}/cortex-tenant
+      image: ghcr.io/${{ github.repository_owner }}/cortex-proxy
       digest: "${{ needs.publish-images.outputs.container-digest }}"
       registry-username: ${{ github.actor }}
     secrets:

.github/workflows/e2e.yaml

@@ -28,15 +28,15 @@ jobs:
         with:
           registry: ghcr.io
           repository: ${{ github.repository_owner }}/charts
-          name: "cortex-tenant"
-          path: "./charts/cortex-tenant/"
+          name: "cortex-proxy"
+          path: "./charts/cortex-proxy/"
           app-version: ${{ steps.extract_version.outputs.version }}
           version: ${{ steps.extract_version.outputs.version }}
           registry-username: ${{ github.actor }}
           registry-password: ${{ secrets.GITHUB_TOKEN }}
           update-dependencies: 'false' # Defaults to false
           sign-image: 'true'
-          signature-repository: ghcr.io/${{ github.repository_owner }}/charts/cortex-tenant
+          signature-repository: ghcr.io/${{ github.repository_owner }}/charts/cortex-proxy
   helm-provenance:
     needs: publish-helm
     permissions:
@@ -45,7 +45,7 @@ jobs:
       actions: read     # To read the workflow path.
     uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
     with:
-      image: ghcr.io/${{ github.repository_owner }}/charts/cortex-tenant
+      image: ghcr.io/${{ github.repository_owner }}/charts/cortex-proxy
       digest: "${{ needs.publish-helm.outputs.chart-digest }}"
       registry-username: ${{ github.actor }}
     secrets:

.github/workflows/helm-publish.yml

@@ -1,4 +1,4 @@
-project_name: capsule
+project_name: cortex-proxy
 env:
   - COSIGN_EXPERIMENTAL=true
   - GO111MODULE=on
@@ -38,11 +38,7 @@ release:
     - `ghcr.io/projectcapsule/{{ .ProjectName }}:latest`
 
     **Helm Chart**
-    View this release on [Artifact Hub](https://artifacthub.io/packages/helm/projectcapsule/capsule/{{ .Version }}) or use the OCI helm chart:
-
-    - `ghcr.io/projectcapsule/charts/{{ .ProjectName }}:{{ .Version }}`
-
-    [Review the Major Changes section first before upgrading to a new version](https://artifacthub.io/packages/helm/projectcapsule/capsule/{{ .Version }}#major-changes)
+    [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cortex-proxy)](https://artifacthub.io/packages/search?repo=cortex-proxy)
 
     **Kubernetes compatibility**
 

.goreleaser.yml

@@ -6,7 +6,7 @@ GOARCH          ?= $(shell go env GOARCH)
 
 # Defaults
 REGISTRY        ?= ghcr.io
-REPOSITORY      ?= projectcapsule/cortex-tenant
+REPOSITORY      ?= projectcapsule/cortex-proxy
 GIT_TAG_COMMIT  ?= $(shell git rev-parse --short $(VERSION))
 GIT_MODIFIED_1  ?= $(shell git diff $(GIT_HEAD_COMMIT) $(GIT_TAG_COMMIT) --quiet && echo "" || echo ".dev")
 GIT_MODIFIED_2  ?= $(shell git diff --quiet && echo "" || echo ".dirty")
@@ -120,8 +120,8 @@ ko-publish-all: ko-publish-controller
 SRC_ROOT = $(shell git rev-parse --show-toplevel)
 
 helm-controller-version:
-	$(eval VERSION := $(shell grep 'appVersion:' charts/cortex-tenant/Chart.yaml | awk '{print $$2}'))
-	$(eval KO_TAGS := $(shell grep 'appVersion:' charts/cortex-tenant/Chart.yaml | awk '{print $$2}'))
+	$(eval VERSION := $(shell grep 'appVersion:' charts/cortex-proxy/Chart.yaml | awk '{print $$2}'))
+	$(eval KO_TAGS := $(shell grep 'appVersion:' charts/cortex-proxy/Chart.yaml | awk '{print $$2}'))
 
 
 helm-docs: helm-doc
@@ -131,7 +131,7 @@ helm-lint: ct
 	@$(CT) lint --config .github/configs/ct.yaml --validate-yaml=false --all --debug
 
 helm-schema: helm-plugin-schema
-	cd charts/cortex-tenant && $(HELM) schema -output values.schema.json
+	cd charts/cortex-proxy && $(HELM) schema -output values.schema.json
 
 helm-test: kind ct
 	@$(KIND) create cluster --wait=60s --name $(KIND_K8S_NAME) --image=kindest/node:$(KIND_K8S_VERSION)
@@ -172,13 +172,13 @@ e2e-install-addon: e2e-load-image
 	    --dependency-update \
 		--debug \
 		--install \
-		--namespace cortex-tenant \
+		--namespace monitoring-system \
 		--create-namespace \
 		--set 'image.pullPolicy=Never' \
 		--set "image.tag=$(VERSION)" \
 		--set args.logLevel=10 \
-		cortex-tenant \
-		./charts/cortex-tenant
+		cortex-proxy \
+		./charts/cortex-proxy
 
 e2e-install-distro:
 	@$(KUBECTL) kustomize e2e/objects/flux/ | kubectl apply -f -

Makefile

@@ -1,19 +1,19 @@
 [!IMPORTANT]
-This project is a permanent hard-fork of the origin project.
+This project is a permanent hard-fork of the [origin project](https://github.com/blind-oracle/cortex-tenant).
 
 # Capsule ❤️ Cortex
 
 ![Capsule Cortex](docs/images/logo.png)
 
 <p align="center">
-<a href="https://github.com/projectcapsule/cortex-tenant/releases/latest">
-  <img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/projectcapsule/cortex-tenant?sort=semver">
+<a href="https://github.com/projectcapsule/cortex-proxy/releases/latest">
+  <img alt="GitHub release (latest SemVer)" src="https://img.shields.io/github/v/release/projectcapsule/cortex-proxy?sort=semver">
 </a>
 <a href="https://artifacthub.io/packages/search?repo=cortex-proxy">
   <img src="https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/cortex-proxy" alt="Artifact Hub">
 </a>
-<a href="https://codecov.io/gh/projectcapsule/cortex-tenant" >
- <img src="https://codecov.io/gh/projectcapsule/cortex-tenant/graph/badge.svg?token=F9Bkp6l8zR"/>
+<a href="https://codecov.io/gh/projectcapsule/cortex-proxy" >
+ <img src="https://codecov.io/gh/projectcapsule/cortex-proxy/graph/badge.svg?token=HER3gBKdqU"/>
  </a>
 </p>
 

README.md

@@ -1,12 +1,12 @@
 apiVersion: v2
-name: cortex-tenant
+name: cortex-proxy
 description: Capsule Cortex Tenant
 type: application
 # Note: The version is overwritten by the release workflow.
 version: 0.0.0
 # Note: The version is overwritten by the release workflow.
 appVersion: 0.0.0
-home: https://github.com/projectcapsule/cortex-tenant
+home: https://github.com/projectcapsule/cortex-proxy
 icon: https://github.com/projectcapsule/capsule/raw/main/assets/logo/capsule_small.png
 keywords:
 - kubernetes
@@ -18,4 +18,4 @@ keywords:
 - cortex
 - prometheus
 sources:
-  - https://github.com/projectcapsule/cortex-tenant
+  - https://github.com/projectcapsule/cortex-proxy

charts/cortex-tenant/.helmignore charts/cortex-proxy/.helmignore

@@ -1,20 +1,20 @@
 # Capsule ❤️ Cortex
 
-![Logo](https://github.com/projectcapsule/cortex-tenant/blob/main/docs/images/logo.png)
+![Logo](https://github.com/projectcapsule/cortex-proxy/blob/main/docs/images/logo.png)
 
 ## Installation
 
 1. Install Helm Chart:
 
-        $ helm install cortex-tenant oci://ghcr.io/projectcapsule/charts/cortex-tenant  -n monitioring-system
+        $ helm install cortex-tenant oci://ghcr.io/projectcapsule/charts/cortex-proxy  -n monitioring-system
 
 3. Show the status:
 
         $ helm status cortex-tenant -n monitioring-system
 
 4. Upgrade the Chart
 
-        $ helm upgrade cortex-tenant oci://ghcr.io/projectcapsule/charts/cortex-tenant --version 0.4.7
+        $ helm upgrade cortex-tenant oci://ghcr.io/projectcapsule/charts/cortex-proxy --version 0.4.7
 
 5. Uninstall the Chart
 

charts/cortex-tenant/.schema.yaml charts/cortex-proxy/.schema.yaml

@@ -1,20 +1,20 @@
 # Capsule ❤️ Cortex
 
-![Logo](https://github.com/projectcapsule/cortex-tenant/blob/main/docs/images/logo.png)
+![Logo](https://github.com/projectcapsule/cortex-proxy/blob/main/docs/images/logo.png)
 
 ## Installation
 
 1. Install Helm Chart:
 
-        $ helm install cortex-tenant oci://ghcr.io/projectcapsule/charts/cortex-tenant  -n monitioring-system
+        $ helm install cortex-tenant oci://ghcr.io/projectcapsule/charts/cortex-proxy  -n monitioring-system
 
 3. Show the status:
 
         $ helm status cortex-tenant -n monitioring-system
 
 4. Upgrade the Chart
 
-        $ helm upgrade cortex-tenant oci://ghcr.io/projectcapsule/charts/cortex-tenant --version 0.4.7
+        $ helm upgrade cortex-tenant oci://ghcr.io/projectcapsule/charts/cortex-proxy --version 0.4.7
 
 5. Uninstall the Chart
 

charts/cortex-tenant/Chart.yaml charts/cortex-proxy/Chart.yaml

@@ -6,6 +6,11 @@ import (
 
 	_ "github.com/KimMachineGun/automemlimit"
 	capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
+	"github.com/projectcapsule/cortex-proxy/internal/config"
+	"github.com/projectcapsule/cortex-proxy/internal/controllers"
+	"github.com/projectcapsule/cortex-proxy/internal/metrics"
+	"github.com/projectcapsule/cortex-proxy/internal/processor"
+	"github.com/projectcapsule/cortex-proxy/internal/stores"
 	_ "go.uber.org/automaxprocs"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -16,12 +21,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
-
-	"github.com/projectcapsule/cortex-tenant/internal/config"
-	"github.com/projectcapsule/cortex-tenant/internal/controllers"
-	"github.com/projectcapsule/cortex-tenant/internal/metrics"
-	"github.com/projectcapsule/cortex-tenant/internal/processor"
-	"github.com/projectcapsule/cortex-tenant/internal/stores"
 )
 
 var Version string

charts/cortex-tenant/README.md charts/cortex-proxy/README.md

@@ -1,4 +1,4 @@
-module github.com/projectcapsule/cortex-tenant
+module github.com/projectcapsule/cortex-proxy
 
 go 1.23.0
 

charts/cortex-tenant/README.md.gotmpl charts/cortex-proxy/README.md.gotmpl

@@ -7,7 +7,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/projectcapsule/cortex-tenant/internal/config"
+	"github.com/projectcapsule/cortex-proxy/internal/config"
 )
 
 var _ = Describe("Config Loading", func() {

charts/cortex-tenant/artifacthub-repo.yml charts/cortex-proxy/artifacthub-repo.yml

@@ -6,13 +6,12 @@ import (
 
 	"github.com/go-logr/logr"
 	capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
+	"github.com/projectcapsule/cortex-proxy/internal/metrics"
+	"github.com/projectcapsule/cortex-proxy/internal/stores"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/projectcapsule/cortex-tenant/internal/metrics"
-	"github.com/projectcapsule/cortex-tenant/internal/stores"
 )
 
 // CapsuleArgocdReconciler reconciles a CapsuleArgocd object.

charts/cortex-tenant/ci/test-values.yaml charts/cortex-proxy/ci/test-values.yaml

@@ -18,12 +18,11 @@ import (
 	"github.com/google/uuid"
 	me "github.com/hashicorp/go-multierror"
 	"github.com/pkg/errors"
+	"github.com/projectcapsule/cortex-proxy/internal/config"
+	"github.com/projectcapsule/cortex-proxy/internal/metrics"
+	"github.com/projectcapsule/cortex-proxy/internal/stores"
 	"github.com/prometheus/prometheus/prompb"
 	fh "github.com/valyala/fasthttp"
-
-	"github.com/projectcapsule/cortex-tenant/internal/config"
-	"github.com/projectcapsule/cortex-tenant/internal/metrics"
-	"github.com/projectcapsule/cortex-tenant/internal/stores"
 )
 
 type result struct {

charts/cortex-tenant/templates/_helpers.tpl charts/cortex-proxy/templates/_helpers.tpl

@@ -15,9 +15,9 @@ import (
 	fh "github.com/valyala/fasthttp"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/projectcapsule/cortex-tenant/internal/config"
-	"github.com/projectcapsule/cortex-tenant/internal/metrics"
-	"github.com/projectcapsule/cortex-tenant/internal/stores"
+	"github.com/projectcapsule/cortex-proxy/internal/config"
+	"github.com/projectcapsule/cortex-proxy/internal/metrics"
+	"github.com/projectcapsule/cortex-proxy/internal/stores"
 )
 
 var _ = Describe("Processor Forwarding", func() {

charts/cortex-tenant/templates/configuration.yaml charts/cortex-proxy/templates/configuration.yaml

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
-	"github.com/projectcapsule/cortex-tenant/internal/stores"
+	"github.com/projectcapsule/cortex-proxy/internal/stores"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	. "github.com/onsi/gomega"