Merge pull request #182 from alvarolop/main

🚑️ Quick fix for the Helm Chart 🚑️

Author: alvarolop

tooling/charts/tl500-base/templates/_helpers.tpl

@@ -90,51 +90,3 @@
 {{- print "example.com" -}}
 {{- end -}}
 {{- 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 $secretName) }}
-{{- if $existingSecret }}
-{{- $password = index $existingSecret.data "root_password" | b64dec }}
-{{- end -}}
-{{- end -}}
-{{- print $password -}}
-{{- 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 $secretName) }}
-{{- if $existingSecret }}
-{{- $username = index $existingSecret.data "postgres_user" | b64dec }}
-{{- end -}}
-{{- end -}}
-{{- print $username -}}
-{{- 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 $secretName) }}
-{{- if $existingSecret }}
-{{- $password = index $existingSecret.data "postgres_password" | b64dec }}
-{{- end -}}
-{{- end -}}
-{{- print $password -}}
-{{- 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 $secretName) }}
-{{- if $existingSecret }}
-{{- $password = index $existingSecret.data "postgres_admin_password" | b64dec }}
-{{- end -}}
-{{- end -}}
-{{- print $password -}}
-{{- end -}}

tooling/charts/tl500-base/templates/gitlab/secret-gitlab-ldap-password.yaml

@@ -0,0 +1,15 @@
+{{- if .Values.gitlab -}}
+{{ $root_pass := include "gitlab.ldap.bind_password" . }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "gitlab-ldap-password"
+  namespace: "{{ .Values.gitlab.namespace }}"
+  annotations:
+    "helm.sh/resource-policy": "keep"
+type: Opaque
+data:
+  password: {{ $root_pass | b64enc | quote }}
+immutable: true
+{{- end }}

tooling/charts/tl500-base/templates/gitlab/secrets.yaml

@@ -93,8 +93,8 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: tl500-gitlab-view
-  namespace: tl500-gitlab
+  name: gitlab-system-view
+  namespace: gitlab-system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

tooling/charts/tl500-base/templates/tl500-rbac.yaml

@@ -12,7 +12,6 @@ ipa_namespace: ipa
 namespaces:
   - name: tl500-workspaces
   - name: tl500-tech-exercise
-  - name: tl500-gitlab
   - name: tl500-shared
   - name: tl500-minio
   - name: gitlab-system

tooling/charts/tl500-base/values.yaml

@@ -6,7 +6,7 @@ metadata:
   namespace: gitlab-system
 spec:
   chart:
-    version: "9.5.2" # https://gitlab.com/gitlab-org/cloud-native/gitlab-operator/-/blob/<OPERATOR_VERSION>/CHART_VERSIONS
+    version: "9.6.0" # https://gitlab.com/gitlab-org/cloud-native/gitlab-operator/-/blob/<OPERATOR_VERSION>/CHART_VERSIONS
     values:
       nginx-ingress:
         enabled: false