From 327294358fd2ea8f9261dd84a2c84984f312db90 Mon Sep 17 00:00:00 2001 From: portdirect Date: Tue, 28 Nov 2017 22:28:31 -0500 Subject: [PATCH] Images: Ceilometer service specific explicit image names This PS makes the service-specific images for Ceilometer have explicit names, allowing simple over-riding of images for an entire site. Change-Id: I0ea331db7894f4865065a66f868a1e2cb6e750f5 --- ceilometer/templates/deployment-api.yaml | 2 +- ceilometer/templates/deployment-central.yaml | 2 +- ceilometer/templates/deployment-collector.yaml | 2 +- ceilometer/templates/deployment-compute.yaml | 2 +- ceilometer/templates/deployment-notification.yaml | 2 +- ceilometer/templates/job-db-sync.yaml | 2 +- ceilometer/values.yaml | 12 ++++++------ 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ceilometer/templates/deployment-api.yaml b/ceilometer/templates/deployment-api.yaml index 3fdb448537..acaf52f51b 100644 --- a/ceilometer/templates/deployment-api.yaml +++ b/ceilometer/templates/deployment-api.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-api - image: {{ .Values.images.tags.api }} + image: {{ .Values.images.tags.ceilometer_api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml index 589916531b..dfcde25720 100644 --- a/ceilometer/templates/deployment-central.yaml +++ b/ceilometer/templates/deployment-central.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_central_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-central - image: {{ .Values.images.tags.central }} + image: {{ .Values.images.tags.ceilometer_central }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.central | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/deployment-collector.yaml b/ceilometer/templates/deployment-collector.yaml index 39146d69a5..5a10b0a0db 100644 --- a/ceilometer/templates/deployment-collector.yaml +++ b/ceilometer/templates/deployment-collector.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_collector_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-collector - image: {{ .Values.images.tags.collector }} + image: {{ .Values.images.tags.ceilometer_collector }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.collector | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/deployment-compute.yaml b/ceilometer/templates/deployment-compute.yaml index d26fa07633..26a7c76f3b 100644 --- a/ceilometer/templates/deployment-compute.yaml +++ b/ceilometer/templates/deployment-compute.yaml @@ -46,7 +46,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-compute - image: {{ .Values.images.tags.compute }} + image: {{ .Values.images.tags.ceilometer_compute }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml index 18c9f1c7a4..ff3bf41b39 100644 --- a/ceilometer/templates/deployment-notification.yaml +++ b/ceilometer/templates/deployment-notification.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_notification_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-notification - image: {{ .Values.images.tags.notification }} + image: {{ .Values.images.tags.ceilometer_notification }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.notification | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/job-db-sync.yaml b/ceilometer/templates/job-db-sync.yaml index cff4bd63dc..11ffed95b1 100644 --- a/ceilometer/templates/job-db-sync.yaml +++ b/ceilometer/templates/job-db-sync.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-db-sync - image: {{ .Values.images.tags.db_sync }} + image: {{ .Values.images.tags.ceilometer_db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 2e787580ce..ae53658659 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -42,15 +42,15 @@ images: test: docker.io/kolla/ubuntu-binary-rally:4.0.0 db_init_mongodb: docker.io/mongo:3.4.9-jessie db_init: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 + ceilometer_db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - api: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3 - central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3 - collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3 - compute: quay.io/larryrensing/ubuntu-source-ceilometer-compute:3.0.3 - notification: quay.io/larryrensing/ubuntu-source-ceilometer-notification:3.0.3 + ceilometer_api: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3 + ceilometer_central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3 + ceilometer_collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3 + ceilometer_compute: quay.io/larryrensing/ubuntu-source-ceilometer-compute:3.0.3 + ceilometer_notification: quay.io/larryrensing/ubuntu-source-ceilometer-notification:3.0.3 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent"