From d30e93e4533fc940d729031fb24b92b9b7c36c43 Mon Sep 17 00:00:00 2001 From: Anthony Lin Date: Tue, 24 Oct 2017 00:45:01 +0000 Subject: [PATCH] Update DeckHand Chart There has been recent changes to the Helm Toolkit which broke the DeckHand Chart The changes in Helm Toolkit were made to the 'images' definition in values.yaml to facilitate adding the option to prefix image name etc This P.S. updates the DeckHand Chart to align with the recent changes in Helm Toolkit Change-Id: I0c9ddfd8b06be7dedcd030d94e381bf4e3f1d210 --- charts/deckhand/templates/deployment.yaml | 2 +- charts/deckhand/templates/job-db-init.yaml | 2 +- charts/deckhand/templates/job-db-sync.yaml | 2 +- charts/deckhand/templates/job-ks-endpoints.yaml | 2 +- charts/deckhand/templates/job-ks-service.yaml | 2 +- charts/deckhand/templates/job-ks-user.yaml | 2 +- charts/deckhand/values.yaml | 15 ++++++++------- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/charts/deckhand/templates/deployment.yaml b/charts/deckhand/templates/deployment.yaml index 46c80d1c..b4e92be1 100644 --- a/charts/deckhand/templates/deployment.yaml +++ b/charts/deckhand/templates/deployment.yaml @@ -41,7 +41,7 @@ spec: {{ tuple $envAll $dependencies $mounts_deckhand_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: deckhand - image: {{ .Values.images.deckhand }} + image: {{ .Values.images.tags.deckhand }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} ports: diff --git a/charts/deckhand/templates/job-db-init.yaml b/charts/deckhand/templates/job-db-init.yaml index d42f9950..d9259057 100644 --- a/charts/deckhand/templates/job-db-init.yaml +++ b/charts/deckhand/templates/job-db-init.yaml @@ -37,7 +37,7 @@ spec: {{ tuple $envAll $dependencies $mounts_deckhand_db_init_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: deckhand-db-init - image: {{ .Values.images.db_init | quote }} + image: {{ .Values.images.tags.db_init | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/charts/deckhand/templates/job-db-sync.yaml b/charts/deckhand/templates/job-db-sync.yaml index 08cb29db..e2cd894d 100644 --- a/charts/deckhand/templates/job-db-sync.yaml +++ b/charts/deckhand/templates/job-db-sync.yaml @@ -37,7 +37,7 @@ spec: {{ tuple $envAll $dependencies $mounts_deckhand_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: deckhand-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/charts/deckhand/templates/job-ks-endpoints.yaml b/charts/deckhand/templates/job-ks-endpoints.yaml index 69dec1bf..1dd5ceac 100644 --- a/charts/deckhand/templates/job-ks-endpoints.yaml +++ b/charts/deckhand/templates/job-ks-endpoints.yaml @@ -33,7 +33,7 @@ spec: {{- range $key1, $osServiceType := tuple "deckhand" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/charts/deckhand/templates/job-ks-service.yaml b/charts/deckhand/templates/job-ks-service.yaml index 50c8d45a..778069f7 100644 --- a/charts/deckhand/templates/job-ks-service.yaml +++ b/charts/deckhand/templates/job-ks-service.yaml @@ -34,7 +34,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "deckhand" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} command: - /tmp/ks-service.sh diff --git a/charts/deckhand/templates/job-ks-user.yaml b/charts/deckhand/templates/job-ks-user.yaml index 9a55bd91..3b5ffec3 100644 --- a/charts/deckhand/templates/job-ks-user.yaml +++ b/charts/deckhand/templates/job-ks-user.yaml @@ -30,7 +30,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: deckhand-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/charts/deckhand/values.yaml b/charts/deckhand/values.yaml index 558821fa..10cf2191 100644 --- a/charts/deckhand/values.yaml +++ b/charts/deckhand/values.yaml @@ -19,13 +19,14 @@ labels: node_selector_value: enabled images: - deckhand: quay.io/attcomdev/deckhand:latest - dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 - db_init: docker.io/postgres:9.5 - db_sync: docker.io/postgres:9.5 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + tags: + deckhand: quay.io/attcomdev/deckhand:latest + dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 + db_init: docker.io/postgres:9.5 + db_sync: docker.io/postgres:9.5 + ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 pull_policy: "IfNotPresent" release_group: null