Merge "Elasticsearch Secret Vars"

This commit is contained in:
Zuul 2020-05-14 15:48:28 +00:00 committed by Gerrit Code Review
commit 9df8b4ee94
2 changed files with 30 additions and 0 deletions

View File

@ -174,6 +174,9 @@ spec:
key: S3_SECRET_KEY key: S3_SECRET_KEY
{{- if .Values.pod.env.client }} {{- if .Values.pod.env.client }}
{{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.pod.env.client | indent 12 }} {{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.pod.env.client | indent 12 }}
{{- end }}
{{- if .Values.pod.env.secrets }}
{{ tuple $envAll .Values.pod.env.secrets | include "helm-toolkit.utils.to_k8s_env_secret_vars" | indent 12 }}
{{- end }} {{- end }}
volumeMounts: volumeMounts:
- name: pod-tmp - name: pod-tmp

View File

@ -0,0 +1,27 @@
{{/*
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
{{- if and .Values.manifests.secret_environment .Values.pod.env.secrets }}
{{- $envAll := . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ printf "%s-%s" $envAll.Release.Name "env-secret" | quote }}
type: Opaque
data:
{{- range $key, $value := .Values.pod.env.secrets }}
{{ $key | upper }}: {{ $value | b64enc }}
{{- end }}
{{- end }}