Images: Cinder service specific explicit image names
This PS makes the service-specific images for Cinder have explicit names, allowing simple over-riding of images for an entire site. Change-Id: Id9d9de1185fa2545e40e096b3f355c17be1fe5c5
This commit is contained in:
parent
f5a6a5dedc
commit
e711295a61
@ -41,7 +41,7 @@ spec:
|
|||||||
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
|
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
|
||||||
containers:
|
containers:
|
||||||
- name: cinder-volume-usage-audit
|
- name: cinder-volume-usage-audit
|
||||||
image: {{ .Values.images.tags.volume_usage_audit }}
|
image: {{ .Values.images.tags.cinder_volume_usage_audit }}
|
||||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.jobs.volume_usage_audit | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.jobs.volume_usage_audit | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
|
||||||
command:
|
command:
|
||||||
|
@ -44,7 +44,7 @@ spec:
|
|||||||
{{ tuple $envAll $dependencies $mounts_cinder_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
{{ tuple $envAll $dependencies $mounts_cinder_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||||
containers:
|
containers:
|
||||||
- name: cinder-api
|
- name: cinder-api
|
||||||
image: {{ .Values.images.tags.api }}
|
image: {{ .Values.images.tags.cinder_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 }}
|
||||||
securityContext:
|
securityContext:
|
||||||
|
@ -43,7 +43,7 @@ spec:
|
|||||||
{{ tuple $envAll $dependencies $mounts_cinder_backup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
{{ tuple $envAll $dependencies $mounts_cinder_backup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||||
{{- if include "cinder.is_ceph_backup_configured" . }}
|
{{- if include "cinder.is_ceph_backup_configured" . }}
|
||||||
- name: ceph-keyring-placement
|
- name: ceph-keyring-placement
|
||||||
image: {{ .Values.images.tags.backup }}
|
image: {{ .Values.images.tags.cinder_backup }}
|
||||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
||||||
securityContext:
|
securityContext:
|
||||||
runAsUser: 0
|
runAsUser: 0
|
||||||
@ -63,7 +63,7 @@ spec:
|
|||||||
{{ end }}
|
{{ end }}
|
||||||
containers:
|
containers:
|
||||||
- name: cinder-backup
|
- name: cinder-backup
|
||||||
image: {{ .Values.images.tags.backup }}
|
image: {{ .Values.images.tags.cinder_backup }}
|
||||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
securityContext:
|
securityContext:
|
||||||
|
@ -43,7 +43,7 @@ spec:
|
|||||||
{{ tuple $envAll $dependencies $mounts_cinder_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
{{ tuple $envAll $dependencies $mounts_cinder_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||||
containers:
|
containers:
|
||||||
- name: cinder-scheduler
|
- name: cinder-scheduler
|
||||||
image: {{ .Values.images.tags.scheduler }}
|
image: {{ .Values.images.tags.cinder_scheduler }}
|
||||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
securityContext:
|
securityContext:
|
||||||
|
@ -43,7 +43,7 @@ spec:
|
|||||||
{{ tuple $envAll $dependencies $mounts_cinder_volume_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
{{ tuple $envAll $dependencies $mounts_cinder_volume_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||||
{{- if include "cinder.is_ceph_volume_configured" . }}
|
{{- if include "cinder.is_ceph_volume_configured" . }}
|
||||||
- name: ceph-keyring-placement
|
- name: ceph-keyring-placement
|
||||||
image: {{ .Values.images.tags.volume }}
|
image: {{ .Values.images.tags.cinder_volume }}
|
||||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
||||||
securityContext:
|
securityContext:
|
||||||
runAsUser: 0
|
runAsUser: 0
|
||||||
@ -63,7 +63,7 @@ spec:
|
|||||||
{{ end }}
|
{{ end }}
|
||||||
containers:
|
containers:
|
||||||
- name: cinder-volume
|
- name: cinder-volume
|
||||||
image: {{ .Values.images.tags.volume }}
|
image: {{ .Values.images.tags.cinder_volume }}
|
||||||
imagePullPolicy: {{ .Values.images.pull_policy }}
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
||||||
{{ tuple $envAll $envAll.Values.pod.resources.volume | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
{{ tuple $envAll $envAll.Values.pod.resources.volume | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
||||||
securityContext:
|
securityContext:
|
||||||
|
@ -35,7 +35,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: cinder-db-sync
|
- name: cinder-db-sync
|
||||||
image: {{ .Values.images.tags.db_sync }}
|
image: {{ .Values.images.tags.cinder_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:
|
||||||
|
@ -29,17 +29,17 @@ images:
|
|||||||
tags:
|
tags:
|
||||||
test: docker.io/kolla/ubuntu-source-rally:4.0.0
|
test: docker.io/kolla/ubuntu-source-rally:4.0.0
|
||||||
db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
|
db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
|
||||||
db_sync: docker.io/kolla/ubuntu-source-cinder-api:3.0.3
|
cinder_db_sync: docker.io/kolla/ubuntu-source-cinder-api:3.0.3
|
||||||
db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
|
db_drop: docker.io/kolla/ubuntu-source-heat-engine: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: docker.io/kolla/ubuntu-source-cinder-api:3.0.3
|
cinder_api: docker.io/kolla/ubuntu-source-cinder-api:3.0.3
|
||||||
bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
|
bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
|
||||||
scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3
|
cinder_scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3
|
||||||
volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
|
cinder_volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
|
||||||
volume_usage_audit: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
|
cinder_volume_usage_audit: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
|
||||||
backup: docker.io/kolla/ubuntu-source-cinder-backup:3.0.3
|
cinder_backup: docker.io/kolla/ubuntu-source-cinder-backup: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"
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user