🚧 revise gitlab resources to fix bugs on helm upgrade 🚧

rht-labs · Nov 21, 2024 · ef609bc · ef609bc
1 parent 1058eaf
commit ef609bc
Show file tree

Hide file tree

Showing 10 changed files with 157 additions and 112 deletions.
diff --git a/tooling/charts/tl500-base/templates/_helpers.tpl b/tooling/charts/tl500-base/templates/_helpers.tpl
@@ -92,9 +92,10 @@
 {{- end -}}
 
 {{- define "gitlab.root_password" -}}
+{{- $secretName := (printf "%v-credentials" .Values.gitlab.app_name) -}}
 {{- $password := default (randAlphaNum 10) .Values.gitlab.credentials.root_password }}
 {{- if not .Values.gitlab.credentials.root_password }}
-{{- $existingSecret := (lookup "v1" "Secret" .Values.gitlab.namespace "gitlab-credentials") }}
+{{- $existingSecret := (lookup "v1" "Secret" .Values.gitlab.namespace $secretName) }}
 {{- if $existingSecret }}
 {{- $password = index $existingSecret.data "root_password" | b64dec }}
 {{- end -}}
@@ -103,9 +104,10 @@
 {{- end -}}
 
 {{- define "gitlab.postgres.user" -}}
+{{- $secretName := (printf "%v-credentials" .Values.gitlab.app_name) -}}
 {{- $username := default (randAlphaNum 10) .Values.gitlab.credentials.postgres_user }}
 {{- if not .Values.gitlab.credentials.postgres_user }}
-{{- $existingSecret := (lookup "v1" "Secret" .Values.gitlab.namespace "gitlab-credentials") }}
+{{- $existingSecret := (lookup "v1" "Secret" .Values.gitlab.namespace $secretName) }}
 {{- if $existingSecret }}
 {{- $username = index $existingSecret.data "postgres_user" | b64dec }}
 {{- end -}}
@@ -114,9 +116,10 @@
 {{- end -}}
 
 {{- define "gitlab.postgres.password" -}}
+{{- $secretName := (printf "%v-credentials" .Values.gitlab.app_name) -}}
 {{- $password := default (randAlphaNum 10) .Values.gitlab.credentials.postgres_password }}
 {{- if not .Values.gitlab.credentials.postgres_password }}
-{{- $existingSecret := (lookup "v1" "Secret" .Values.gitlab.namespace "gitlab-credentials") }}
+{{- $existingSecret := (lookup "v1" "Secret" .Values.gitlab.namespace $secretName) }}
 {{- if $existingSecret }}
 {{- $password = index $existingSecret.data "postgres_password" | b64dec }}
 {{- end -}}
@@ -125,9 +128,10 @@
 {{- end -}}
 
 {{- define "gitlab.postgres.admin_password" -}}
+{{- $secretName := (printf "%v-credentials" .Values.gitlab.app_name) -}}
 {{- $password := default (randAlphaNum 10) .Values.gitlab.credentials.postgres_admin_password }}
 {{- if not .Values.gitlab.credentials.postgres_admin_password }}
-{{- $existingSecret := (lookup "v1" "Secret" .Values.gitlab.namespace "gitlab-credentials") }}
+{{- $existingSecret := (lookup "v1" "Secret" .Values.gitlab.namespace $secretName) }}
 {{- if $existingSecret }}
 {{- $password = index $existingSecret.data "postgres_admin_password" | b64dec }}
 {{- end -}}

diff --git a/tooling/charts/tl500-base/templates/gitlab/anyuid-scc.yaml b/tooling/charts/tl500-base/templates/gitlab/anyuid-scc.yaml
@@ -2,13 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: system:openshift:scc:anyuid
+  name: system:openshift:scc:anyuid-{{ .Values.gitlab.app_name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: system:openshift:scc:anyuid
 subjects:
 - kind: ServiceAccount
-  name: {{ .Values.gitlab_app_name }}-user
+  name: {{ .Values.gitlab.app_name }}-user
   namespace: {{ .Values.gitlab.namespace }}
 {{- end }}