Merge branch 'no-gitlab-redis-secret-clobber' into 'master'

No Gitlab Redis Secret Clobber

Closes platform-one/big-bang/apps/developer-tools/gitlab#126

See merge request platform-one/big-bang/bigbang!1431

chart/templates/gitlab/secret-redis.yaml → chart/templates/gitlab/secret-redis-bb.yaml

-{{- if or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled }}
-{{- if ne .Values.addons.gitlab.redis.password "" }}
+{{- if and (ne .Values.addons.gitlab.redis.password "") (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled) }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: gitlab-redis-secret
+  name: gitlab-redis-secret-bb
   namespace: gitlab
 type: Opaque
 data:
   secret: {{ .Values.addons.gitlab.redis.password | b64enc }}
 {{- end }}
-{{- end }}
\ No newline at end of file

chart/templates/gitlab/values.yaml

@@ -320,6 +320,12 @@ global:
     {{- end }}
   {{- end }}
 
+{{- if and (ne .Values.addons.gitlab.redis.password "") (or .Values.addons.gitlab.enabled .Values.addons.gitlabRunner.enabled) }}
+  redis:  
+    password:
+      secret: "gitlab-redis-secret-bb"
+{{- end }}
+
 {{- if ne .Values.addons.gitlab.objectStorage.iamProfile "" }}
 use_iam_profile: true
 {{- end }}

chart/templates/monitoring/values.yaml

@@ -139,6 +139,9 @@ grafana:
   {{- if $istioInjection }}
   podAnnotations:
     {{ include "istioAnnotation" . }}
+    {{- if $gitlabRedis }}
+    checksum/gitlabRedisPassword: {{ sha256sum .Values.addons.gitlab.redis.password }}
+    {{- end }}    
   {{- end }}
 
   {{- if or .Values.loki.enabled .Values.tempo.enabled $gitlabRedis $authserviceRedisEnabled .Values.addons.argocd.enabled }}