[sonarqube] remove secret creation from postgres chart

moveaxlab · Apr 2, 2020 · 74ca616 · 74ca616
1 parent 7a6d1f4
commit 74ca616
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/charts/sonarqube/charts/postgresql/templates/deployment.yaml b/charts/sonarqube/charts/postgresql/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
         - name: POSTGRES_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: sonar-postgres-sealed-secret
+              name: sonarqube-postgres-secret
               key: postgres-password
         - name: POD_IP
           valueFrom: { fieldRef: { fieldPath: status.podIP } }

diff --git a/charts/sonarqube/charts/postgresql/templates/secrets.yaml b/charts/sonarqube/charts/postgresql/templates/secrets.yaml
diff --git a/charts/sonarqube/templates/secret.yaml b/charts/sonarqube/templates/secret.yaml
@@ -1,18 +1,18 @@
 {{- if eq .Values.database.type "postgresql" -}}
-{{- if eq .Values.postgresql.enabled false -}}
-{{- if .Values.postgresql.postgresqlPasswordSecret -}}
+{{- if eq .Values.postgresql.enabled true -}}
+
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "sonarqube.name" . }}-postgres-secret
 type: Opaque
 data:
-  postgres-password: {{ .Values.secrets.postgresPassword | b64enc }}  
-{{- end -}}
+  postgres-password: {{ .Values.secrets.postgresPassword | b64enc }} 
+---
 {{- end -}}
 {{- end -}}
 {{- if eq .Values.database.type "mysql" -}}
-{{- if eq .Values.mysql.enabled false -}}
+{{- if eq .Values.mysql.enabled true -}}
 {{- if not .Values.mysql.mysqlPasswordSecret -}}
 apiVersion: v1
 kind: Secret