replace hardcoded names from secrets

Tim-herbie · butonic · commit 6ad642b15278 · 2025-06-24T13:53:47.000+02:00
diff --git a/charts/opencloud/templates/collabora/deployment.yaml b/charts/opencloud/templates/collabora/deployment.yaml
@@ -43,7 +43,7 @@ spec:
                   name: {{- if .Values.collabora.existingSecret }}
                           {{ .Values.collabora.existingSecret }}
                         {{- else }}
-                          collabora
+                          {{ include "opencloud.fullname" . }}-collabora
                         {{- end }}
                   key: username
             - name: password
@@ -52,7 +52,7 @@ spec:
                   name: {{- if .Values.collabora.existingSecret }}
                           {{ .Values.collabora.existingSecret }}
                         {{- else }}
-                          collabora
+                          {{ include "opencloud.fullname" . }}-collabora
                         {{- end }}
                   key: password
           ports:
diff --git a/charts/opencloud/templates/collabora/secrets.yaml b/charts/opencloud/templates/collabora/secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: collabora
+  name: {{ include "opencloud.fullname" . }}-collabora
 type: Opaque
 stringData:
   username: {{ .Values.collabora.username }}
diff --git a/charts/opencloud/templates/keycloak/deployment.yaml b/charts/opencloud/templates/keycloak/deployment.yaml
@@ -57,7 +57,7 @@ spec:
                   name: {{- if .Values.postgres.existingSecret }}
                           {{ .Values.postgres.existingSecret }}
                         {{- else }}
-                          postgres
+                          {{ include "opencloud.postgres.fullname" . }}
                         {{- end }}
                   key: username
             - name: KC_DB_PASSWORD
@@ -66,7 +66,7 @@ spec:
                   name: {{- if .Values.postgres.existingSecret }}
                           {{ .Values.postgres.existingSecret }}
                         {{- else }}
-                          postgres
+                          {{ include "opencloud.postgres.fullname" . }}
                         {{- end }}
                   key: password
             - name: KC_FEATURES
@@ -77,7 +77,7 @@ spec:
                   name: {{- if .Values.keycloak.existingSecret }}
                           {{ .Values.keycloak.existingSecret }}
                         {{- else }}
-                          keycloak
+                          {{ include "opencloud.keycloak.fullname" . }}
                         {{- end }}
                   key: adminUser
             - name: KEYCLOAK_ADMIN_PASSWORD
@@ -86,7 +86,7 @@ spec:
                   name: {{- if .Values.keycloak.existingSecret }}
                           {{ .Values.keycloak.existingSecret }}
                         {{- else }}
-                          keycloak
+                          {{ include "opencloud.keycloak.fullname" . }}
                         {{- end }}
                   key: adminPassword
             {{- if .Values.keycloak.internal.cors.enabled }}
diff --git a/charts/opencloud/templates/keycloak/secrets.yaml b/charts/opencloud/templates/keycloak/secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: keycloak
+  name: {{ include "opencloud.keycloak.fullname" . }}
 type: Opaque
 stringData:
   adminUser: {{ .Values.keycloak.adminUser }}
diff --git a/charts/opencloud/templates/minio/deployment.yaml b/charts/opencloud/templates/minio/deployment.yaml
@@ -54,7 +54,7 @@ spec:
                   name: {{- if .Values.opencloud.storage.s3.internal.existingSecret }}
                           {{ .Values.opencloud.storage.s3.internal.existingSecret }}
                         {{- else }}
-                          minio
+                          {{ include "opencloud.minio.fullname" . }}
                         {{- end }}
                   key: rootUser
             - name: MINIO_ROOT_PASSWORD
@@ -63,7 +63,7 @@ spec:
                   name: {{- if .Values.opencloud.storage.s3.internal.existingSecret }}
                           {{ .Values.opencloud.storage.s3.internal.existingSecret }}
                         {{- else }}
-                          minio
+                          {{ include "opencloud.minio.fullname" . }}
                         {{- end }}
                   key: rootPassword
           ports:
diff --git a/charts/opencloud/templates/minio/secrets.yaml b/charts/opencloud/templates/minio/secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: minio
+  name: {{ include "opencloud.minio.fullname" . }}
 type: Opaque
 stringData:
   rootUser: {{ .Values.opencloud.storage.s3.internal.rootUser }}
