openstack/openstack-helm
Code Issues Proposed changes

Images: Ceilometer service specific explicit image names

Browse Source 
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
This commit is contained in:
portdirect 2017-11-28 22:28:31 -05:00 committed by Pete Birley
parent f5a6a5dedc
commit 327294358f
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/templates/deployment-api.yaml
View File

@ -44,7 +44,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_ceilometer_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_ceilometer_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: ceilometer-api - name: ceilometer-api
image: {{ .Values.images.tags.api }} image: {{ .Values.images.tags.ceilometer_api }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: command:

2
ceilometer/templates/deployment-central.yaml
View File

@ -43,7 +43,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_ceilometer_central_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_ceilometer_central_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: ceilometer-central - name: ceilometer-central
image: {{ .Values.images.tags.central }} image: {{ .Values.images.tags.ceilometer_central }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.central | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.central | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: command:

2
ceilometer/templates/deployment-collector.yaml
View File

@ -43,7 +43,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_ceilometer_collector_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_ceilometer_collector_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: ceilometer-collector - name: ceilometer-collector
image: {{ .Values.images.tags.collector }} image: {{ .Values.images.tags.ceilometer_collector }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.collector | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.collector | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: command:

2
ceilometer/templates/deployment-compute.yaml
View File

@ -46,7 +46,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_ceilometer_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_ceilometer_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: ceilometer-compute - name: ceilometer-compute
image: {{ .Values.images.tags.compute }} image: {{ .Values.images.tags.ceilometer_compute }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: command:

2
ceilometer/templates/deployment-notification.yaml
View File

@ -43,7 +43,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_ceilometer_notification_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_ceilometer_notification_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: ceilometer-notification - name: ceilometer-notification
image: {{ .Values.images.tags.notification }} image: {{ .Values.images.tags.ceilometer_notification }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.notification | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.notification | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: command:

2
ceilometer/templates/job-db-sync.yaml
View File

@ -32,7 +32,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: ceilometer-db-sync - name: ceilometer-db-sync
image: {{ .Values.images.tags.db_sync }} image: {{ .Values.images.tags.ceilometer_db_sync }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: command:

12
ceilometer/values.yaml
View File

@ -42,15 +42,15 @@ images:
test: docker.io/kolla/ubuntu-binary-rally:4.0.0 test: docker.io/kolla/ubuntu-binary-rally:4.0.0
db_init_mongodb: docker.io/mongo:3.4.9-jessie db_init_mongodb: docker.io/mongo:3.4.9-jessie
db_init: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 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_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
ks_service: 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 ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
api: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3 ceilometer_api: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3
central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3 ceilometer_central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3
collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3 ceilometer_collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3
compute: quay.io/larryrensing/ubuntu-source-ceilometer-compute:3.0.3 ceilometer_compute: quay.io/larryrensing/ubuntu-source-ceilometer-compute:3.0.3
notification: quay.io/larryrensing/ubuntu-source-ceilometer-notification: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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"