#185 use prefix for resources

cloudogu · Jul 23, 2024 · 051755f · 051755f
1 parent e7183aa
commit 051755f
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # Set these to the desired values
 ARTIFACT_ID=k8s-dogu-operator
-VERSION=1.2.0
+VERSION=1.2.0-test
 
 IMAGE=cloudogu/${ARTIFACT_ID}:${VERSION}
 GOTAG=1.22
@@ -100,3 +100,11 @@ mocks: ${MOCKERY_BIN} ## Generate all mocks for the dogu operator.
 	@${MOCKERY_BIN} --output internal/cloudogu/mocks --srcpkg github.com/cloudogu/k8s-dogu-operator/internal/cloudogu --all
 	@${MOCKERY_BIN} --output internal/thirdParty/mocks --srcpkg github.com/cloudogu/k8s-dogu-operator/internal/thirdParty --all
 	@echo "Mocks successfully created."
+
+.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/config/samples/k8s_v1_dogurestart.yaml b/config/samples/k8s_v1_dogurestart.yaml
@@ -5,4 +5,4 @@ metadata:
   # Use `kubectl create` instead.
   generateName: cas-restart-
 spec:
- doguName: cas
+ doguName: confluence
diff --git a/config/samples/official/ldap-mapper.yaml b/config/samples/official/ldap-mapper.yaml
@@ -6,4 +6,4 @@ metadata:
     app: ces
 spec:
   name: official/ldap-mapper
-  version: 1.3.0
+  version: 1.3.0-1
diff --git a/config/samples/official/postgresql.yaml b/config/samples/official/postgresql.yaml
@@ -6,6 +6,6 @@ metadata:
     app: ces
 spec:
   name: official/postgresql
-  version: 12.15-1
+  version: 12.18-1
   resources:
     dataVolumeSize: "1Gi"
diff --git a/config/samples/premium/confluence.yaml b/config/samples/premium/confluence.yaml
@@ -6,4 +6,4 @@ metadata:
     app: ces
 spec:
   name: premium/confluence
-  version: 7.13.8-1
+  version: 8.5.9-1
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-dogu-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
@@ -10,5 +10,5 @@ roleRef:
   name: '{{ include "k8s-dogu-operator.name" . }}-cluster-role'
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "k8s-dogu-operator.name" . }}-controller-manager'
+  name: '{{ include "k8s-dogu-operator.name" . }}-sa
   namespace: '{{ .Release.Namespace }}'
diff --git a/k8s/helm/templates/deployment.yaml b/k8s/helm/templates/deployment.yaml
@@ -116,7 +116,7 @@ spec:
           subPath: docker-registry-cert.pem
       securityContext:
         runAsNonRoot: true
-      serviceAccountName: {{ include "k8s-dogu-operator.name" . }}-controller-manager
+      serviceAccountName: {{ include "k8s-dogu-operator.name" . }}-sa
       terminationGracePeriodSeconds: 10
       volumes:
       - name: docker-registry-cert

diff --git a/k8s/helm/templates/metrics-service.yaml b/k8s/helm/templates/metrics-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "k8s-dogu-operator.name" . }}-controller-manager-metrics-service
+  name: {{ include "k8s-dogu-operator.name" . }}-metrics-service
   labels:
     control-plane: controller-manager
     {{- include "k8s-dogu-operator.labels" . | nindent 4 }}

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-dogu-operator.name" . }}-controller-manager
+  name: {{ include "k8s-dogu-operator.name" . }}-sa
   labels:
     {{- include "k8s-dogu-operator.labels" . | nindent 4 }}
diff --git a/k8s/helm/values.yaml b/k8s/helm/values.yaml
@@ -4,7 +4,7 @@ additionalImages:
 controllerManager:
   image:
     repository: cloudogu/k8s-dogu-operator
-    tag: 1.2.0
+    tag: 1.2.0-test
   imagePullPolicy: IfNotPresent
   env:
     logLevel: debug