openstack/openstack-helm
Code Issues Proposed changes

Adjust formatting

Browse Source 
Signed-off-by: DTadrzak <daniel.tadrzak@intel.com>
This commit is contained in:
DTadrzak 2017-01-13 13:44:16 +01:00
parent d3d38876c8
commit f4283675d5
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
common/templates/_funcs.tpl
View File

@ -22,7 +22,7 @@
{{- include $wtf $context | sha256sum | quote -}}
{{- end -}}
{{- define "dep-check-init-cont-header"}}
{{- define "dep-check-init-cont-header" -}}
pod.beta.kubernetes.io/init-containers: '[
{
"name": "init",
@ -35,24 +35,24 @@ pod.beta.kubernetes.io/init-containers: '[
},
{{- end -}}
{{- define "init-containers-footer" }}
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
{{- define "dep-check-init-cont-footer" }}
{
"name": "INTERFACE_NAME",
"value": "eth0"
},
{
"name": "DEPENDENCY_SERVICE",
"value": "{{ include "joinListWithColon" .service }}"
},
{
"name": "DEPENDENCY_JOBS",
"value": "{{ include "joinListWithColon" .jobs }}"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
{{- end -}}

4
glance/templates/api.yaml
View File

@ -17,8 +17,8 @@ spec:
labels:
app: glance-api
annotations:
{{ include "dep-check-init-cont-header" . | indent 8 }}
{{ include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
{{- include "dep-check-init-cont-header" . | indent 8 }}
{{- include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
spec:
nodeSelector:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}