openstack/openstack-helm
Code Issues Proposed changes

Nova: Make image keys service specific

Browse Source 
This PS makes the image keys service specific, inline with other
OpenStack-Helm charts.

Change-Id: I1259afa632b6a3eab4acb3fee0fc6c06b1e68694
This commit is contained in:
portdirect 2018-02-15 10:32:50 -05:00
parent 86d5b1ce05
commit 563c30c947
12 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nova/templates/daemonset-compute.yaml
View File

@ -48,7 +48,7 @@ spec:
initContainers:
{{ tuple $envAll $dependencies $mounts_nova_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: nova-compute-init
image: {{ .Values.images.tags.compute }}
image: {{ .Values.images.tags.nova_compute }}
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
runAsUser: 0
@ -66,7 +66,7 @@ spec:
mountPath: /var/lib/nova
{{- if .Values.ceph.enabled }}
- name: ceph-keyring-placement
image: {{ .Values.images.tags.compute }}
image: {{ .Values.images.tags.nova_compute }}
imagePullPolicy: {{ .Values.images.pull_policy }}
securityContext:
runAsUser: {{ .Values.pod.user.nova.uid }}
@ -94,7 +94,7 @@ spec:
{{ end }}
{{- if eq .Values.console.console_kind "novnc"}}
- name: nova-compute-vnc-init
image: {{ .Values.images.tags.compute }}
image: {{ .Values.images.tags.nova_compute }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:
@ -111,7 +111,7 @@ spec:
{{ end }}
{{- if eq .Values.console.console_kind "spice"}}
- name: nova-compute-spice-init
image: {{ .Values.images.tags.compute }}
image: {{ .Values.images.tags.nova_compute }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:
@ -128,7 +128,7 @@ spec:
{{ end }}
containers:
- name: nova-compute
image: {{ .Values.images.tags.compute }}
image: {{ .Values.images.tags.nova_compute }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:
@ -221,7 +221,7 @@ spec:
readOnly: true
{{ if $mounts_nova_compute.volumeMounts }}{{ toYaml $mounts_nova_compute.volumeMounts | indent 12 }}{{ end }}
- name: nova-compute-ssh
image: {{ .Values.images.tags.compute_ssh }}
image: {{ .Values.images.tags.nova_compute_ssh }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.ssh | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:

4
nova/templates/deployment-api-metadata.yaml
View File

@ -48,7 +48,7 @@ spec:
initContainers:
{{ tuple $envAll $dependencies $mounts_nova_api_metadata_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: nova-api-metadata-init
image: {{ .Values.images.tags.api }}
image: {{ .Values.images.tags.nova_api }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:
@ -68,7 +68,7 @@ spec:
mountPath: /tmp/pod-shared
containers:
- name: nova-api
image: {{ .Values.images.tags.api }}
image: {{ .Values.images.tags.nova_api }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:

2
nova/templates/deployment-api-osapi.yaml
View File

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

2
nova/templates/deployment-conductor.yaml
View File

@ -48,7 +48,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_nova_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: nova-conductor
image: {{ .Values.images.tags.conductor }}
image: {{ .Values.images.tags.nova_conductor }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:

2
nova/templates/deployment-consoleauth.yaml
View File

@ -48,7 +48,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_nova_consoleauth_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: nova-consoleauth
image: {{ .Values.images.tags.consoleauth }}
image: {{ .Values.images.tags.nova_consoleauth }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:

6
nova/templates/deployment-novncproxy.yaml
View File

@ -50,7 +50,7 @@ spec:
initContainers:
{{ tuple $envAll $dependencies $mounts_nova_novncproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: nova-novncproxy-init
image: {{ .Values.images.tags.novncproxy }}
image: {{ .Values.images.tags.nova_novncproxy }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:
@ -69,7 +69,7 @@ spec:
- name: pod-shared
mountPath: /tmp/pod-shared
- name: nova-novncproxy-init-assets
image: {{ .Values.images.tags.novncproxy_assets }}
image: {{ .Values.images.tags.nova_novncproxy_assets }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:
@ -83,7 +83,7 @@ spec:
mountPath: /tmp/usr/share/novnc
containers:
- name: nova-novncproxy
image: {{ .Values.images.tags.novncproxy }}
image: {{ .Values.images.tags.nova_novncproxy }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:

2
nova/templates/deployment-placement.yaml
View File

@ -49,7 +49,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_nova_placement_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: nova-placement-api
image: {{ .Values.images.tags.placement }}
image: {{ .Values.images.tags.nova_placement }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.placement | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:

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

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

6
nova/templates/deployment-spiceproxy.yaml
View File

@ -50,7 +50,7 @@ spec:
initContainers:
{{ tuple $envAll $dependencies $mounts_nova_spiceproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: nova-spiceproxy-init
image: {{ .Values.images.tags.spiceproxy }}
image: {{ .Values.images.tags.nova_spiceproxy }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:
@ -69,7 +69,7 @@ spec:
- name: pod-shared
mountPath: /tmp/pod-shared
- name: nova-spiceproxy-init-assets
image: {{ .Values.images.tags.spiceproxy_assets }}
image: {{ .Values.images.tags.nova_spiceproxy_assets }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:
@ -83,7 +83,7 @@ spec:
mountPath: /tmp/usr/share/spice-html5
containers:
- name: nova-spiceproxy
image: {{ .Values.images.tags.spiceproxy }}
image: {{ .Values.images.tags.nova_spiceproxy }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:

2
nova/templates/job-cell-setup.yaml
View File

@ -39,7 +39,7 @@ spec:
{{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: nova-cell-setup
image: {{ .Values.images.tags.cell_setup }}
image: {{ .Values.images.tags.nova_cell_setup }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.cell_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:

2
nova/templates/statefulset-compute-ironic.yaml
View File

@ -52,7 +52,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_nova_compute_ironic_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: nova-compute-ironic
image: {{ .Values.images.tags.compute_ironic }}
image: {{ .Values.images.tags.nova_compute_ironic }}
imagePullPolicy: {{ .Values.images.tags.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.compute_ironic | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command:

46
nova/values.yaml
View File

@ -56,30 +56,30 @@ labels:
node_selector_value: enabled
images:
pull_policy: IfNotPresent
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-nova-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-nova-api:3.0.3
conductor: docker.io/kolla/ubuntu-source-nova-conductor:3.0.3
scheduler: docker.io/kolla/ubuntu-source-nova-scheduler:3.0.3
novncproxy: docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3
novncproxy_assets: docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3
spiceproxy: docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3
spiceproxy_assets: docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3
consoleauth: docker.io/kolla/ubuntu-source-nova-consoleauth:3.0.3
compute: docker.io/kolla/ubuntu-source-nova-compute:3.0.3
compute_ssh: docker.io/kolla/ubuntu-source-nova-ssh:3.0.3
compute_ironic: docker.io/kolla/ubuntu-source-nova-compute-ironic:3.0.3
placement: docker.io/kolla/ubuntu-source-nova-placement-api:3.0.3-beta.1
bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
cell_setup: docker.io/kolla/ubuntu-source-nova-api:3.0.3
pull_policy: "IfNotPresent"
bootstrap: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
db_drop: '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-nova-api:3.0.3'
dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.2.1'
ks_endpoints: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
ks_service: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
ks_user: 'docker.io/kolla/ubuntu-source-heat-engine:3.0.3'
nova_api: 'docker.io/kolla/ubuntu-source-nova-api:3.0.3'
nova_cell_setup: 'docker.io/kolla/ubuntu-source-nova-api:3.0.3'
nova_compute: 'docker.io/kolla/ubuntu-source-nova-compute:3.0.3'
nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:3.0.3'
nova_compute_ssh: 'docker.io/kolla/ubuntu-source-nova-ssh:3.0.3'
nova_conductor: 'docker.io/kolla/ubuntu-source-nova-conductor:3.0.3'
nova_consoleauth: 'docker.io/kolla/ubuntu-source-nova-consoleauth:3.0.3'
nova_novncproxy: 'docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3'
nova_novncproxy_assets: 'docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3'
nova_placement: 'docker.io/kolla/ubuntu-source-nova-placement-api:3.0.3-beta.1'
nova_scheduler: 'docker.io/kolla/ubuntu-source-nova-scheduler:3.0.3'
nova_spiceproxy: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3'
nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:3.0.3'
test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
bootstrap:
enabled: true