Merge "Fix for missing init container in rbd-provisioner"

This commit is contained in:
Jenkins 2017-09-25 18:46:22 +00:00 committed by Gerrit Code Review
commit c7c4199469
2 changed files with 3 additions and 1 deletions

View File

@ -34,6 +34,8 @@ spec:
spec: spec:
affinity: affinity:
{{ tuple $envAll "rbd" "provisioner" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} {{ tuple $envAll "rbd" "provisioner" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
initContainers:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: ceph-rbd-provisioner - name: ceph-rbd-provisioner
image: {{ .Values.images.rbd_provisioner }} image: {{ .Values.images.rbd_provisioner }}

View File

@ -257,7 +257,7 @@ dependencies:
- service: ceph_mon - service: ceph_mon
endpoint: internal endpoint: internal
rbd_provisioner: rbd_provisioner:
jobs: services:
- service: ceph_mon - service: ceph_mon
endpoint: internal endpoint: internal
ks_user: ks_user: