Merge "Images: Ceilometer service specific explicit image names"

This commit is contained in:
Zuul 2017-11-29 15:24:38 +00:00 committed by Gerrit Code Review
commit 039bbe9fcc
7 changed files with 12 additions and 12 deletions

@ -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:

@ -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:

@ -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:

@ -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:

@ -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:

@ -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:

@ -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"