pull-policy-fix

This commit is contained in:
Pete Birley 2017-01-19 23:15:52 +00:00
parent c532b5c4d8
commit e9ae4bb3ca
6 changed files with 21 additions and 21 deletions

View File

@ -11,7 +11,7 @@ spec:
app: nova-compute
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.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 }}
]'
@ -26,7 +26,7 @@ spec:
containers:
- name: nova-compute
image: {{ .Values.images.compute }}
imagePullPolicy: Always
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
privileged: true
command:
@ -87,7 +87,7 @@ spec:
- name: cgroup
hostPath:
path: /sys/fs/cgroup
{{- if .Values.ceph.enabled }}
{{- if .Values.ceph.enabled }}
- name: cephconf
configMap:
name: nova-etc
@ -99,5 +99,5 @@ spec:
name: nova-etc
items:
- key: ceph.client.cinder.keyring.yaml
path: ceph.client.cinder.keyring.yaml
{{- end }}
path: ceph.client.cinder.keyring.yaml
{{- end }}

View File

@ -11,7 +11,7 @@ spec:
app: nova-libvirt
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.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 }}
]'
@ -25,7 +25,7 @@ spec:
containers:
- name: nova-libvirt
image: {{ .Values.images.libvirt }}
imagePullPolicy: Always
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
privileged: true
command:
@ -58,7 +58,7 @@ spec:
subPath: ceph.conf
- name: cephclientcinderkeyring
mountPath: /etc/ceph/ceph.client.{{ .Values.ceph.cinder_user }}.keyring
subPath: ceph.client.{{ .Values.ceph.cinder_user }}.keyring
subPath: ceph.client.{{ .Values.ceph.cinder_user }}.keyring
{{- end }}
volumes:
- name: libvirtdconf
@ -107,4 +107,4 @@ spec:
items:
- key: ceph.client.cinder.keyring.yaml
path: ceph.client.cinder.keyring.yaml
{{- end }}
{{- end }}

View File

@ -13,14 +13,14 @@ spec:
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
{{ end }}
{{ end }}
template:
metadata:
labels:
app: nova-osapi
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.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 }}
]'
@ -30,7 +30,7 @@ spec:
containers:
- name: nova-osapi
image: {{ .Values.images.api }}
imagePullPolicy: {{ .Values.image.pull_policy }}
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
capabilities:
add:

View File

@ -13,14 +13,14 @@ spec:
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
{{ end }}
{{ end }}
template:
metadata:
labels:
app: nova-conductor
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.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 }}
]'
@ -30,7 +30,7 @@ spec:
containers:
- name: nova-conductor
image: {{ .Values.images.conductor }}
imagePullPolicy: {{ .Values.image.pull_policy }}
imagePullPolicy: {{ .Values.images.pull_policy }}
command:
- nova-conductor
- --config-file

View File

@ -13,14 +13,14 @@ spec:
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
{{ end }}
{{ end }}
template:
metadata:
labels:
app: nova-consoleauth
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.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 }}
]'
@ -30,7 +30,7 @@ spec:
containers:
- name: nova-consoleauth
image: {{ .Values.images.consoleauth }}
imagePullPolicy: {{ .Values.image.pull_policy }}
imagePullPolicy: {{ .Values.images.pull_policy }}
command:
- nova-consoleauth
- --config-file

View File

@ -13,14 +13,14 @@ spec:
rollingUpdate:
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
{{ end }}
{{ end }}
template:
metadata:
labels:
app: nova-scheduler
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.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 }}
]'
@ -30,7 +30,7 @@ spec:
containers:
- name: nova-scheduler
image: {{ .Values.images.scheduler }}
imagePullPolicy: {{ .Values.image.pull_policy }}
imagePullPolicy: {{ .Values.images.pull_policy }}
command:
- nova-scheduler
- --config-file