add CH_USER_ADMIN_PASSWORD env

containerum · Jun 6, 2018 · 2ada2f9 · 2ada2f9
1 parent ac10cb5
commit 2ada2f9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/charts/user-manager/templates/deployment.yaml b/charts/user-manager/templates/deployment.yaml
@@ -32,39 +32,34 @@ spec:
             - name: {{ $key  }}
               value: {{ $val | quote }}
             {{- end }}
-
             {{- if .Values.env.local.CH_USER_PG_ADDR }}
             - name: CH_USER_PG_ADDR
               value: "{{ .Values.env.local.CH_USER_PG_ADDR }}"
             {{- else }}
             - name: CH_USER_PG_ADDR
               value: "{{ .Release.Name }}-postgresql:5432"
             {{- end }}
-
             {{- if .Values.env.local.CH_USER_PERMISSIONS_URL }}
             - name: CH_USER_PERMISSIONS_URL
               value: "{{ .Values.env.local.CH_USER_PERMISSIONS_URL }}"
             {{- else }}
             - name: CH_USER_PERMISSIONS_URL
               value: "http://{{ .Release.Name }}-permissions:4242"
             {{- end }}
-
             {{- if .Values.env.local.CH_USER_AUTH_GRPC_ADDR }}
             - name: CH_USER_AUTH_GRPC_ADDR
               value: "{{ .Values.env.local.CH_USER_AUTH_GRPC_ADDR }}"
             {{- else }}
             - name: CH_USER_AUTH_GRPC_ADDR
               value: "http://{{ .Release.Name }}-auth:1112"
             {{- end }}
-
             {{- if .Values.env.local.CH_USER_MAIL_URL }}
             - name: CH_USER_MAIL_URL
               value: "{{ .Values.env.local.CH_USER_MAIL_URL }}"
             {{- else }}
             - name: CH_USER_MAIL_URL
               value: "http://{{ .Release.Name }}-mail:7070"
             {{- end }}
-
             {{- if .Values.env.local.CH_USER_PG_PASSWORD }}
             - name: CH_USER_PG_PASSWORD
               valueFrom:
@@ -78,3 +73,10 @@ spec:
                   name: {{ .Release.Name }}-postgresql
                   key: postgres-password
             {{- end }}
+            {{- if .Values.env.local.CH_USER_ADMIN_PASSWORD }}
+            - name: CH_USER_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "fullname" . }}
+                  key: admin-password
+            {{- end }}
diff --git a/charts/user-manager/templates/secret.yaml b/charts/user-manager/templates/secret.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.env.local.CH_USER_PG_PASSWORD }}
+{{- if or .Values.env.local.CH_USER_PG_PASSWORD .Values.env.local.CH_USER_ADMIN_PASSWORD }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -13,4 +13,7 @@ data:
   {{- if .Values.env.local.CH_USER_PG_PASSWORD }}
   pg-password: {{ .Values.env.local.CH_USER_PG_PASSWORD | b64enc }}
   {{- end }}
+  {{- if .Values.env.local.CH_USER_ADMIN_PASSWORD }}
+  admin-password: {{ .Values.env.local.CH_USER_ADMIN_PASSWORD | b64enc }}
+  {{- end }}
 {{- end }}
diff --git a/charts/user-manager/values.yaml b/charts/user-manager/values.yaml
@@ -37,6 +37,7 @@ env:
     CH_USER_PERMISSIONS_URL: "http://permissions:4242"
     CH_USER_AUTH_GRPC_ADDR: "auth:1112"
     CH_USER_MAIL_URL: "mail-templater:7070"
+    CH_USER_ADMIN_PASSWORD:
 
 postgresql:
   persistence: