fix typos in init-container merge

This commit is contained in:
Pete Birley 2017-01-19 23:49:22 +00:00
parent d1e1736413
commit f498fcb6dd
34 changed files with 68 additions and 68 deletions

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
{{- $dependencies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -22,7 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.scheduler }}
{{- $dependencies := .Values.dependencies.scheduler }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -22,7 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.volume }}
{{- $dependencies := .Values.dependencies.volume }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -22,7 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_init }}
{{- $dependencies := .Values.dependencies.db_init }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
{{- $dependencies := .Values.dependencies.db_sync }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,6 +1,6 @@
{{- $envAll := . }}
{{- $ksAdminSecret := $envAll.Values.keystone.admin_secret | default "cinder-env-keystone-admin" }}
{{- $dependecies := .Values.dependencies.ks_endpoints }}
{{- $dependencies := .Values.dependencies.ks_endpoints }}
apiVersion: batch/v1
kind: Job
metadata:
@ -10,7 +10,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,6 +1,6 @@
{{- $envAll := . }}
{{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }}
{{- $dependecies := .Values.dependencies.ks_service }}
{{- $dependencies := .Values.dependencies.ks_service }}
apiVersion: batch/v1
kind: Job
metadata:
@ -10,7 +10,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,7 +1,7 @@
{{- $ksAdminSecret := .Values.keystone.admin_secret | default "cinder-env-keystone-admin" }}
{{- $ksUserSecret := .Values.keystone.user_secret | default "cinder-env-keystone-user" }}
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.ks_user }}
{{- $dependencies := .Values.dependencies.ks_user }}
apiVersion: batch/v1
kind: Job
metadata:
@ -11,7 +11,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
{{- $dependencies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -24,7 +24,7 @@ spec:
app: glance-api
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.registry }}
{{- $dependencies := .Values.dependencies.registry }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -16,7 +16,7 @@ spec:
app: glance-registry
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
{{- $dependencies := .Values.dependencies.db_sync }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
{{- $dependencies := .Values.dependencies.init }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.post }}
{{- $dependencies := .Values.dependencies.post }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
{{- $dependencies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -12,7 +12,7 @@ spec:
app: heat-api
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.cfn }}
{{- $dependencies := .Values.dependencies.cfn }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -12,7 +12,7 @@ spec:
app: heat-cfn
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.cloudwatch }}
{{- $dependencies := .Values.dependencies.cloudwatch }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -12,7 +12,7 @@ spec:
app: heat-cloudwatch
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
{{- $dependencies := .Values.dependencies.init }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
{{- $dependencies := .Values.dependencies.db_sync }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,6 +1,6 @@
{{- $envAll := . }}
{{- $ksAdminSecret := .Values.keystone_secrets.admin }}
{{- $dependecies := .Values.dependencies.ks_endpoints }}
{{- $dependencies := .Values.dependencies.ks_endpoints }}
apiVersion: batch/v1
kind: Job
metadata:
@ -10,7 +10,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,6 +1,6 @@
{{- $envAll := . }}
{{- $ksAdminSecret := .Values.keystone_secrets.admin }}
{{- $dependecies := .Values.dependencies.ks_service }}
{{- $dependencies := .Values.dependencies.ks_service }}
apiVersion: batch/v1
kind: Job
metadata:
@ -10,7 +10,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.ks_user }}
{{- $dependencies := .Values.dependencies.ks_user }}
{{- $ksAdminSecret := .Values.keystone_secrets.admin }}
{{- $ksUserSecret := .Values.keystone_secrets.user }}
# The heat user management job is a bit different from other services as it also needs to create a stack domain and trusts user
@ -14,7 +14,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.engine }}
{{- $dependencies := .Values.dependencies.engine }}
apiVersion: apps/v1beta1
kind: StatefulSet
metadata:
@ -13,7 +13,7 @@ spec:
app: heat-engine
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.dashboard }}
{{- $dependencies := .Values.dependencies.dashboard }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -22,7 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
{{- $dependencies := .Values.dependencies.init }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.compute }}
{{- $dependencies := .Values.dependencies.compute }}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -13,7 +13,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.libvirt }}
{{- $dependencies := .Values.dependencies.libvirt }}
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
@ -13,7 +13,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
{{- $dependencies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -22,7 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.api }}
{{- $dependencies := .Values.dependencies.api }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -22,7 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.conductor }}
{{- $dependencies := .Values.dependencies.conductor }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -22,7 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.consoleauth }}
{{- $dependencies := .Values.dependencies.consoleauth }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -22,7 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.scheduler }}
{{- $dependencies := .Values.dependencies.scheduler }}
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
@ -22,7 +22,7 @@ spec:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
nodeSelector:

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.db_sync }}
{{- $dependencies := .Values.dependencies.db_sync }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.init }}
{{- $dependencies := .Values.dependencies.init }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure

View File

@ -1,5 +1,5 @@
{{- $envAll := . }}
{{- $dependecies := .Values.dependencies.post }}
{{- $dependencies := .Values.dependencies.post }}
apiVersion: batch/v1
kind: Job
metadata:
@ -9,7 +9,7 @@ spec:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{{ tuple $envAll $dependecies | include "dep-check-init-cont" | indent 10 }}
{{ tuple $envAll $dependencies | include "dep-check-init-cont" | indent 10 }}
]'
spec:
restartPolicy: OnFailure