diff --git a/charts/opencloud/templates/onlyoffice/deployment.yaml b/charts/opencloud/templates/onlyoffice/deployment.yaml
@@ -44,7 +44,7 @@ spec:
                   name: {{- if .Values.onlyoffice.config.coAuthoring.secret.existingSecret }}
                           {{ .Values.onlyoffice.config.coAuthoring.secret.existingSecret }}
                         {{- else }}
-                          onlyoffice
+                          {{ include "opencloud.fullname" . }}-onlyoffice
                         {{- end }}
                   key: sessionSecret
             - name: JWT_HEADER
@@ -55,7 +55,7 @@ spec:
                   name: {{- if .Values.onlyoffice.config.rabbitmq.existingSecret }}
                           {{ .Values.onlyoffice.config.rabbitmq.existingSecret }}
                         {{- else }}
-                          rabbitmq
+                          {{ include "opencloud.fullname" . }}-rabbitmq
                         {{- end }}
                   key: url
           ports:
diff --git a/charts/opencloud/templates/onlyoffice/secrets.yaml b/charts/opencloud/templates/onlyoffice/secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: onlyoffice
+  name: {{ include "opencloud.fullname" . }}-onlyoffice
 type: Opaque
 stringData:
   sessionSecret: {{ .Values.onlyoffice.config.coAuthoring.secret.session.string }}
@@ -12,7 +12,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: rabbitmq
+  name: {{ include "opencloud.fullname" . }}-rabbitmq
 type: Opaque
 stringData:
   url: {{ .Values.onlyoffice.config.rabbitmq.url }}
diff --git a/charts/opencloud/templates/opencloud/deployment.yaml b/charts/opencloud/templates/opencloud/deployment.yaml
@@ -263,7 +263,7 @@ spec:
                   name: {{- if .Values.opencloud.existingSecret }}
                           {{ .Values.opencloud.existingSecret }}
                         {{- else }}
-                          opencloud
+                          {{ include "opencloud.opencloud.fullname" . }}
                         {{- end }}
                   key: adminPassword
             # Demo users
@@ -298,7 +298,7 @@ spec:
                           {{- if .Values.opencloud.storage.s3.external.existingSecret }}
                             {{ .Values.opencloud.storage.s3.external.existingSecret }}
                           {{- else }}
-                            opencloud-s3
+                            {{ include "opencloud.opencloud.fullname" . }}-s3
                           {{- end }}
                         {{- else }}
                           minio
@@ -315,7 +315,7 @@ spec:
                           {{- if .Values.opencloud.storage.s3.external.existingSecret }}
                             {{ .Values.opencloud.storage.s3.external.existingSecret }}
                           {{- else }}
-                            opencloud-s3
+                            {{ include "opencloud.opencloud.fullname" . }}-s3
                           {{- end }}
                         {{- else }}
                           minio
diff --git a/charts/opencloud/templates/opencloud/secrets.yaml b/charts/opencloud/templates/opencloud/secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: opencloud-smtp
+  name: {{ include "opencloud.opencloud.fullname" . }}-smtp
 type: Opaque
 stringData:
   smtpUser: {{ .Values.opencloud.smtp.username }}
@@ -13,7 +13,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: opencloud
+  name: {{ include "opencloud.opencloud.fullname" . }}
 type: Opaque
 stringData:
   adminPassword: {{ .Values.opencloud.adminPassword }}
@@ -23,7 +23,7 @@ stringData:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: opencloud-s3
+  name: {{ include "opencloud.opencloud.fullname" . }}-s3
 type: Opaque
 stringData:
   accessKey: {{ .Values.opencloud.storage.s3.external.accessKey }}
diff --git a/charts/opencloud/templates/postgres/secrets.yaml b/charts/opencloud/templates/postgres/secrets.yaml
@@ -0,0 +1,10 @@
+{{- if and (not .Values.postgres.existingSecret) .Values.postgres.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "opencloud.postgres.fullname" . }}
+type: Opaque
+stringData:
+  username: {{ .Values.postgres.user }}
+  password: {{ .Values.postgres.password }}
+{{- end }}
