diff --git a/k8s/deployment/templates/deployment.yaml.tpl b/k8s/deployment/templates/deployment.yaml.tpl index d16fdf0d..ab9c237d 100644 --- a/k8s/deployment/templates/deployment.yaml.tpl +++ b/k8s/deployment/templates/deployment.yaml.tpl @@ -223,7 +223,6 @@ spec: {{ end }} {{ end }} {{ end }} - - name: application envFrom: - secretRef: @@ -281,6 +280,34 @@ spec: terminationMessagePath: /dev/termination-log terminationMessagePolicy: File imagePullPolicy: IfNotPresent + volumeMounts: + {{- if .parameters.results }} + {{- range .parameters.results }} + {{- if and (eq .type "file") }} + {{- if gt (len .values) 0 }} + - name: {{ printf "file-%s" (filepath.Base .destination_path | strings.ReplaceAll "." "-") }} + mountPath: {{ .destination_path }} + subPath: {{ filepath.Base .destination_path }} + readOnly: true + {{- end }} + {{- end }} + {{- end }} + {{- end }} + volumes: +{{- if .parameters.results }} + {{- range .parameters.results }} + {{- if and (eq .type "file") }} + {{- if gt (len .values) 0 }} + - name: {{ printf "file-%s" (filepath.Base .destination_path | strings.ReplaceAll "." "-") }} + secret: + secretName: s-{{ $.scope.id }}-d-{{ $.deployment.id }} + items: + - key: {{ printf "app-data-%s" (filepath.Base .destination_path) }} + path: {{ filepath.Base .destination_path }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} restartPolicy: Always terminationGracePeriodSeconds: 30 dnsPolicy: ClusterFirst diff --git a/k8s/deployment/templates/secret.yaml.tpl b/k8s/deployment/templates/secret.yaml.tpl index f5918577..baa9564d 100644 --- a/k8s/deployment/templates/secret.yaml.tpl +++ b/k8s/deployment/templates/secret.yaml.tpl @@ -39,7 +39,7 @@ data: {{- end }} {{- if and (eq .type "file") }} {{- if gt (len .values) 0 }} - {{ printf "app-data-%s" (filepath.Base .destination_path) }}: {{ index .values 0 "value" | strings.TrimPrefix "data:application/json;base64," }} + {{ printf "app-data-%s" (filepath.Base .destination_path) }}: {{ index .values 0 "value" | regexp.Replace "^data:[^;]+;base64," "" }} {{- end }} {{- end }} {{- end }}