openstack/openstack-helm
Code Issues Proposed changes

Images: Glance service specific explicit image names

Browse Source 
This PS makes the service-specific images for Glance have
explicit names, allowing simple over-riding of images for an
entire site.

Change-Id: Ib6a5e626dd85bb04ee8599ac9b53b3d5fbaf496b
This commit is contained in:
portdirect 2017-11-28 22:50:07 -05:00 committed by Pete Birley
parent f5a6a5dedc
commit 8a92b6f1a5
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glance/templates/deployment-api.yaml
View File

@ -43,7 +43,7 @@ spec:
initContainers: initContainers:
{{ tuple $envAll $dependencies $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: glance-perms - name: glance-perms
image: {{ .Values.images.tags.api }} image: {{ .Values.images.tags.glance_api }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext: securityContext:
runAsUser: 0 runAsUser: 0
@ -58,7 +58,7 @@ spec:
mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }} mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }}
{{ if eq .Values.storage "rbd" }} {{ if eq .Values.storage "rbd" }}
- name: ceph-keyring-placement - name: ceph-keyring-placement
image: {{ .Values.images.tags.api }} image: {{ .Values.images.tags.glance_api }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext: securityContext:
runAsUser: {{ .Values.pod.user.glance.uid }} runAsUser: {{ .Values.pod.user.glance.uid }}
@ -81,7 +81,7 @@ spec:
{{ end }} {{ end }}
containers: containers:
- name: glance-api - name: glance-api
image: {{ .Values.images.tags.api }} image: {{ .Values.images.tags.glance_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:

2
glance/templates/deployment-registry.yaml
View File

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

2
glance/templates/job-clean.yaml
View File

@ -34,7 +34,7 @@ spec:
containers: containers:
{{- if eq .Values.storage "rbd" }} {{- if eq .Values.storage "rbd" }}
- name: glance-secret-clean - name: glance-secret-clean
image: {{ .Values.images.tags.storage_init }} image: {{ .Values.images.tags.glance_storage_init }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
env: env:

2
glance/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 }} {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: glance-db-sync - name: glance-db-sync
image: {{ .Values.images.tags.db_sync }} image: {{ .Values.images.tags.glance_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:

4
glance/templates/job-storage-init.yaml
View File

@ -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 }}
{{ if or (eq .Values.storage "rbd") (eq .Values.storage "radosgw") }} {{ if or (eq .Values.storage "rbd") (eq .Values.storage "radosgw") }}
- name: ceph-keyring-placement - name: ceph-keyring-placement
image: {{ .Values.images.tags.api }} image: {{ .Values.images.tags.glance_api }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext: securityContext:
runAsUser: {{ .Values.pod.user.glance.uid }} runAsUser: {{ .Values.pod.user.glance.uid }}
@ -55,7 +55,7 @@ spec:
{{ end }} {{ end }}
containers: containers:
- name: glance-storage-init - name: glance-storage-init
image: {{ .Values.images.tags.storage_init }} image: {{ .Values.images.tags.glance_storage_init }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
env: env:

8
glance/values.yaml
View File

@ -29,15 +29,15 @@ release_group: null
images: images:
tags: tags:
test: docker.io/kolla/ubuntu-source-rally:4.0.0 test: docker.io/kolla/ubuntu-source-rally:4.0.0
storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 glance_storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
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-glance-api:3.0.3 glance_db_sync: docker.io/kolla/ubuntu-source-glance-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-glance-api:3.0.3 glance_api: docker.io/kolla/ubuntu-source-glance-api:3.0.3
registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.3 glance_registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.3
# Bootstrap image requires curl # Bootstrap image requires curl
bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1