openstack
/
openstack-helm
Code Issues Proposed changes

Merge "Images: Cinder service specific explicit image names"

This commit is contained in:
Zuul 2017-11-30 15:47:54 +00:00 committed by Gerrit Code Review
parent 3ff69104fe e711295a61
commit a3f40dcc07
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/templates/cron-job-cinder-volume-usage-audit.yaml
View File

@ -41,7 +41,7 @@ spec:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers:
- 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 }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.volume_usage_audit | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
command:

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

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

4
cinder/templates/deployment-backup.yaml
View File

@ -43,7 +43,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_cinder_backup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
{{- if include "cinder.is_ceph_backup_configured" . }}
- name: ceph-keyring-placement
image: {{ .Values.images.tags.backup }}
image: {{ .Values.images.tags.cinder_backup }}
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
runAsUser: 0
@ -63,7 +63,7 @@ spec:
{{ end }}
containers:
- name: cinder-backup
image: {{ .Values.images.tags.backup }}
image: {{ .Values.images.tags.cinder_backup }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:

2
cinder/templates/deployment-scheduler.yaml
View File

@ -43,7 +43,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_cinder_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: cinder-scheduler
image: {{ .Values.images.tags.scheduler }}
image: {{ .Values.images.tags.cinder_scheduler }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:

4
cinder/templates/deployment-volume.yaml
View File

@ -43,7 +43,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_cinder_volume_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
{{- if include "cinder.is_ceph_volume_configured" . }}
- name: ceph-keyring-placement
image: {{ .Values.images.tags.volume }}
image: {{ .Values.images.tags.cinder_volume }}
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
runAsUser: 0
@ -63,7 +63,7 @@ spec:
{{ end }}
containers:
- name: cinder-volume
image: {{ .Values.images.tags.volume }}
image: {{ .Values.images.tags.cinder_volume }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.volume | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:

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

@ -35,7 +35,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: cinder-db-sync
image: {{ .Values.images.tags.db_sync }}
image: {{ .Values.images.tags.cinder_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:

12
cinder/values.yaml
View File

@ -29,17 +29,17 @@ images:
tags:
test: docker.io/kolla/ubuntu-source-rally:4.0.0
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
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: 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
scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3
volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
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_scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3
cinder_volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
cinder_volume_usage_audit: docker.io/kolla/ubuntu-source-cinder-volume: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
pull_policy: "IfNotPresent"