feat: secrets 3

main
Sven Ketelsen 4 years ago
parent d65dbf1a7c
commit 1ea138ab80

@ -11,10 +11,10 @@ data:
# try to get the old secret # try to get the old secret
# keep in mind, that a dry-run only returns an empty map # keep in mind, that a dry-run only returns an empty map
{{- $old_sec := lookup "v1" "Secret" .Release.Namespace $secret_name | default dict }} {{- $old_sec := lookup "v1" "Secret" .Release.Namespace $secret_name | default dict }}
{{- $old_sec_data := (get $old_sec "data") | default dict }} # {{- $old_sec_data := (get $old_sec "data") | default dict }}
{{- $jwtSecret := (get $old_sec_data "JWT_SECRET") | default (randAlphaNum 32 | b64enc) }} # {{- $jwtSecret := (get $old_sec_data "JWT_SECRET") | default (randAlphaNum 32 | b64enc) }}
JWT_SECRET: {{ $jwtSecret | quote }} JWT_SECRET: {{ default (randAlphaNum 32 | b64enc }}
ADMIN_PASSWORD: "{{ .Values.connect.database.password | b64enc}}" ADMIN_PASSWORD: "{{ .Values.connect.database.password | b64enc}}"
DATASOURCE_USERNAME: "{{ .Values.connect.database.username | b64enc }}" DATASOURCE_USERNAME: "{{ .Values.connect.database.username | b64enc }}"

@ -8,6 +8,8 @@ spec:
selector: selector:
matchLabels: matchLabels:
app: "wordpress" app: "wordpress"
strategy:
type: Recreate
template: template:
metadata: metadata:
labels: labels:
@ -29,12 +31,6 @@ spec:
hostnames: hostnames:
- "{{ .Values.sharedService.maria.host.name }}" - "{{ .Values.sharedService.maria.host.name }}"
containers: containers:
# - name: "ubuntu"
# image: "ubuntu:20.04"
# command:
# - sleep
# args:
# - "3600"
- name: "wordpress" - name: "wordpress"
image: "{{ .Values.harbor.host.name }}/{{ .Values.wordpress.image.name }}:{{ .Values.wordpress.image.version }}" image: "{{ .Values.harbor.host.name }}/{{ .Values.wordpress.image.name }}:{{ .Values.wordpress.image.version }}"
imagePullPolicy: Always imagePullPolicy: Always
@ -89,6 +85,12 @@ spec:
key: SMA_WORKFLOW_AUTH_TOKEN key: SMA_WORKFLOW_AUTH_TOKEN
ports: ports:
- containerPort: 80 - containerPort: 80
# - name: "ubuntu"
# image: "ubuntu:20.04"
# command:
# - sleep
# args:
# - "3600"
initContainers: initContainers:
- name: init-maria - name: init-maria
image: busybox:1.28 image: busybox:1.28

Loading…
Cancel
Save