envFrom

Author: shcherbak

charts/compress-state/Chart.yaml

@@ -3,7 +3,7 @@ apiVersion: v2
 name: compress-state
 description: Run rust-synapse-compress-state as a Kubernetes Job/CronJob
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "v0.1.4"
 sources:
   - https://github.com/matrix-org/rust-synapse-compress-state

charts/compress-state/templates/cron.yaml

@@ -33,24 +33,19 @@ spec:
               image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.appVersion }}"
               imagePullPolicy: {{ .Values.image.pullPolicy }}
               args:
-                - "--postgres-url=$(DATABASE_URL)"
+                - "--postgres-url=${DATABASE_URL}"
                 - "--chunk-size={{ .Values.cmdArgs.chunkSize }}"
                 - "--min-state-groups={{ .Values.cmdArgs.minStateGroups }}"
                 {{- if .Values.cmdArgs.progress }}
                 - "--progress"
                 {{- end }}
-              #
-              env:
-                - name: DATABASE_URL
-                  valueFrom:
-                    secretKeyRef:
-                      {{- if .Values.existingSecret.name }}
-                      name: {{ .Values.existingSecret.name }}
-                      key: {{ .Values.existingSecret.databaseUrlKey }}
-                      {{- else }}
-                      name: {{ include "synapse-compress-state.fullname" . }}
-                      key: DATABASE_URL
-                      {{- end }}
+              envFrom:
+                - secretRef:
+                    {{- if .Values.existingSecret.name }}
+                    name: {{ .Values.existingSecret.name }}
+                    {{- else }}
+                    name: {{ include "synapse-compress-state.fullname" . }}
+                    {{- end }}
               resources:
                 {{ toYaml .Values.resources | nindent 16 }}
           {{- if .Values.nodeSelector }}

charts/compress-state/templates/job.yaml

@@ -24,23 +24,19 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.appVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
-            - "--postgres-url=$(DATABASE_URL)"
+            - "--postgres-url=${DATABASE_URL}"
             - "--chunk-size={{ .Values.cmdArgs.chunkSize }}"
             - "--min-state-groups={{ .Values.cmdArgs.minStateGroups }}"
             {{- if .Values.cmdArgs.progress }}
             - "--progress"
             {{- end }}
-          env:
-            - name: DATABASE_URL
-              valueFrom:
-                secretKeyRef:
-                  {{- if .Values.existingSecret.name }}
-                  name: {{ .Values.existingSecret.name }}
-                  key: {{ .Values.existingSecret.databaseUrlKey }}
-                  {{- else }}
-                  name: {{ include "synapse-compress-state.fullname" . }}
-                  key: DATABASE_URL
-                  {{- end }}
+          envFrom:
+            - secretRef:
+                {{- if .Values.existingSecret.name }}
+                name: {{ .Values.existingSecret.name }}
+                {{- else }}
+                name: {{ include "synapse-compress-state.fullname" . }}
+                {{- end }}
           resources:
             {{ toYaml .Values.resources | nindent 12 }}
       {{- if .Values.nodeSelector }}

charts/compress-state/templates/secret.yaml

@@ -5,5 +5,5 @@ metadata:
   name: {{ include "synapse-compress-state.fullname" . }}
 type: Opaque
 data:
-  DATABASE_URL: {{ $v | toString | b64enc }}
+  DATABASE_URL: {{ .Values.databaseUrl | toString | b64enc }}
 {{- end }}

charts/compress-state/values.yaml

@@ -14,7 +14,6 @@ databaseUrl: ''
 existingSecret:
   #name: synapse-db
   name: ''
-  databaseUrlKey: database_url
 
 cmdArgs:
   chunkSize: 500