openstack/openstack-helm
Code Issues Proposed changes

Images: Congress service specific explicit image names

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

Change-Id: I699c51cfbf7653336274337fa6c1203ff66770e7
This commit is contained in:
portdirect 2017-11-28 22:47:28 -05:00 committed by Pete Birley
parent f5a6a5dedc
commit 7294f8b4ce
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ spec:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers:
- name: congress-api
image: {{ .Values.images.tags.api }}
image: {{ .Values.images.tags.congress_api }}
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
runAsUser: {{ .Values.pod.user.congress.uid }}

2
congress/templates/deployment-datasource.yaml
View File

@ -38,7 +38,7 @@ spec:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers:
- name: congress-datasource
image: {{ .Values.images.tags.datasource }}
image: {{ .Values.images.tags.congress_datasource }}
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
runAsUser: {{ .Values.pod.user.congress.uid }}

2
congress/templates/deployment-policy-engine.yaml
View File

@ -38,7 +38,7 @@ spec:
{{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
containers:
- name: congress-policy-engine
image: {{ .Values.images.tags.policy_engine }}
image: {{ .Values.images.tags.congress_policy_engine }}
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
runAsUser: {{ .Values.pod.user.congress.uid }}

2
congress/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: congress-db-sync
image: {{ .Values.images.tags.db_sync }}
image: {{ .Values.images.tags.congress_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:

2
congress/templates/job-ds-create.yaml
View File

@ -35,7 +35,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: congress-ds-create
image: {{ .Values.images.tags.ds_create }}
image: {{ .Values.images.tags.congress_ds_create }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.ds_create | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:

2
congress/templates/pod-test.yaml
View File

@ -27,7 +27,7 @@ spec:
restartPolicy: Never
containers:
- name: {{.Release.Name}}-congress-test
image: {{ .Values.images.tags.scripted_test }}
image: {{ .Values.images.tags.congress_scripted_test }}
env:
{{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
{{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}

22
congress/values.yaml
View File

@ -6,17 +6,17 @@ release_group: null
images:
tags:
api: &congress_api docker.io/kolla/ubuntu-source-congress-api:3.0.3
datasource: docker.io/kolla/ubuntu-source-congress-datasource:3.0.3
policy_engine: docker.io/kolla/ubuntu-source-congress-policy-engine:3.0.3
db_init: *congress_api
db_sync: *congress_api
db_drop: *congress_api
ks_user: *congress_api
ks_service: *congress_api
ks_endpoints: *congress_api
ds_create: *congress_api
scripted_test: *congress_api
congress_api: docker.io/kolla/ubuntu-source-congress-api:3.0.3
congress_datasource: docker.io/kolla/ubuntu-source-congress-datasource:3.0.3
congress_policy_engine: docker.io/kolla/ubuntu-source-congress-policy-engine:3.0.3
db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
congress_db_sync: docker.io/kolla/ubuntu-source-congress-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
congress_ds_create: docker.io/kolla/ubuntu-source-congress-api:3.0.3
congress_scripted_test: docker.io/kolla/ubuntu-source-congress-api:3.0.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
pull_policy: "IfNotPresent"