openstack/openstack-helm
Code Issues Proposed changes

Adding missing labels and mounts to heat-trusts job

Browse Source 
Change-Id: I19c85574f78d2c90019ad1f94cba45630c8f48de
Signed-off-by: Mateusz Blaszkowski <mateusz.blaszkowski@intel.com>
This commit is contained in:
Mateusz Blaszkowski 2017-09-04 04:38:09 -04:00
parent 198162a073
commit 6e2ae0b739
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
heat/templates/job-trusts.yaml
View File

@ -14,6 +14,9 @@
{{- $envAll := . }} {{- $envAll := . }}
{{- $dependencies := .Values.dependencies.trusts }} {{- $dependencies := .Values.dependencies.trusts }}
{{- $mounts_heat_trusts := .Values.pod.mounts.heat_trusts.heat_trusts }}
{{- $mounts_heat_trusts_init := .Values.pod.mounts.heat_trusts.init_container }}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
@ -21,12 +24,15 @@ metadata:
name: heat-trusts name: heat-trusts
spec: spec:
template: template:
metadata:
labels:
{{ tuple $envAll "heat" "trusts" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
nodeSelector: nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
initContainers: initContainers:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_heat_trusts_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: heat-trusts - name: heat-trusts
image: {{ $envAll.Values.images.ks_service }} image: {{ $envAll.Values.images.ks_service }}
@ -40,6 +46,7 @@ spec:
mountPath: /tmp/trusts.sh mountPath: /tmp/trusts.sh
subPath: trusts.sh subPath: trusts.sh
readOnly: true readOnly: true
{{ if $mounts_heat_trusts.volumeMounts }}{{ toYaml $mounts_heat_trusts.volumeMounts | indent 12 }}{{ end }}
env: env:
{{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.admin }} {{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.admin }}
{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}
@ -52,3 +59,5 @@ spec:
- name: heat-bin - name: heat-bin
configMap: configMap:
name: heat-bin name: heat-bin
defaultMode: 0555
{{ if $mounts_heat_trusts.volumes }}{{ toYaml $mounts_heat_trusts.volumes | indent 8 }}{{ end }}

3
heat/values.yaml
View File

@ -459,6 +459,9 @@ pod:
heat_bootstrap: heat_bootstrap:
init_container: null init_container: null
heat_bootstrap: heat_bootstrap:
heat_trusts:
init_container: null
heat_trusts:
replicas: replicas:
api: 1 api: 1
cfn: 1 cfn: 1