#61 fix name collisions

the cluster role had a static name and therefore collided with other ces installations. Also the name was too long. We should shorten all names. We don't need `controller-manager` as a suffix everywhere
cloudogu · Jul 22, 2024 · c9681f6 · c9681f6
1 parent 67d4292
commit c9681f6
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -106,3 +106,11 @@ helm-repo-config-local: ## Creates a configMap and a local config.json for the h
 print-debug-info: ## Generates info and the list of environment variables required to start the operator in debug mode.
 	@echo "The target generates a list of env variables required to start the operator in debug mode. These can be pasted directly into the 'go build' run configuration in IntelliJ to run and debug the operator on-demand."
 	@echo "STAGE=$(STAGE);LOG_LEVEL=$(LOG_LEVEL);KUBECONFIG=$(KUBECONFIG);NAMESPACE=$(NAMESPACE)"
+
+.PHONY: upload-to-k8s-testing
+upload-to-k8s-testing: helm-package compile
+	gcloud auth configure-docker europe-west3-docker.pkg.dev -q
+	helm push target/k8s/helm/$(ARTIFACT_ID)-$(VERSION).tgz oci://europe-west3-docker.pkg.dev/ces-coder-workspaces/ces-test-docker-helm-repo/charts
+	helm push target/k8s/helm/$(ARTIFACT_ID)-$(VERSION).tgz oci://registry.cloudogu.com/k8s-testing
+	docker build . -t europe-west3-docker.pkg.dev/ces-coder-workspaces/ces-test-docker-helm-repo/images/$(ARTIFACT_ID):$(VERSION)
+	docker push europe-west3-docker.pkg.dev/ces-coder-workspaces/ces-test-docker-helm-repo/images/$(ARTIFACT_ID):$(VERSION)
diff --git a/k8s/helm/templates/_helpers.tpl b/k8s/helm/templates/_helpers.tpl
@@ -4,7 +4,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Kubernetes 1.4+.
 */}}
 {{- define "k8s-component-operator.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{ .Release.Namespace }}-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 

diff --git a/k8s/helm/templates/cluster-role-binding-rbac.yaml b/k8s/helm/templates/cluster-role-binding-rbac.yaml
@@ -7,8 +7,8 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: k8s-component-operator-cluster-role
+  name: {{ include "k8s-component-operator.name" . }}-cluster-role
 subjects:
   - kind: ServiceAccount
-    name: k8s-component-operator-controller-manager
+    name: {{ include "k8s-component-operator.name" . }}-sa
     namespace: '{{ .Release.Namespace }}'
diff --git a/k8s/helm/templates/deployment.yaml b/k8s/helm/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "k8s-component-operator.name" . }}-controller-manager
+  name: {{ include "k8s-component-operator.name" . }}
   labels:
     control-plane: controller-manager
     {{- include "k8s-component-operator.labels" . | nindent 4 }}
@@ -81,7 +81,7 @@ spec:
               readOnly: true
       securityContext:
         runAsNonRoot: true
-      serviceAccountName: {{ include "k8s-component-operator.name" . }}-controller-manager
+      serviceAccountName: {{ include "k8s-component-operator.name" . }}-sa
       terminationGracePeriodSeconds: 10
       volumes:
         - name: component-operator-helm-registry

diff --git a/k8s/helm/templates/leader-election-rbac.yaml b/k8s/helm/templates/leader-election-rbac.yaml
@@ -49,5 +49,5 @@ roleRef:
   name: '{{ include "k8s-component-operator.name" . }}-leader-election-role'
 subjects:
   - kind: ServiceAccount
-    name: '{{ include "k8s-component-operator.name" . }}-controller-manager'
+    name: '{{ include "k8s-component-operator.name" . }}-sa'
     namespace: '{{ .Release.Namespace }}'
diff --git a/k8s/helm/templates/manager-rbac.yaml b/k8s/helm/templates/manager-rbac.yaml
@@ -24,5 +24,5 @@ roleRef:
   name: '{{ include "k8s-component-operator.name" . }}-manager-role'
 subjects:
   - kind: ServiceAccount
-    name: '{{ include "k8s-component-operator.name" . }}-controller-manager'
+    name: '{{ include "k8s-component-operator.name" . }}-sa'
     namespace: '{{ .Release.Namespace }}'
diff --git a/k8s/helm/templates/metrics-service.yaml b/k8s/helm/templates/metrics-service.yaml
@@ -1,7 +1,8 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "k8s-component-operator.name" . }}-controller-manager-metrics-service
+  # name was too long (max 63 chars)
+  name: {{ include "k8s-component-operator.name" . }}-metrics-service
   labels:
     control-plane: controller-manager
   {{- include "k8s-component-operator.labels" . | nindent 4 }}

diff --git a/k8s/helm/templates/proxy-rbac.yaml b/k8s/helm/templates/proxy-rbac.yaml
@@ -30,5 +30,5 @@ roleRef:
   name: '{{ include "k8s-component-operator.name" . }}-proxy-role'
 subjects:
   - kind: ServiceAccount
-    name: '{{ include "k8s-component-operator.name" . }}-controller-manager'
+    name: '{{ include "k8s-component-operator.name" . }}-sa'
     namespace: '{{ .Release.Namespace }}'
diff --git a/k8s/helm/templates/serviceaccount.yaml b/k8s/helm/templates/serviceaccount.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "k8s-component-operator.name" . }}-controller-manager
+  name: {{ include "k8s-component-operator.name" . }}-sa
   labels:
     {{- include "k8s-component-operator.labels" . | nindent 4 }}