From 460675bf7f85df1aaf4d918beda5a5929d04a942 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Fri, 18 May 2018 10:41:48 -0500 Subject: [PATCH] Add image management function to manifests When removing helm-toolkit from OSH and swithcing to use the toolkit from OSH-Infra, the image declaration function was missed. Depends-On: I2f2012590d81ffcb159d49d8a76eedd4441744cd Change-Id: I0f1118bb748f3fe1b6bb73acfc00e77c5cca9c7d Signed-off-by: Pete Birley --- barbican/templates/deployment-api.yaml | 3 +- barbican/templates/pod-test.yaml | 2 +- ceilometer/templates/daemonset-compute.yaml | 3 +- ceilometer/templates/deployment-api.yaml | 3 +- ceilometer/templates/deployment-central.yaml | 3 +- .../templates/deployment-collector.yaml | 3 +- .../templates/deployment-notification.yaml | 3 +- ceilometer/templates/job-db-init-mongodb.yaml | 3 +- ceilometer/templates/pod-rally-test.yaml | 6 +- .../deployment-cephfs-provisioner.yaml | 3 +- ceph-client/templates/deployment-mds.yaml | 6 +- ceph-client/templates/deployment-mgr.yaml | 6 +- .../templates/deployment-rbd-provisioner.yaml | 3 +- ceph-client/templates/deployment-rgw.yaml | 9 +- ceph-client/templates/job-bootstrap.yaml | 3 +- .../templates/job-cephfs-client-key.yaml | 3 +- .../job-namespace-client-key-cleaner.yaml | 3 +- .../templates/job-namespace-client-key.yaml | 3 +- ceph-client/templates/job-rbd-pool.yaml | 3 +- ceph-mon/templates/daemonset-mon.yaml | 6 +- ceph-mon/templates/deployment-moncheck.yaml | 3 +- ceph-mon/templates/job-bootstrap.yaml | 3 +- ceph-mon/templates/job-keyring.yaml | 3 +- .../templates/job-storage-admin-keys.yaml | 3 +- ceph-osd/templates/daemonset-osd.yaml | 9 +- .../cron-job-cinder-volume-usage-audit.yaml | 3 +- cinder/templates/deployment-api.yaml | 6 +- cinder/templates/deployment-backup.yaml | 15 ++-- cinder/templates/deployment-scheduler.yaml | 6 +- cinder/templates/deployment-volume.yaml | 9 +- cinder/templates/job-backup-storage-init.yaml | 6 +- cinder/templates/job-clean.yaml | 6 +- cinder/templates/job-storage-init.yaml | 6 +- cinder/templates/pod-rally-test.yaml | 6 +- congress/templates/deployment-api.yaml | 65 +++++++------- congress/templates/deployment-datasource.yaml | 53 ++++++----- .../templates/deployment-policy-engine.yaml | 53 ++++++----- congress/templates/job-ds-create.yaml | 3 +- congress/templates/pod-test.yaml | 2 +- etcd/templates/deployment.yaml | 3 +- glance/templates/deployment-api.yaml | 9 +- glance/templates/deployment-registry.yaml | 3 +- glance/templates/job-clean.yaml | 6 +- glance/templates/job-storage-init.yaml | 6 +- glance/templates/pod-rally-test.yaml | 6 +- gnocchi/templates/daemonset-metricd.yaml | 6 +- gnocchi/templates/daemonset-statsd.yaml | 6 +- gnocchi/templates/deployment-api.yaml | 6 +- gnocchi/templates/job-clean.yaml | 3 +- gnocchi/templates/job-db-init-indexer.yaml | 3 +- gnocchi/templates/job-db-sync.yaml | 6 +- gnocchi/templates/job-storage-init.yaml | 6 +- gnocchi/templates/pod-gnocchi-test.yaml | 3 +- heat/templates/cron-job-engine-cleaner.yaml | 3 +- heat/templates/deployment-api.yaml | 3 +- heat/templates/deployment-cfn.yaml | 3 +- heat/templates/deployment-cloudwatch.yaml | 3 +- heat/templates/deployment-engine.yaml | 3 +- heat/templates/job-ks-user-domain.yaml | 3 +- heat/templates/job-trusts.yaml | 3 +- heat/templates/pod-rally-test.yaml | 6 +- horizon/templates/deployment.yaml | 3 +- horizon/templates/job-db-sync.yaml | 3 +- ingress/templates/deployment-error.yaml | 3 +- ingress/templates/deployment-ingress.yaml | 12 +-- ironic/templates/deployment-api.yaml | 9 +- .../job-manage-cleaning-network.yaml | 3 +- ironic/templates/statefulset-conductor.yaml | 24 ++--- .../templates/cron-job-credential-rotate.yaml | 3 +- .../templates/cron-job-fernet-rotate.yaml | 3 +- keystone/templates/deployment-api.yaml | 3 +- keystone/templates/job-credential-setup.yaml | 3 +- keystone/templates/job-domain-manage.yaml | 6 +- keystone/templates/job-fernet-setup.yaml | 3 +- keystone/templates/pod-rally-test.yaml | 6 +- ldap/templates/statefulset.yaml | 29 +++--- libvirt/templates/daemonset-libvirt.yaml | 9 +- magnum/templates/deployment-api.yaml | 3 +- magnum/templates/job-ks-user-domain.yaml | 3 +- magnum/templates/statefulset-conductor.yaml | 6 +- mariadb/templates/deployment-error.yaml | 3 +- mariadb/templates/deployment-ingress.yaml | 3 +- .../prometheus/exporter-deployment.yaml | 3 +- .../prometheus/exporter-job-create-user.yaml | 3 +- mariadb/templates/statefulset.yaml | 6 +- memcached/templates/deployment.yaml | 3 +- mistral/templates/deployment-api.yaml | 3 +- mistral/templates/deployment-executor.yaml | 3 +- mistral/templates/pod-rally-test.yaml | 6 +- mistral/templates/statefulset-engine.yaml | 3 +- .../templates/statefulset-event-engine.yaml | 3 +- mongodb/templates/statefulset.yaml | 8 +- neutron/templates/daemonset-dhcp-agent.yaml | 3 +- neutron/templates/daemonset-l3-agent.yaml | 3 +- neutron/templates/daemonset-lb-agent.yaml | 9 +- .../templates/daemonset-metadata-agent.yaml | 6 +- neutron/templates/daemonset-ovs-agent.yaml | 9 +- neutron/templates/daemonset-sriov-agent.yaml | 6 +- neutron/templates/deployment-server.yaml | 3 +- neutron/templates/pod-rally-test.yaml | 6 +- nova/templates/cron-job-cell-setup.yaml | 3 +- nova/templates/daemonset-compute.yaml | 21 ++--- nova/templates/deployment-api-metadata.yaml | 6 +- nova/templates/deployment-api-osapi.yaml | 3 +- nova/templates/deployment-conductor.yaml | 3 +- nova/templates/deployment-consoleauth.yaml | 3 +- nova/templates/deployment-novncproxy.yaml | 9 +- nova/templates/deployment-placement.yaml | 3 +- nova/templates/deployment-scheduler.yaml | 3 +- nova/templates/deployment-spiceproxy.yaml | 9 +- nova/templates/job-cell-setup.yaml | 6 +- .../templates/job-ks-placement-endpoints.yaml | 3 +- nova/templates/job-ks-placement-service.yaml | 3 +- nova/templates/job-ks-placement-user.yaml | 3 +- nova/templates/pod-rally-test.yaml | 6 +- .../templates/statefulset-compute-ironic.yaml | 3 +- openvswitch/templates/daemonset-ovs-db.yaml | 3 +- .../templates/daemonset-ovs-vswitchd.yaml | 6 +- postgresql/templates/statefulset.yaml | 89 +++++++++---------- .../prometheus/exporter-deployment.yaml | 3 +- rabbitmq/templates/pod-test.yaml | 2 +- rabbitmq/templates/statefulset.yaml | 5 +- rally/templates/job-bootstrap.yaml | 3 +- rally/templates/job-ks-endpoints.yaml | 3 +- rally/templates/job-ks-service.yaml | 3 +- rally/templates/job-manage-db.yaml | 3 +- rally/templates/job-run-task.yaml | 6 +- senlin/templates/cron-job-engine-cleaner.yaml | 3 +- senlin/templates/deployment-api.yaml | 3 +- senlin/templates/deployment-engine.yaml | 3 +- senlin/templates/pod-test.yaml | 2 +- tempest/templates/job-run-tests.yaml | 8 +- 132 files changed, 346 insertions(+), 548 deletions(-) diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index abbf4f7e04..4c1eb52003 100644 --- a/barbican/templates/deployment-api.yaml +++ b/barbican/templates/deployment-api.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "api" $mounts_barbican_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: barbican-api - image: {{ .Values.images.tags.barbican_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "barbican_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.barbican.uid }} diff --git a/barbican/templates/pod-test.yaml b/barbican/templates/pod-test.yaml index 801eb42b67..c477bdbc14 100644 --- a/barbican/templates/pod-test.yaml +++ b/barbican/templates/pod-test.yaml @@ -39,7 +39,7 @@ spec: {{ tuple $envAll "tests" $mounts_barbican_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: {{.Release.Name}}-barbican-test - image: {{ .Values.images.tags.scripted_test }} +{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }} diff --git a/ceilometer/templates/daemonset-compute.yaml b/ceilometer/templates/daemonset-compute.yaml index 1e372e8702..6ed71f8d08 100644 --- a/ceilometer/templates/daemonset-compute.yaml +++ b/ceilometer/templates/daemonset-compute.yaml @@ -49,8 +49,7 @@ spec: {{ tuple $envAll "compute" $mounts_ceilometer_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-compute - image: {{ .Values.images.tags.ceilometer_compute }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceilometer_compute" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ceilometer-compute.sh diff --git a/ceilometer/templates/deployment-api.yaml b/ceilometer/templates/deployment-api.yaml index 832ac337c1..2366817028 100644 --- a/ceilometer/templates/deployment-api.yaml +++ b/ceilometer/templates/deployment-api.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "api" $mounts_ceilometer_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-api - image: {{ .Values.images.tags.ceilometer_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceilometer_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ceilometer-api.sh diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml index a069161e37..fbcd0411e7 100644 --- a/ceilometer/templates/deployment-central.yaml +++ b/ceilometer/templates/deployment-central.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "central" $mounts_ceilometer_central_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-central - image: {{ .Values.images.tags.ceilometer_central }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceilometer_central" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.central | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ceilometer-central.sh diff --git a/ceilometer/templates/deployment-collector.yaml b/ceilometer/templates/deployment-collector.yaml index 6c5dd7d6aa..8005c31aff 100644 --- a/ceilometer/templates/deployment-collector.yaml +++ b/ceilometer/templates/deployment-collector.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "collector" $mounts_ceilometer_collector_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-collector - image: {{ .Values.images.tags.ceilometer_collector }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceilometer_collector" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.collector | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ceilometer-collector.sh diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml index 5b9d1aae2a..2a9fba6206 100644 --- a/ceilometer/templates/deployment-notification.yaml +++ b/ceilometer/templates/deployment-notification.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "notification" $mounts_ceilometer_notification_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-notification - image: {{ .Values.images.tags.ceilometer_notification }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceilometer_notification" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.notification | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ceilometer-notification.sh diff --git a/ceilometer/templates/job-db-init-mongodb.yaml b/ceilometer/templates/job-db-init-mongodb.yaml index 49be0d5d6c..b574bd39e3 100644 --- a/ceilometer/templates/job-db-init-mongodb.yaml +++ b/ceilometer/templates/job-db-init-mongodb.yaml @@ -35,8 +35,7 @@ spec: {{ tuple $envAll "db_init_mongodb" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-db-init-mongodb - image: {{ .Values.images.tags.db_init_mongodb }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "db_init_mongodb" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init_mongodb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: ROOT_DB_CONNECTION diff --git a/ceilometer/templates/pod-rally-test.yaml b/ceilometer/templates/pod-rally-test.yaml index c65973994b..2e859ea3ab 100644 --- a/ceilometer/templates/pod-rally-test.yaml +++ b/ceilometer/templates/pod-rally-test.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} - name: {{ .Release.Name }}-test-ks-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} command: - /tmp/ks-user.sh @@ -60,8 +59,7 @@ spec: value: {{ .Values.endpoints.identity.auth.test.role | quote }} containers: - name: {{ .Release.Name }}-test - image: {{ .Values.images.tags.test }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/ceph-client/templates/deployment-cephfs-provisioner.yaml b/ceph-client/templates/deployment-cephfs-provisioner.yaml index 9e30e113ec..1b888c6dff 100644 --- a/ceph-client/templates/deployment-cephfs-provisioner.yaml +++ b/ceph-client/templates/deployment-cephfs-provisioner.yaml @@ -149,8 +149,7 @@ spec: {{ tuple $envAll "cephfs_provisioner" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-cephfs-provisioner - image: {{ .Values.images.tags.ceph_cephfs_provisioner }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_cephfs_provisioner" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.cephfs_provisioner | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: PROVISIONER_NAME diff --git a/ceph-client/templates/deployment-mds.yaml b/ceph-client/templates/deployment-mds.yaml index b116e60abf..aaa56b4603 100644 --- a/ceph-client/templates/deployment-mds.yaml +++ b/ceph-client/templates/deployment-mds.yaml @@ -40,8 +40,7 @@ spec: initContainers: {{ tuple $envAll "mds" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_mds }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_mds" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/init-dirs.sh env: @@ -60,8 +59,7 @@ spec: readOnly: false containers: - name: ceph-mds - image: {{ .Values.images.tags.ceph_mds }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_mds" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.mds | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/mds-start.sh diff --git a/ceph-client/templates/deployment-mgr.yaml b/ceph-client/templates/deployment-mgr.yaml index 098c7e5511..3e970b2d96 100644 --- a/ceph-client/templates/deployment-mgr.yaml +++ b/ceph-client/templates/deployment-mgr.yaml @@ -43,8 +43,7 @@ spec: initContainers: {{ tuple $envAll "mgr" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_mgr }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_mds" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/init-dirs.sh env: @@ -65,8 +64,7 @@ spec: mountPath: /etc/ceph containers: - name: ceph-mgr - image: {{ .Values.images.tags.ceph_mgr }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_mgr" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.mgr | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: CLUSTER diff --git a/ceph-client/templates/deployment-rbd-provisioner.yaml b/ceph-client/templates/deployment-rbd-provisioner.yaml index 9033b77806..32460f2351 100644 --- a/ceph-client/templates/deployment-rbd-provisioner.yaml +++ b/ceph-client/templates/deployment-rbd-provisioner.yaml @@ -139,8 +139,7 @@ spec: {{ tuple $envAll "rbd_provisioner" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-rbd-provisioner - image: {{ .Values.images.tags.ceph_rbd_provisioner }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_rbd_provisioner" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.rbd_provisioner | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: PROVISIONER_NAME diff --git a/ceph-client/templates/deployment-rgw.yaml b/ceph-client/templates/deployment-rgw.yaml index 8bdb51b92a..f9ef348146 100644 --- a/ceph-client/templates/deployment-rgw.yaml +++ b/ceph-client/templates/deployment-rgw.yaml @@ -39,8 +39,7 @@ spec: initContainers: {{ tuple $envAll "rgw" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_rgw }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/init-dirs.sh env: @@ -59,8 +58,7 @@ spec: readOnly: false {{ if .Values.conf.rgw_ks.enabled }} - name: ceph-rgw-ks-init - image: {{ .Values.images.tags.ceph_rgw }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: CLUSTER @@ -93,8 +91,7 @@ spec: {{ end }} containers: - name: ceph-rgw - image: {{ .Values.images.tags.ceph_rgw }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: CLUSTER diff --git a/ceph-client/templates/job-bootstrap.yaml b/ceph-client/templates/job-bootstrap.yaml index 2c5bd7815f..6e558e2bd9 100644 --- a/ceph-client/templates/job-bootstrap.yaml +++ b/ceph-client/templates/job-bootstrap.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "bootstrap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-client-bootstrap - image: {{ .Values.images.tags.ceph_bootstrap }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_bootstrap" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/bootstrap.sh diff --git a/ceph-client/templates/job-cephfs-client-key.yaml b/ceph-client/templates/job-cephfs-client-key.yaml index 0b1399e1d1..d1df477cae 100644 --- a/ceph-client/templates/job-cephfs-client-key.yaml +++ b/ceph-client/templates/job-cephfs-client-key.yaml @@ -96,8 +96,7 @@ spec: {{ tuple $envAll "cephfs_client_key_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-storage-keys-generator - image: {{ .Values.images.tags.ceph_config_helper }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: DEPLOYMENT_NAMESPACE diff --git a/ceph-client/templates/job-namespace-client-key-cleaner.yaml b/ceph-client/templates/job-namespace-client-key-cleaner.yaml index f6464375da..56c7498112 100644 --- a/ceph-client/templates/job-namespace-client-key-cleaner.yaml +++ b/ceph-client/templates/job-namespace-client-key-cleaner.yaml @@ -69,8 +69,7 @@ spec: {{ tuple $envAll "namespace_client_key_cleaner" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-namespace-client-keys-cleaner - image: {{ .Values.images.tags.ceph_config_helper }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: DEPLOYMENT_NAMESPACE diff --git a/ceph-client/templates/job-namespace-client-key.yaml b/ceph-client/templates/job-namespace-client-key.yaml index 4e6dad4dc4..cba3ebb4b3 100644 --- a/ceph-client/templates/job-namespace-client-key.yaml +++ b/ceph-client/templates/job-namespace-client-key.yaml @@ -96,8 +96,7 @@ spec: {{ tuple $envAll "namespace_client_key_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-storage-keys-generator - image: {{ .Values.images.tags.ceph_config_helper }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: DEPLOYMENT_NAMESPACE diff --git a/ceph-client/templates/job-rbd-pool.yaml b/ceph-client/templates/job-rbd-pool.yaml index dd832bb439..c978519b57 100644 --- a/ceph-client/templates/job-rbd-pool.yaml +++ b/ceph-client/templates/job-rbd-pool.yaml @@ -41,8 +41,7 @@ spec: {{ tuple $envAll "rbd_pool" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-rbd-pool - image: {{ .Values.images.tags.ceph_rbd_pool }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_rbd_pool" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.mgr | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: CLUSTER diff --git a/ceph-mon/templates/daemonset-mon.yaml b/ceph-mon/templates/daemonset-mon.yaml index 303a854691..17d0cbb54f 100644 --- a/ceph-mon/templates/daemonset-mon.yaml +++ b/ceph-mon/templates/daemonset-mon.yaml @@ -64,8 +64,7 @@ spec: initContainers: {{ tuple $envAll "mon" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_mon }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_mon" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/init-dirs.sh env: @@ -84,8 +83,7 @@ spec: readOnly: false containers: - name: ceph-mon - image: {{ .Values.images.tags.ceph_mon }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_mon" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.mon | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: CLUSTER diff --git a/ceph-mon/templates/deployment-moncheck.yaml b/ceph-mon/templates/deployment-moncheck.yaml index 4e78b9367b..57b0011fc8 100644 --- a/ceph-mon/templates/deployment-moncheck.yaml +++ b/ceph-mon/templates/deployment-moncheck.yaml @@ -40,8 +40,7 @@ spec: {{ tuple $envAll "moncheck" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-mon - image: {{ .Values.images.tags.ceph_mon_check }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_mon_check" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.moncheck | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: CLUSTER diff --git a/ceph-mon/templates/job-bootstrap.yaml b/ceph-mon/templates/job-bootstrap.yaml index 28123cc63b..76665038fd 100644 --- a/ceph-mon/templates/job-bootstrap.yaml +++ b/ceph-mon/templates/job-bootstrap.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "bootstrap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-bootstrap - image: {{ .Values.images.tags.ceph_bootstrap }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_bootstrap" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/bootstrap.sh diff --git a/ceph-mon/templates/job-keyring.yaml b/ceph-mon/templates/job-keyring.yaml index 1a4c5d232e..ca60cbe059 100644 --- a/ceph-mon/templates/job-keyring.yaml +++ b/ceph-mon/templates/job-keyring.yaml @@ -68,8 +68,7 @@ spec: {{ tuple $envAll "job_keyring_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-{{ $jobName }} - image: {{ $envAll.Values.images.tags.ceph_config_helper }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: DEPLOYMENT_NAMESPACE diff --git a/ceph-mon/templates/job-storage-admin-keys.yaml b/ceph-mon/templates/job-storage-admin-keys.yaml index 2300926826..9f6f1e280b 100644 --- a/ceph-mon/templates/job-storage-admin-keys.yaml +++ b/ceph-mon/templates/job-storage-admin-keys.yaml @@ -65,8 +65,7 @@ spec: {{ tuple $envAll "storage_keys_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-storage-keys-generator - image: {{ .Values.images.tags.ceph_config_helper }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: DEPLOYMENT_NAMESPACE diff --git a/ceph-osd/templates/daemonset-osd.yaml b/ceph-osd/templates/daemonset-osd.yaml index 20f4071d94..44eae7dafa 100644 --- a/ceph-osd/templates/daemonset-osd.yaml +++ b/ceph-osd/templates/daemonset-osd.yaml @@ -41,8 +41,7 @@ spec: initContainers: {{ tuple $envAll "osd" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.tags.ceph_osd }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_osd" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/init-dirs.sh env: @@ -70,8 +69,7 @@ spec: mountPath: /run readOnly: false - name: osd-init - image: {{ .Values.images.tags.ceph_osd }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_osd" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true @@ -125,8 +123,7 @@ spec: readOnly: false containers: - name: osd-pod - image: {{ .Values.images.tags.ceph_osd }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ceph_osd" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml index 28dab32614..3e5fa88b5a 100644 --- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml +++ b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "volume_usage_audit" $mounts_cinder_volume_usage_audit_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} containers: - name: cinder-volume-usage-audit - image: {{ .Values.images.tags.cinder_volume_usage_audit }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_volume_usage_audit" | include "helm-toolkit.snippets.image" | indent 14 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.volume_usage_audit | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }} command: - /tmp/volume-usage-audit.sh diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index d0c87c5b68..5535a5e0bb 100644 --- a/cinder/templates/deployment-api.yaml +++ b/cinder/templates/deployment-api.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "api" $mounts_cinder_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }} - name: ceph-coordination-volume-perms - image: {{ .Values.images.tags.cinder_backup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_api" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -63,8 +62,7 @@ spec: {{ end }} containers: - name: cinder-api - image: {{ .Values.images.tags.cinder_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.cinder.uid }} diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml index 426925926f..466fde4440 100644 --- a/cinder/templates/deployment-backup.yaml +++ b/cinder/templates/deployment-backup.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "backup" $mounts_cinder_backup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }} - name: ceph-backup-keyring-placement - image: {{ .Values.images.tags.cinder_backup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -70,8 +69,7 @@ spec: {{ end }} {{- if include "cinder.is_ceph_volume_configured" $envAll }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.cinder_backup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -93,8 +91,7 @@ spec: {{ end }} {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.posix" }} - name: ceph-backup-volume-perms - image: {{ .Values.images.tags.cinder_backup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -108,8 +105,7 @@ spec: {{ end }} {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }} - name: ceph-coordination-volume-perms - image: {{ .Values.images.tags.cinder_backup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -123,8 +119,7 @@ spec: {{ end }} containers: - name: cinder-backup - image: {{ .Values.images.tags.cinder_backup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.cinder.uid }} diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index da5322a2b1..9bc8b6fd2d 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/cinder/templates/deployment-scheduler.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "scheduler" $mounts_cinder_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }} - name: ceph-coordination-volume-perms - image: {{ .Values.images.tags.cinder_backup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_scheduler" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -62,8 +61,7 @@ spec: {{ end }} containers: - name: cinder-scheduler - image: {{ .Values.images.tags.cinder_scheduler }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_scheduler" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.cinder.uid }} diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index 09cfd5e046..ef7963880f 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "volume" $mounts_cinder_volume_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if include "cinder.is_ceph_volume_configured" $envAll }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.cinder_volume }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_volume" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -70,8 +69,7 @@ spec: {{ end }} {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }} - name: ceph-coordination-volume-perms - image: {{ .Values.images.tags.cinder_backup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_volume" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -85,8 +83,7 @@ spec: {{ end }} containers: - name: cinder-volume - image: {{ .Values.images.tags.cinder_volume }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_volume" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.volume | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.cinder.uid }} diff --git a/cinder/templates/job-backup-storage-init.yaml b/cinder/templates/job-backup-storage-init.yaml index e375d3adc0..2201516da7 100644 --- a/cinder/templates/job-backup-storage-init.yaml +++ b/cinder/templates/job-backup-storage-init.yaml @@ -66,8 +66,7 @@ spec: {{ tuple $envAll "backup_storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.cinder_backup_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_backup_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -88,8 +87,7 @@ spec: {{ end }} containers: - name: cinder-backup-storage-init - image: {{ .Values.images.tags.cinder_backup_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_backup_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.backup_storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: NAMESPACE diff --git a/cinder/templates/job-clean.yaml b/cinder/templates/job-clean.yaml index 87f8f7c31a..76d8cffea9 100644 --- a/cinder/templates/job-clean.yaml +++ b/cinder/templates/job-clean.yaml @@ -71,8 +71,7 @@ spec: containers: {{- if include "cinder.is_ceph_volume_configured" $envAll }} - name: cinder-volume-rbd-secret-clean - image: {{ .Values.images.tags.cinder_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.clean | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: NAMESPACE @@ -91,8 +90,7 @@ spec: {{ end }} {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }} - name: cinder-volume-backup-secret-clean - image: {{ .Values.images.tags.cinder_backup_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_backup_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.clean | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: NAMESPACE diff --git a/cinder/templates/job-storage-init.yaml b/cinder/templates/job-storage-init.yaml index 69f8b6b3bf..591a19e580 100644 --- a/cinder/templates/job-storage-init.yaml +++ b/cinder/templates/job-storage-init.yaml @@ -66,8 +66,7 @@ spec: {{ tuple $envAll "storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if include "cinder.is_ceph_volume_configured" $envAll }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.cinder_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -88,8 +87,7 @@ spec: {{ end }} containers: - name: cinder-storage-init - image: {{ .Values.images.tags.cinder_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "cinder_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: NAMESPACE diff --git a/cinder/templates/pod-rally-test.yaml b/cinder/templates/pod-rally-test.yaml index 0cf3b3f6f6..7c8e5ce158 100644 --- a/cinder/templates/pod-rally-test.yaml +++ b/cinder/templates/pod-rally-test.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} - name: {{ .Release.Name }}-test-ks-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} command: - /tmp/ks-user.sh @@ -60,8 +59,7 @@ spec: value: {{ .Values.endpoints.identity.auth.test.role | quote }} containers: - name: {{ .Release.Name }}-test - image: {{ .Values.images.tags.test }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/congress/templates/deployment-api.yaml b/congress/templates/deployment-api.yaml index e09408d486..2b1f4b3721 100644 --- a/congress/templates/deployment-api.yaml +++ b/congress/templates/deployment-api.yaml @@ -40,39 +40,38 @@ spec: nodeSelector: {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} containers: - - name: congress-api - image: {{ .Values.images.tags.congress_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} - securityContext: - runAsUser: {{ .Values.pod.user.congress.uid }} - command: - - /tmp/congress-api.sh - - start - ports: - - name: c-api - containerPort: {{ tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - readinessProbe: - tcpSocket: - port: {{ tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - volumeMounts: - - name: etccongress - mountPath: /etc/congress - - name: congress-bin - mountPath: /tmp/congress-api.sh - subPath: congress-api.sh - readOnly: true - - name: congress-etc - mountPath: /etc/congress/congress.conf - subPath: congress.conf - readOnly: true - - name: congress-etc - mountPath: /etc/congress/api-paste.ini - subPath: api-paste.ini - readOnly: true - - name: congress-etc - mountPath: /etc/congress/policy.json - subPath: policy.json - readOnly: true + - name: congress-api +{{ tuple $envAll "congress_api" | include "helm-toolkit.snippets.image" | indent 10 }} + securityContext: + runAsUser: {{ .Values.pod.user.congress.uid }} + command: + - /tmp/congress-api.sh + - start + ports: + - name: c-api + containerPort: {{ tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + readinessProbe: + tcpSocket: + port: {{ tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + volumeMounts: + - name: etccongress + mountPath: /etc/congress + - name: congress-bin + mountPath: /tmp/congress-api.sh + subPath: congress-api.sh + readOnly: true + - name: congress-etc + mountPath: /etc/congress/congress.conf + subPath: congress.conf + readOnly: true + - name: congress-etc + mountPath: /etc/congress/api-paste.ini + subPath: api-paste.ini + readOnly: true + - name: congress-etc + mountPath: /etc/congress/policy.json + subPath: policy.json + readOnly: true volumes: - name: etccongress emptyDir: {} diff --git a/congress/templates/deployment-datasource.yaml b/congress/templates/deployment-datasource.yaml index c621f1782d..83e08c4299 100644 --- a/congress/templates/deployment-datasource.yaml +++ b/congress/templates/deployment-datasource.yaml @@ -40,33 +40,32 @@ spec: nodeSelector: {{ .Values.labels.datasource.node_selector_key }}: {{ .Values.labels.datasource.node_selector_value }} containers: - - name: congress-datasource - image: {{ .Values.images.tags.congress_datasource }} - imagePullPolicy: {{ .Values.images.pull_policy }} - securityContext: - runAsUser: {{ .Values.pod.user.congress.uid }} - command: - - /tmp/congress-datasource.sh - - start - volumeMounts: - - name: etccongress - mountPath: /etc/congress - - name: congress-bin - mountPath: /tmp/congress-datasource.sh - subPath: congress-datasource.sh - readOnly: true - - name: congress-etc - mountPath: /etc/congress/congress.conf - subPath: congress.conf - readOnly: true - - name: congress-etc - mountPath: /etc/congress/api-paste.ini - subPath: api-paste.ini - readOnly: true - - name: congress-etc - mountPath: /etc/congress/policy.json - subPath: policy.json - readOnly: true + - name: congress-datasource +{{ tuple $envAll "congress_datasource" | include "helm-toolkit.snippets.image" | indent 10 }} + securityContext: + runAsUser: {{ .Values.pod.user.congress.uid }} + command: + - /tmp/congress-datasource.sh + - start + volumeMounts: + - name: etccongress + mountPath: /etc/congress + - name: congress-bin + mountPath: /tmp/congress-datasource.sh + subPath: congress-datasource.sh + readOnly: true + - name: congress-etc + mountPath: /etc/congress/congress.conf + subPath: congress.conf + readOnly: true + - name: congress-etc + mountPath: /etc/congress/api-paste.ini + subPath: api-paste.ini + readOnly: true + - name: congress-etc + mountPath: /etc/congress/policy.json + subPath: policy.json + readOnly: true volumes: - name: etccongress emptyDir: {} diff --git a/congress/templates/deployment-policy-engine.yaml b/congress/templates/deployment-policy-engine.yaml index 161274433a..39bdccfffd 100644 --- a/congress/templates/deployment-policy-engine.yaml +++ b/congress/templates/deployment-policy-engine.yaml @@ -40,33 +40,32 @@ spec: nodeSelector: {{ .Values.labels.policy_engine.node_selector_key }}: {{ .Values.labels.policy_engine.node_selector_value }} containers: - - name: congress-policy-engine - image: {{ .Values.images.tags.congress_policy_engine }} - imagePullPolicy: {{ .Values.images.pull_policy }} - securityContext: - runAsUser: {{ .Values.pod.user.congress.uid }} - command: - - /tmp/congress-policy-engine.sh - - start - volumeMounts: - - name: etccongress - mountPath: /etc/congress - - name: congress-bin - mountPath: /tmp/congress-policy-engine.sh - subPath: congress-policy-engine.sh - readOnly: true - - name: congress-etc - mountPath: /etc/congress/congress.conf - subPath: congress.conf - readOnly: true - - name: congress-etc - mountPath: /etc/congress/api-paste.ini - subPath: api-paste.ini - readOnly: true - - name: congress-etc - mountPath: /etc/congress/policy.json - subPath: policy.json - readOnly: true + - name: congress-policy-engine +{{ tuple $envAll "congress_policy_engine" | include "helm-toolkit.snippets.image" | indent 10 }} + securityContext: + runAsUser: {{ .Values.pod.user.congress.uid }} + command: + - /tmp/congress-policy-engine.sh + - start + volumeMounts: + - name: etccongress + mountPath: /etc/congress + - name: congress-bin + mountPath: /tmp/congress-policy-engine.sh + subPath: congress-policy-engine.sh + readOnly: true + - name: congress-etc + mountPath: /etc/congress/congress.conf + subPath: congress.conf + readOnly: true + - name: congress-etc + mountPath: /etc/congress/api-paste.ini + subPath: api-paste.ini + readOnly: true + - name: congress-etc + mountPath: /etc/congress/policy.json + subPath: policy.json + readOnly: true volumes: - name: etccongress emptyDir: {} diff --git a/congress/templates/job-ds-create.yaml b/congress/templates/job-ds-create.yaml index ed86cbc7ea..1cde4c0cac 100644 --- a/congress/templates/job-ds-create.yaml +++ b/congress/templates/job-ds-create.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "ds_create" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: congress-ds-create - image: {{ .Values.images.tags.congress_ds_create }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "congress_ds_create" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ds_create | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ds-create.sh diff --git a/congress/templates/pod-test.yaml b/congress/templates/pod-test.yaml index 6ddf629263..9ac05286a8 100644 --- a/congress/templates/pod-test.yaml +++ b/congress/templates/pod-test.yaml @@ -32,7 +32,7 @@ spec: restartPolicy: Never containers: - name: {{.Release.Name}}-congress-test - image: {{ .Values.images.tags.congress_scripted_test }} +{{ tuple $envAll "congress_scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }} diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml index d778f70435..4bdf7a6f02 100644 --- a/etcd/templates/deployment.yaml +++ b/etcd/templates/deployment.yaml @@ -41,8 +41,7 @@ spec: {{ tuple $envAll "etcd" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: etcd - image: {{ .Values.images.tags.etcd }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "etcd" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/etcd.sh ports: diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index 68b9ddb107..38192e98e7 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -47,8 +47,7 @@ spec: initContainers: {{ tuple $envAll "api" $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: glance-perms - image: {{ .Values.images.tags.glance_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} @@ -62,8 +61,7 @@ spec: mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }} {{ if eq .Values.storage "rbd" }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.glance_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.glance.uid }} env: @@ -85,8 +83,7 @@ spec: {{ end }} containers: - name: glance-api - image: {{ .Values.images.tags.glance_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.glance.uid }} diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 338d57c11a..638d8cbaa2 100644 --- a/glance/templates/deployment-registry.yaml +++ b/glance/templates/deployment-registry.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "registry" $mounts_glance_registry_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: glance-registry - image: {{ .Values.images.tags.glance_registry }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "glance_registry" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.registry | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.glance.uid }} diff --git a/glance/templates/job-clean.yaml b/glance/templates/job-clean.yaml index 66401eb774..1b1959a528 100644 --- a/glance/templates/job-clean.yaml +++ b/glance/templates/job-clean.yaml @@ -71,8 +71,7 @@ spec: containers: {{- if eq .Values.storage "rbd" }} - name: glance-secret-clean - image: {{ .Values.images.tags.glance_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "glance_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: NAMESPACE @@ -90,8 +89,7 @@ spec: readOnly: true {{ end }} - name: glance-image-clean - image: {{ .Values.images.tags.bootstrap }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml index e3fd37a5f3..3442c204f9 100644 --- a/glance/templates/job-storage-init.yaml +++ b/glance/templates/job-storage-init.yaml @@ -66,8 +66,7 @@ spec: {{ tuple $envAll "storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ if or (eq .Values.storage "rbd") (eq .Values.storage "radosgw") }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.glance_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.glance.uid }} command: @@ -88,8 +87,7 @@ spec: {{ end }} containers: - name: glance-storage-init - image: {{ .Values.images.tags.glance_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "glance_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: NAMESPACE diff --git a/glance/templates/pod-rally-test.yaml b/glance/templates/pod-rally-test.yaml index 7b3cb67c3b..327dd4c11f 100644 --- a/glance/templates/pod-rally-test.yaml +++ b/glance/templates/pod-rally-test.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} - name: {{ .Release.Name }}-test-ks-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} command: - /tmp/ks-user.sh @@ -60,8 +59,7 @@ spec: value: {{ .Values.endpoints.identity.auth.test.role | quote }} containers: - name: {{ .Release.Name }}-test - image: {{ .Values.images.tags.test }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml index 09fabe710e..8486ff33ed 100644 --- a/gnocchi/templates/daemonset-metricd.yaml +++ b/gnocchi/templates/daemonset-metricd.yaml @@ -43,8 +43,7 @@ spec: initContainers: {{ tuple $envAll "metricd" $mounts_gnocchi_metricd_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.gnocchi_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/ceph-keyring.sh volumeMounts: @@ -60,8 +59,7 @@ spec: readOnly: true containers: - name: gnocchi-metricd - image: {{ .Values.images.tags.gnocchi_metricd }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_metricd" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.metricd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/gnocchi-metricd.sh diff --git a/gnocchi/templates/daemonset-statsd.yaml b/gnocchi/templates/daemonset-statsd.yaml index bbd8c2b69c..7ae64eaad0 100644 --- a/gnocchi/templates/daemonset-statsd.yaml +++ b/gnocchi/templates/daemonset-statsd.yaml @@ -42,8 +42,7 @@ spec: initContainers: {{ tuple $envAll "statsd" $mounts_gnocchi_statsd_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.gnocchi_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/ceph-keyring.sh volumeMounts: @@ -59,8 +58,7 @@ spec: readOnly: true containers: - name: gnocchi-statsd - image: {{ .Values.images.tags.gnocchi_statsd }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_statsd" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.statsd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/gnocchi-statsd.sh diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml index c575db5dc7..78bf081a88 100644 --- a/gnocchi/templates/deployment-api.yaml +++ b/gnocchi/templates/deployment-api.yaml @@ -47,8 +47,7 @@ spec: initContainers: {{ tuple $envAll "api" $mounts_gnocchi_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.gnocchi_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/ceph-keyring.sh volumeMounts: @@ -64,8 +63,7 @@ spec: readOnly: true containers: - name: gnocchi-api - image: {{ .Values.images.tags.gnocchi_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/gnocchi-api.sh diff --git a/gnocchi/templates/job-clean.yaml b/gnocchi/templates/job-clean.yaml index a17b98d371..c0e76bea91 100644 --- a/gnocchi/templates/job-clean.yaml +++ b/gnocchi/templates/job-clean.yaml @@ -69,8 +69,7 @@ spec: {{ tuple $envAll "clean" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: gnocchi-rbd-secret-clean - image: {{ .Values.images.tags.gnocchi_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.clean | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: NAMESPACE diff --git a/gnocchi/templates/job-db-init-indexer.yaml b/gnocchi/templates/job-db-init-indexer.yaml index a4025dd647..19abe9dd14 100644 --- a/gnocchi/templates/job-db-init-indexer.yaml +++ b/gnocchi/templates/job-db-init-indexer.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "db_init_postgresql" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: gnocchi-db-init-indexer - image: {{ .Values.images.tags.db_init_indexer }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "db_init_indexer" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init_indexer | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: ROOT_DB_CONNECTION diff --git a/gnocchi/templates/job-db-sync.yaml b/gnocchi/templates/job-db-sync.yaml index ecd45746e3..3dd1a1b83e 100644 --- a/gnocchi/templates/job-db-sync.yaml +++ b/gnocchi/templates/job-db-sync.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "db_sync" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.gnocchi_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/ceph-keyring.sh volumeMounts: @@ -54,8 +53,7 @@ spec: readOnly: true containers: - name: gnocchi-db-sync - image: {{ .Values.images.tags.db_sync }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "db_sync" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/db-sync.sh diff --git a/gnocchi/templates/job-storage-init.yaml b/gnocchi/templates/job-storage-init.yaml index f049422a11..60bc1dfaa0 100644 --- a/gnocchi/templates/job-storage-init.yaml +++ b/gnocchi/templates/job-storage-init.yaml @@ -65,8 +65,7 @@ spec: initContainers: {{ tuple $envAll "storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.gnocchi_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.gnocchi.uid }} command: @@ -84,8 +83,7 @@ spec: readOnly: true containers: - name: gnocchi-storage-init - image: {{ .Values.images.tags.gnocchi_storage_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: NAMESPACE diff --git a/gnocchi/templates/pod-gnocchi-test.yaml b/gnocchi/templates/pod-gnocchi-test.yaml index 2f884a39e2..0d411b55d3 100644 --- a/gnocchi/templates/pod-gnocchi-test.yaml +++ b/gnocchi/templates/pod-gnocchi-test.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} containers: - name: {{.Release.Name}}-helm-tests - image: {{ .Values.images.tags.gnocchi_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/heat/templates/cron-job-engine-cleaner.yaml b/heat/templates/cron-job-engine-cleaner.yaml index b48ebdf01d..6ec9bc28e7 100644 --- a/heat/templates/cron-job-engine-cleaner.yaml +++ b/heat/templates/cron-job-engine-cleaner.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "engine_cleaner" $mounts_heat_engine_cleaner_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} containers: - name: heat-engine-cleaner - image: {{ .Values.images.tags.heat_engine_cleaner }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "heat_engine_cleaner" | include "helm-toolkit.snippets.image" | indent 14 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.engine_cleaner | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }} command: - /tmp/heat-engine-cleaner.sh diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index 28c5e82dd7..427614c8c5 100644 --- a/heat/templates/deployment-api.yaml +++ b/heat/templates/deployment-api.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "api" $mounts_heat_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-api - image: {{ .Values.images.tags.heat_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "heat_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.heat.uid }} diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index 52e8f5bae1..ef849f1e51 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/heat/templates/deployment-cfn.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "cfn" $mounts_heat_cfn_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-cfn - image: {{ .Values.images.tags.heat_cfn }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "heat_cfn" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.cfn | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.heat.uid }} diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index 95ded1fe8e..1b5a6e39a1 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/heat/templates/deployment-cloudwatch.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "cloudwatch" $mounts_heat_cloudwatch_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-cloudwatch - image: {{ .Values.images.tags.heat_cloudwatch }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "heat_cloudwatch" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.cloudwatch | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.heat.uid }} diff --git a/heat/templates/deployment-engine.yaml b/heat/templates/deployment-engine.yaml index bf899f1844..450f41f078 100644 --- a/heat/templates/deployment-engine.yaml +++ b/heat/templates/deployment-engine.yaml @@ -56,8 +56,7 @@ spec: {{ tuple $envAll "engine" $mounts_heat_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-engine - image: {{ .Values.images.tags.heat_engine }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "heat_engine" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.heat.uid }} diff --git a/heat/templates/job-ks-user-domain.yaml b/heat/templates/job-ks-user-domain.yaml index 1962fd4eaf..da04d782b6 100644 --- a/heat/templates/job-ks-user-domain.yaml +++ b/heat/templates/job-ks-user-domain.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "ks_user" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-ks-domain-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/ks-domain-user.sh volumeMounts: diff --git a/heat/templates/job-trusts.yaml b/heat/templates/job-trusts.yaml index 9343b56731..75008de8a6 100644 --- a/heat/templates/job-trusts.yaml +++ b/heat/templates/job-trusts.yaml @@ -40,8 +40,7 @@ spec: {{ tuple $envAll "trusts" $mounts_heat_trusts_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-trusts - image: {{ $envAll.Values.images.tags.ks_service }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll "ks_service" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.trusts | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - bash diff --git a/heat/templates/pod-rally-test.yaml b/heat/templates/pod-rally-test.yaml index 4efdfd446a..d1cdea370b 100644 --- a/heat/templates/pod-rally-test.yaml +++ b/heat/templates/pod-rally-test.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} - name: {{ .Release.Name }}-test-ks-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} command: - /tmp/ks-user.sh @@ -60,8 +59,7 @@ spec: value: {{ .Values.endpoints.identity.auth.test.role | quote }} containers: - name: {{ .Release.Name }}-test - image: {{ .Values.images.tags.test }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index 608e1b8f82..7f134d78d6 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "dashboard" $mounts_horizon_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: horizon - image: {{ .Values.images.tags.horizon }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "horizon" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: 0 diff --git a/horizon/templates/job-db-sync.yaml b/horizon/templates/job-db-sync.yaml index 8f78996b2a..72e6adf608 100644 --- a/horizon/templates/job-db-sync.yaml +++ b/horizon/templates/job-db-sync.yaml @@ -41,8 +41,7 @@ spec: {{ tuple $envAll "db_sync" $mounts_horizon_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: horizon-db-sync - image: {{ .Values.images.tags.horizon_db_sync }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "horizon_db_sync" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/db-sync.sh diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml index 89de689f8b..198c0b7134 100644 --- a/ingress/templates/deployment-error.yaml +++ b/ingress/templates/deployment-error.yaml @@ -42,8 +42,7 @@ spec: {{ tuple $envAll "error_pages" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ingress-error-pages - image: {{ .Values.images.tags.error_pages }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "error_pages" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.error_pages | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} livenessProbe: httpGet: diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index baa945ee9a..fb43a3b5f7 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -182,8 +182,7 @@ spec: {{ tuple $envAll "ingress" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if and .Values.network.host_namespace .Values.network.vip.manage }} - name: ingress-vip-kernel-modules - image: {{ .Values.images.tags.ingress }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: capabilities: add: @@ -201,8 +200,7 @@ spec: mountPath: /mnt/host-rootfs readOnly: true - name: ingress-vip-init - image: {{ .Values.images.tags.ingress }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: capabilities: add: @@ -221,8 +219,7 @@ spec: {{- end }} containers: - name: ingress - image: {{ .Values.images.tags.ingress }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.ingress | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} readinessProbe: httpGet: @@ -279,8 +276,7 @@ spec: readOnly: true {{- if and .Values.network.host_namespace .Values.network.vip.manage }} - name: ingress-vip - image: {{ .Values.images.tags.ingress }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: capabilities: add: diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml index 340d4f48ae..9dd34e48e4 100644 --- a/ironic/templates/deployment-api.yaml +++ b/ironic/templates/deployment-api.yaml @@ -47,8 +47,7 @@ spec: initContainers: {{ tuple $envAll "api" $mounts_ironic_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ironic-retrive-swift-config - image: {{ .Values.images.tags.ironic_retrive_swift_config }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_retrive_swift_config" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: OS_SWIFT_API_VERSION @@ -66,8 +65,7 @@ spec: - name: pod-shared mountPath: /tmp/pod-shared - name: ironic-retrive-cleaning-net - image: {{ .Values.images.tags.ironic_retrive_cleaning_network }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_retrive_cleaning_network" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.ironic }} @@ -85,8 +83,7 @@ spec: mountPath: /tmp/pod-shared containers: - name: ironic-api - image: {{ .Values.images.tags.ironic_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ironic-api.sh diff --git a/ironic/templates/job-manage-cleaning-network.yaml b/ironic/templates/job-manage-cleaning-network.yaml index 28009ca480..572447952d 100644 --- a/ironic/templates/job-manage-cleaning-network.yaml +++ b/ironic/templates/job-manage-cleaning-network.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "manage_cleaning_network" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ironic-manage-cleaning-network - image: {{ .Values.images.tags.ironic_manage_cleaning_network }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_manage_cleaning_network" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.manage_cleaning_network | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.ironic }} diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml index 2bfc1d07b4..57d86e30ba 100644 --- a/ironic/templates/statefulset-conductor.yaml +++ b/ironic/templates/statefulset-conductor.yaml @@ -48,8 +48,7 @@ spec: initContainers: {{ tuple $envAll "conductor" $mounts_ironic_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ironic-conductor-pxe-init - image: {{ .Values.images.tags.ironic_pxe_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_pxe_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ironic-conductor-pxe-init.sh @@ -61,8 +60,7 @@ spec: - name: pod-data mountPath: /var/lib/openstack-helm - name: ironic-conductor-init - image: {{ .Values.images.tags.ironic_conductor }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_conductor" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: PROVISIONER_INTERFACE @@ -77,8 +75,7 @@ spec: - name: pod-shared mountPath: /tmp/pod-shared - name: ironic-conductor-http-init - image: {{ .Values.images.tags.ironic_conductor }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_conductor" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: PROVISIONER_INTERFACE @@ -97,8 +94,7 @@ spec: - name: pod-shared mountPath: /tmp/pod-shared - name: ironic-retrive-swift-config - image: {{ .Values.images.tags.ironic_retrive_swift_config }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_retrive_swift_config" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: OS_SWIFT_API_VERSION @@ -116,8 +112,7 @@ spec: - name: pod-shared mountPath: /tmp/pod-shared - name: ironic-retrive-cleaning-net - image: {{ .Values.images.tags.ironic_retrive_cleaning_network }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_retrive_cleaning_network" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.ironic }} @@ -135,8 +130,7 @@ spec: mountPath: /tmp/pod-shared containers: - name: ironic-conductor - image: {{ .Values.images.tags.ironic_conductor }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_conductor" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true @@ -170,8 +164,7 @@ spec: - name: pod-data mountPath: /var/lib/openstack-helm - name: ironic-conductor-pxe - image: {{ .Values.images.tags.ironic_pxe }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_pxe" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true @@ -192,8 +185,7 @@ spec: - name: pod-data mountPath: /var/lib/openstack-helm - name: ironic-conductor-http - image: {{ .Values.images.tags.ironic_pxe_http }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ironic_pxe_http" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ironic-conductor-http.sh diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml index ab06099244..b505e5b35e 100644 --- a/keystone/templates/cron-job-credential-rotate.yaml +++ b/keystone/templates/cron-job-credential-rotate.yaml @@ -75,8 +75,7 @@ spec: {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: - name: keystone-credential-rotate - image: {{ .Values.images.tags.keystone_credential_rotate }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "keystone_credential_rotate" | include "helm-toolkit.snippets.image" | indent 14 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.credential_rotate | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }} env: - name: KEYSTONE_USER diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml index 4c946cd890..144a394bf5 100644 --- a/keystone/templates/cron-job-fernet-rotate.yaml +++ b/keystone/templates/cron-job-fernet-rotate.yaml @@ -76,8 +76,7 @@ spec: {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: - name: keystone-fernet-rotate - image: {{ .Values.images.tags.keystone_fernet_rotate }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "keystone_fernet_rotate" | include "helm-toolkit.snippets.image" | indent 14 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.fernet_rotate | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }} env: - name: KEYSTONE_USER diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml index 5e98f9f737..1b85f16533 100644 --- a/keystone/templates/deployment-api.yaml +++ b/keystone/templates/deployment-api.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "api" $mounts_keystone_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: keystone-api - image: {{ .Values.images.tags.keystone_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "keystone_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/keystone-api.sh diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml index 9d32b19ac2..07b3b282ac 100644 --- a/keystone/templates/job-credential-setup.yaml +++ b/keystone/templates/job-credential-setup.yaml @@ -69,8 +69,7 @@ spec: {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: - name: keystone-credential-setup - image: {{ .Values.images.tags.keystone_credential_setup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "keystone_credential_setup" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.credential_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: KEYSTONE_USER diff --git a/keystone/templates/job-domain-manage.yaml b/keystone/templates/job-domain-manage.yaml index f3e3a2f85c..c515e7ef19 100644 --- a/keystone/templates/job-domain-manage.yaml +++ b/keystone/templates/job-domain-manage.yaml @@ -40,8 +40,7 @@ spec: initContainers: {{ tuple $envAll "domain_manage" $mounts_keystone_domain_manage_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: keystone-domain-manage-init - image: {{ .Values.images.tags.bootstrap }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.domain_manage | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} @@ -56,8 +55,7 @@ spec: readOnly: true containers: - name: keystone-domain-manage - image: {{ .Values.images.tags.keystone_domain_manage }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "keystone_domain_manage" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.domain_manage | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml index 3269e62bad..0af3a799c0 100644 --- a/keystone/templates/job-fernet-setup.yaml +++ b/keystone/templates/job-fernet-setup.yaml @@ -70,8 +70,7 @@ spec: {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: - name: keystone-fernet-setup - image: {{ .Values.images.tags.keystone_fernet_setup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "keystone_fernet_setup" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.fernet_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: KEYSTONE_USER diff --git a/keystone/templates/pod-rally-test.yaml b/keystone/templates/pod-rally-test.yaml index 9e3f387776..93bbb54c19 100644 --- a/keystone/templates/pod-rally-test.yaml +++ b/keystone/templates/pod-rally-test.yaml @@ -35,8 +35,7 @@ spec: initContainers: {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} - name: {{ .Release.Name }}-test-ks-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} command: - /tmp/ks-user.sh @@ -58,8 +57,7 @@ spec: value: {{ .Values.endpoints.identity.auth.test.role | quote }} containers: - name: {{ .Release.Name }}-test - image: {{ .Values.images.tags.test }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/ldap/templates/statefulset.yaml b/ldap/templates/statefulset.yaml index bad93d7eb2..ccc7d1e511 100644 --- a/ldap/templates/statefulset.yaml +++ b/ldap/templates/statefulset.yaml @@ -40,22 +40,21 @@ spec: initContainers: {{ tuple $envAll "ldap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - - name: ldap - image: {{ .Values.images.tags.ldap }} - imagePullPolicy: {{ .Values.images.pull_policy }} - env: - - name: LDAP_DOMAIN - value: {{ .Values.endpoints.ldap.auth.domainname }} - - name: LDAP_ADMIN_PASSWORD - value: {{ .Values.endpoints.ldap.auth.password }} - ports: - - containerPort: {{ tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + - name: ldap +{{ tuple $envAll "ldap" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - volumeMounts: - - name: ldap-data - mountPath: /var/lib/ldap - - name: ldap-config - mountPath: /etc/ldap/slapd.d + env: + - name: LDAP_DOMAIN + value: {{ .Values.endpoints.ldap.auth.domainname }} + - name: LDAP_ADMIN_PASSWORD + value: {{ .Values.endpoints.ldap.auth.password }} + ports: + - containerPort: {{ tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + volumeMounts: + - name: ldap-data + mountPath: /var/lib/ldap + - name: ldap-config + mountPath: /etc/ldap/slapd.d {{- if not .Values.volume.enabled }} volumes: - name: ldap-data diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml index 1f4bade8a2..93795f43ab 100644 --- a/libvirt/templates/daemonset-libvirt.yaml +++ b/libvirt/templates/daemonset-libvirt.yaml @@ -48,8 +48,7 @@ spec: {{- if .Values.conf.ceph.enabled }} {{- if empty .Values.conf.ceph.cinder.keyring }} - name: ceph-admin-keyring-placement - image: {{ .Values.images.tags.libvirt }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "libvirt" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -69,8 +68,7 @@ spec: {{ end }} {{ end }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.libvirt }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "libvirt" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 env: @@ -98,8 +96,7 @@ spec: {{- end }} containers: - name: libvirt - image: {{ .Values.images.tags.libvirt }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "libvirt" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.libvirt | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index 4760b76c75..ca9106ca26 100644 --- a/magnum/templates/deployment-api.yaml +++ b/magnum/templates/deployment-api.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "api" $mounts_magnum_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: magnum-api - image: {{ .Values.images.tags.magnum_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "magnum_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.magnum.uid }} diff --git a/magnum/templates/job-ks-user-domain.yaml b/magnum/templates/job-ks-user-domain.yaml index 85f7b0ded1..6b5ed3e35e 100644 --- a/magnum/templates/job-ks-user-domain.yaml +++ b/magnum/templates/job-ks-user-domain.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "ks_user" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: magnum-ks-domain-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 10 }} command: - /tmp/ks-domain-user.sh volumeMounts: diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml index 54240c0736..50edb8a496 100644 --- a/magnum/templates/statefulset-conductor.yaml +++ b/magnum/templates/statefulset-conductor.yaml @@ -44,8 +44,7 @@ spec: initContainers: {{ tuple $envAll "conductor" $mounts_magnum_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: magnum-conductor-init - image: {{ .Values.images.tags.magnum_conductor }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "magnum_conductor" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.magnum.uid }} @@ -65,8 +64,7 @@ spec: mountPath: /tmp/pod-shared containers: - name: magnum-conductor - image: {{ .Values.images.tags.magnum_conductor }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "magnum_conductor" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.magnum.uid }} diff --git a/mariadb/templates/deployment-error.yaml b/mariadb/templates/deployment-error.yaml index b1d5ea4f3f..e274dd8444 100644 --- a/mariadb/templates/deployment-error.yaml +++ b/mariadb/templates/deployment-error.yaml @@ -45,8 +45,7 @@ spec: {{ tuple $envAll "error_pages" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ingress-error-pages - image: {{ .Values.images.tags.error_pages }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "error_pages" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.error_pages | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} livenessProbe: httpGet: diff --git a/mariadb/templates/deployment-ingress.yaml b/mariadb/templates/deployment-ingress.yaml index 2451eef01a..c3adf87f00 100644 --- a/mariadb/templates/deployment-ingress.yaml +++ b/mariadb/templates/deployment-ingress.yaml @@ -140,8 +140,7 @@ spec: {{ tuple $envAll "ingress" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ingress - image: {{ .Values.images.tags.ingress }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.ingress | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} readinessProbe: tcpSocket: diff --git a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml index e9ba83bf9e..51ba35ac1a 100644 --- a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml @@ -41,8 +41,7 @@ spec: {{ tuple $envAll "prometheus_mysql_exporter" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mysql-exporter - image: {{ .Values.images.tags.prometheus_mysql_exporter }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "prometheus_mysql_exporter" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.prometheus_mysql_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/mysqld-exporter.sh diff --git a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml index 8451fc8712..744d487553 100644 --- a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml +++ b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "prometheus_mysql_exporter" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: exporter-create-sql-user - image: {{ .Values.images.tags.prometheus_create_mysql_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "prometheus_create_mysql_user" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.prometheus_create_mysql_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/create-mysql-user.sh diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml index f81b959906..8865dc4f15 100644 --- a/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml @@ -43,8 +43,7 @@ spec: {{ tuple $envAll "mariadb" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if .Values.volume.chown_on_start }} - name: mariadb-perms - image: {{ .Values.images.tags.mariadb }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "mariadb" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} @@ -59,8 +58,7 @@ spec: {{- end }} containers: - name: mariadb - image: {{ .Values.images.tags.mariadb }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "mariadb" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: POD_IP diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index 8845e8d7e9..af32cf5793 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -43,8 +43,7 @@ spec: {{ tuple $envAll "memcached" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 9 }} containers: - name: memcached - image: {{ .Values.images.tags.memcached }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "memcached" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: MEMCACHED_PORT diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index e48ad0566d..749c9d7b07 100644 --- a/mistral/templates/deployment-api.yaml +++ b/mistral/templates/deployment-api.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "api" $mounts_mistral_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-api - image: {{ .Values.images.tags.mistral_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "mistral_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.mistral.uid }} diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index 161d4ecb41..a59e40e535 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/mistral/templates/deployment-executor.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "executor" $mounts_mistral_executor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-executor - image: {{ .Values.images.tags.mistral_executor }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "mistral_executor" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.executor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.mistral.uid }} diff --git a/mistral/templates/pod-rally-test.yaml b/mistral/templates/pod-rally-test.yaml index 15d48bd1e7..2cae93f43b 100644 --- a/mistral/templates/pod-rally-test.yaml +++ b/mistral/templates/pod-rally-test.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} - name: {{ .Release.Name }}-test-ks-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} command: - /tmp/ks-user.sh @@ -60,8 +59,7 @@ spec: value: {{ .Values.endpoints.identity.auth.test.role | quote }} containers: - name: {{ .Release.Name }}-test - image: {{ .Values.images.tags.test }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index 1aee2dea5e..72232cd395 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/mistral/templates/statefulset-engine.yaml @@ -44,8 +44,7 @@ spec: {{ tuple $envAll "engine" $mounts_mistral_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-engine - image: {{ .Values.images.tags.mistral_engine }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "mistral_engine" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.mistral.uid }} diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index b0d244bf65..4922759b97 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/mistral/templates/statefulset-event-engine.yaml @@ -44,8 +44,7 @@ spec: {{ tuple $envAll "event_engine" $mounts_mistral_event_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-event-engine - image: {{ .Values.images.tags.mistral_event_engine }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "mistral_event_engine" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.event_engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.mistral.uid }} diff --git a/mongodb/templates/statefulset.yaml b/mongodb/templates/statefulset.yaml index 8828dbf739..fd2ab53f02 100644 --- a/mongodb/templates/statefulset.yaml +++ b/mongodb/templates/statefulset.yaml @@ -41,8 +41,7 @@ spec: {{ tuple $envAll "mongodb" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if $envAll.Values.volume.chown_on_start }} - name: mongodb-perms - image: {{ $envAll.Values.images.tags.mongodb }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll "mongodb" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} @@ -57,10 +56,9 @@ spec: {{- end }} containers: - name: mongodb - image: {{ .Values.images.tags.mongodb }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "mongodb" | include "helm-toolkit.snippets.image" | indent 10 }} ports: - - containerPort: {{ tuple "mongodb" "internal" "mongodb" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + - containerPort: {{ tuple "mongodb" "internal" "mongodb" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} env: - name: ADMIN_PASS valueFrom: diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index 5f43a39fc4..dd257a6d0c 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/neutron/templates/daemonset-dhcp-agent.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "pod_dependency" $mounts_neutron_dhcp_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-dhcp-agent - image: {{ .Values.images.tags.neutron_dhcp }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_dhcp" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.dhcp | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.neutron.uid }} diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index af08ad226d..10643f3f57 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/neutron/templates/daemonset-l3-agent.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "pod_dependency" $mounts_neutron_l3_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-l3-agent - image: {{ .Values.images.tags.neutron_l3 }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_l3" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.l3 | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.neutron.uid }} diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemonset-lb-agent.yaml index ad337b9a23..2459761d5f 100644 --- a/neutron/templates/daemonset-lb-agent.yaml +++ b/neutron/templates/daemonset-lb-agent.yaml @@ -47,8 +47,7 @@ spec: initContainers: {{ tuple $envAll "pod_dependency" $mounts_neutron_lb_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: neutron-lb-agent-kernel-modules - image: {{ .Values.images.tags.neutron_linuxbridge_agent }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_linuxbridge_agent" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: capabilities: add: @@ -65,8 +64,7 @@ spec: mountPath: /mnt/host-rootfs readOnly: true - name: neutron-lb-agent-init - image: {{ .Values.images.tags.neutron_linuxbridge_agent }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_linuxbridge_agent" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true @@ -118,8 +116,7 @@ spec: {{ if $mounts_neutron_lb_agent.volumeMounts }}{{ toYaml $mounts_neutron_lb_agent.volumeMounts | indent 12 }}{{ end }} containers: - name: neutron-lb-agent - image: {{ .Values.images.tags.neutron_linuxbridge_agent }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_linuxbridge_agent" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.neutron.uid }} diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index fe7d194e87..6d4f82bc06 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/neutron/templates/daemonset-metadata-agent.yaml @@ -47,8 +47,7 @@ spec: initContainers: {{ tuple $envAll "pod_dependency" $mounts_neutron_metadata_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: neutron-metadata-agent-init - image: {{ .Values.images.tags.neutron_metadata }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_metadata" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: 0 @@ -70,8 +69,7 @@ spec: mountPath: /var/lib/neutron/openstack-helm containers: - name: neutron-metadata-agent - image: {{ .Values.images.tags.neutron_metadata }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_metadata" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.neutron.uid }} diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index b9d5497e4c..8710879a15 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/neutron/templates/daemonset-ovs-agent.yaml @@ -47,8 +47,7 @@ spec: initContainers: {{ tuple $envAll "pod_dependency" $mounts_neutron_ovs_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: neutron-openvswitch-agent-kernel-modules - image: {{ .Values.images.tags.neutron_openvswitch_agent }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: capabilities: add: @@ -65,8 +64,7 @@ spec: mountPath: /mnt/host-rootfs readOnly: true - name: neutron-ovs-agent-init - image: {{ .Values.images.tags.neutron_openvswitch_agent }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true @@ -118,8 +116,7 @@ spec: {{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }} containers: - name: neutron-ovs-agent - image: {{ .Values.images.tags.neutron_openvswitch_agent }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.neutron.uid }} diff --git a/neutron/templates/daemonset-sriov-agent.yaml b/neutron/templates/daemonset-sriov-agent.yaml index 3170d21271..941584fe0c 100644 --- a/neutron/templates/daemonset-sriov-agent.yaml +++ b/neutron/templates/daemonset-sriov-agent.yaml @@ -47,8 +47,7 @@ spec: initContainers: {{ tuple $envAll "pod_dependency" $mounts_neutron_sriov_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: neutron-sriov-agent-init - image: {{ .Values.images.tags.neutron_sriov_agent_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_sriov_agent_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.sriov | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true @@ -100,8 +99,7 @@ spec: {{ if $mounts_neutron_sriov_agent.volumeMounts }}{{ toYaml $mounts_neutron_sriov_agent.volumeMounts | indent 12 }}{{ end }} containers: - name: neutron-sriov-agent - image: {{ .Values.images.tags.neutron_sriov_agent }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_sriov_agent" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.agent.sriov | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.neutron.uid }} diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index 8fdbf4a400..0914ee74a0 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -51,8 +51,7 @@ spec: {{ tuple $envAll "pod_dependency" $mounts_neutron_server_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-server - image: {{ .Values.images.tags.neutron_server }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "neutron_server" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.neutron.uid }} diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml index 2412cb8b62..5e0b03d4f3 100644 --- a/neutron/templates/pod-rally-test.yaml +++ b/neutron/templates/pod-rally-test.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} - name: {{ .Release.Name }}-test-ks-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} command: - /tmp/ks-user.sh @@ -60,8 +59,7 @@ spec: value: {{ .Values.endpoints.identity.auth.test.role | quote }} containers: - name: {{ .Release.Name }}-test - image: {{ .Values.images.tags.test }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/nova/templates/cron-job-cell-setup.yaml b/nova/templates/cron-job-cell-setup.yaml index 5f750c8511..eac6297227 100644 --- a/nova/templates/cron-job-cell-setup.yaml +++ b/nova/templates/cron-job-cell-setup.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "cell_setup" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} containers: - name: nova-cell-setup - image: {{ .Values.images.tags.nova_cell_setup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_cell_setup" | include "helm-toolkit.snippets.image" | indent 14 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.cell_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }} command: - /tmp/cell-setup.sh diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index c878093874..7d9f76b015 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -47,8 +47,7 @@ spec: initContainers: {{ tuple $envAll "pod_dependency" $mounts_nova_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: nova-compute-init - image: {{ .Values.images.tags.nova_compute }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_compute" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 env: @@ -66,8 +65,7 @@ spec: {{- if .Values.conf.ceph.enabled }} {{- if empty .Values.conf.ceph.cinder.keyring }} - name: ceph-admin-keyring-placement - image: {{ .Values.images.tags.nova_compute }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_compute" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 command: @@ -87,8 +85,7 @@ spec: {{ end }} {{ end }} - name: ceph-keyring-placement - image: {{ .Values.images.tags.nova_compute }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_compute" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} env: @@ -115,8 +112,7 @@ spec: {{ end }} {{- if eq .Values.console.console_kind "novnc"}} - name: nova-compute-vnc-init - image: {{ .Values.images.tags.nova_compute }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_compute" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} @@ -132,8 +128,7 @@ spec: {{ end }} {{- if eq .Values.console.console_kind "spice"}} - name: nova-compute-spice-init - image: {{ .Values.images.tags.nova_compute }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_compute" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} @@ -149,8 +144,7 @@ spec: {{ end }} containers: - name: nova-compute - image: {{ .Values.images.tags.nova_compute }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_compute" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} @@ -244,8 +238,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.nova_compute_ssh }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_compute_ssh" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.ssh | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml index 67ddecfd92..c6e37bd91e 100644 --- a/nova/templates/deployment-api-metadata.yaml +++ b/nova/templates/deployment-api-metadata.yaml @@ -47,8 +47,7 @@ spec: initContainers: {{ tuple $envAll "api" $mounts_nova_api_metadata_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: nova-api-metadata-init - image: {{ .Values.images.tags.nova_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} @@ -67,8 +66,7 @@ spec: mountPath: /tmp/pod-shared containers: - name: nova-api - image: {{ .Values.images.tags.nova_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml index 67d39deac8..4daf6bd091 100644 --- a/nova/templates/deployment-api-osapi.yaml +++ b/nova/templates/deployment-api-osapi.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "api" $mounts_nova_api_osapi_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-osapi - image: {{ .Values.images.tags.nova_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml index 6dffed1685..53441525f7 100644 --- a/nova/templates/deployment-conductor.yaml +++ b/nova/templates/deployment-conductor.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "conductor" $mounts_nova_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-conductor - image: {{ .Values.images.tags.nova_conductor }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_conductor" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml index 9bbc31daca..0c95339d77 100644 --- a/nova/templates/deployment-consoleauth.yaml +++ b/nova/templates/deployment-consoleauth.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "consoleauth" $mounts_nova_consoleauth_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-consoleauth - image: {{ .Values.images.tags.nova_consoleauth }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_consoleauth" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml index f11c2ae219..e30b1661a0 100644 --- a/nova/templates/deployment-novncproxy.yaml +++ b/nova/templates/deployment-novncproxy.yaml @@ -48,8 +48,7 @@ spec: initContainers: {{ tuple $envAll "novncproxy" $mounts_nova_novncproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: nova-novncproxy-init - image: {{ .Values.images.tags.nova_novncproxy }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_novncproxy" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} @@ -67,8 +66,7 @@ spec: - name: pod-shared mountPath: /tmp/pod-shared - name: nova-novncproxy-init-assets - image: {{ .Values.images.tags.nova_novncproxy_assets }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_novncproxy_assets" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-console-proxy-init-assets.sh @@ -81,8 +79,7 @@ spec: mountPath: /tmp/usr/share/novnc containers: - name: nova-novncproxy - image: {{ .Values.images.tags.nova_novncproxy }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_novncproxy" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-console-proxy.sh diff --git a/nova/templates/deployment-placement.yaml b/nova/templates/deployment-placement.yaml index 3c2c9e7f80..e89634646d 100644 --- a/nova/templates/deployment-placement.yaml +++ b/nova/templates/deployment-placement.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "api" $mounts_nova_placement_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-placement-api - image: {{ .Values.images.tags.nova_placement }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_placement" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.placement | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-placement-api.sh diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml index deab124be8..088cd21d1a 100644 --- a/nova/templates/deployment-scheduler.yaml +++ b/nova/templates/deployment-scheduler.yaml @@ -47,8 +47,7 @@ spec: {{ tuple $envAll "scheduler" $mounts_nova_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-scheduler - image: {{ .Values.images.tags.nova_scheduler }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_scheduler" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml index 027ccb2d84..7fe4ed2a10 100644 --- a/nova/templates/deployment-spiceproxy.yaml +++ b/nova/templates/deployment-spiceproxy.yaml @@ -48,8 +48,7 @@ spec: initContainers: {{ tuple $envAll "spiceproxy" $mounts_nova_spiceproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: nova-spiceproxy-init - image: {{ .Values.images.tags.nova_spiceproxy }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_spiceproxy" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} @@ -67,8 +66,7 @@ spec: - name: pod-shared mountPath: /tmp/pod-shared - name: nova-spiceproxy-init-assets - image: {{ .Values.images.tags.nova_spiceproxy_assets }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_spiceproxy_assets" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-console-proxy-init-assets.sh @@ -81,8 +79,7 @@ spec: mountPath: /tmp/usr/share/spice-html5 containers: - name: nova-spiceproxy - image: {{ .Values.images.tags.nova_spiceproxy }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_spiceproxy" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.spiceproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-console-proxy.sh diff --git a/nova/templates/job-cell-setup.yaml b/nova/templates/job-cell-setup.yaml index 0fa9def355..c0af822003 100644 --- a/nova/templates/job-cell-setup.yaml +++ b/nova/templates/job-cell-setup.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "cell_setup" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: nova-cell-setup-init - image: {{ .Values.images.tags.nova_cell_setup_init }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_cell_setup_init" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.cell_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: {{- with $env := dict "ksUserSecret" $envAll.Values.secrets.identity.admin }} @@ -53,8 +52,7 @@ spec: readOnly: true containers: - name: nova-cell-setup - image: {{ .Values.images.tags.nova_cell_setup }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "nova_cell_setup" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.cell_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/cell-setup.sh diff --git a/nova/templates/job-ks-placement-endpoints.yaml b/nova/templates/job-ks-placement-endpoints.yaml index 99e51a4305..1ba06f51c3 100644 --- a/nova/templates/job-ks-placement-endpoints.yaml +++ b/nova/templates/job-ks-placement-endpoints.yaml @@ -40,8 +40,7 @@ spec: {{- range $key1, $osServiceType := tuple "placement" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.tags.ks_endpoints }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll "ks_endpoints" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ks-endpoints.sh diff --git a/nova/templates/job-ks-placement-service.yaml b/nova/templates/job-ks-placement-service.yaml index 7f757d3f90..ade6dd0dcb 100644 --- a/nova/templates/job-ks-placement-service.yaml +++ b/nova/templates/job-ks-placement-service.yaml @@ -39,8 +39,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "placement" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.tags.ks_service }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll "ks_service" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ks-service.sh diff --git a/nova/templates/job-ks-placement-user.yaml b/nova/templates/job-ks-placement-user.yaml index 4aaccd34b1..16e416bb74 100644 --- a/nova/templates/job-ks-placement-user.yaml +++ b/nova/templates/job-ks-placement-user.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "ks_user" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: placement-ks-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ks-user.sh diff --git a/nova/templates/pod-rally-test.yaml b/nova/templates/pod-rally-test.yaml index a4844e9a94..60a98d7504 100644 --- a/nova/templates/pod-rally-test.yaml +++ b/nova/templates/pod-rally-test.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} - name: {{ .Release.Name }}-test-ks-user - image: {{ .Values.images.tags.ks_user }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} command: - /tmp/ks-user.sh @@ -60,8 +59,7 @@ spec: value: {{ .Values.endpoints.identity.auth.test.role | quote }} containers: - name: {{ .Release.Name }}-test - image: {{ .Values.images.tags.test }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/nova/templates/statefulset-compute-ironic.yaml b/nova/templates/statefulset-compute-ironic.yaml index 3122e261df..b706eef4f9 100644 --- a/nova/templates/statefulset-compute-ironic.yaml +++ b/nova/templates/statefulset-compute-ironic.yaml @@ -52,8 +52,7 @@ spec: {{ tuple $envAll "compute_ironic" $mounts_nova_compute_ironic_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-compute-ironic - image: {{ .Values.images.tags.nova_compute_ironic }} - imagePullPolicy: {{ .Values.images.tags.pull_policy }} +{{ tuple $envAll "nova_compute_ironic" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.compute_ironic | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-compute-ironic.sh diff --git a/openvswitch/templates/daemonset-ovs-db.yaml b/openvswitch/templates/daemonset-ovs-db.yaml index 2d87363a00..848b0ee2de 100644 --- a/openvswitch/templates/daemonset-ovs-db.yaml +++ b/openvswitch/templates/daemonset-ovs-db.yaml @@ -42,8 +42,7 @@ spec: {{ tuple $envAll "db" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: openvswitch-db - image: {{ .Values.images.tags.openvswitch_db_server }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "openvswitch_db_server" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.ovs.db | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: 0 diff --git a/openvswitch/templates/daemonset-ovs-vswitchd.yaml b/openvswitch/templates/daemonset-ovs-vswitchd.yaml index e4030a2d21..863917f083 100644 --- a/openvswitch/templates/daemonset-ovs-vswitchd.yaml +++ b/openvswitch/templates/daemonset-ovs-vswitchd.yaml @@ -41,8 +41,7 @@ spec: initContainers: {{ tuple $envAll "vswitchd" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: openvswitch-vswitchd-modules - image: {{ .Values.images.tags.openvswitch_vswitchd }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "openvswitch_vswitchd" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: capabilities: add: @@ -60,8 +59,7 @@ spec: readOnly: true containers: - name: openvswitch-vswitchd - image: {{ .Values.images.tags.openvswitch_vswitchd }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "openvswitch_vswitchd" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.ovs.vswitchd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: 0 diff --git a/postgresql/templates/statefulset.yaml b/postgresql/templates/statefulset.yaml index ebc43ddbb1..3447601db8 100644 --- a/postgresql/templates/statefulset.yaml +++ b/postgresql/templates/statefulset.yaml @@ -40,51 +40,50 @@ spec: initContainers: {{ tuple $envAll "postgresql" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - - name: postgresql - image: {{ .Values.images.tags.postgresql }} - imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }} - ports: - - containerPort: {{ tuple "postgresql" "internal" "postgresql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - env: - - name: 'POSTGRES_PASSWORD' - valueFrom: - secretKeyRef: - name: {{ .Values.secrets.postgresql.admin }} - key: 'POSTGRES_PASSWORD' - - name: 'POSTGRES_USER' - valueFrom: - secretKeyRef: - name: {{ .Values.secrets.postgresql.admin }} - key: 'POSTGRES_USER' - - name: 'PGDATA' - value: {{ .Values.storage.mount.path | quote }} - command: - - /tmp/start.sh - livenessProbe: - exec: - command: - - /tmp/readiness.sh - initialDelaySeconds: 20 - timeoutSeconds: 5 - readinessProbe: - exec: - command: - - /tmp/readiness.sh - initialDelaySeconds: 20 - timeoutSeconds: 5 - volumeMounts: - - name: postgresql-bin - mountPath: /tmp/start.sh - subPath: start.sh - readOnly: true - - name: postgresql-bin - mountPath: /tmp/readiness.sh - subPath: readiness.sh - readOnly: true - - name: postgresql-data - mountPath: {{ .Values.storage.mount.path }} - subPath: {{ .Values.storage.mount.subpath }} + - name: postgresql +{{ tuple $envAll "postgresql" | include "helm-toolkit.snippets.image" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} + ports: + - containerPort: {{ tuple "postgresql" "internal" "postgresql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + env: + - name: 'POSTGRES_PASSWORD' + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.postgresql.admin }} + key: 'POSTGRES_PASSWORD' + - name: 'POSTGRES_USER' + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.postgresql.admin }} + key: 'POSTGRES_USER' + - name: 'PGDATA' + value: {{ .Values.storage.mount.path | quote }} + command: + - /tmp/start.sh + livenessProbe: + exec: + command: + - /tmp/readiness.sh + initialDelaySeconds: 20 + timeoutSeconds: 5 + readinessProbe: + exec: + command: + - /tmp/readiness.sh + initialDelaySeconds: 20 + timeoutSeconds: 5 + volumeMounts: + - name: postgresql-bin + mountPath: /tmp/start.sh + subPath: start.sh + readOnly: true + - name: postgresql-bin + mountPath: /tmp/readiness.sh + subPath: readiness.sh + readOnly: true + - name: postgresql-data + mountPath: {{ .Values.storage.mount.path }} + subPath: {{ .Values.storage.mount.subpath }} volumes: - name: postgresql-bin configMap: diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml index 6de9b5a4fc..9fa8b377ce 100644 --- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml @@ -41,8 +41,7 @@ spec: {{ tuple $envAll "prometheus_rabbitmq_exporter" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: rabbitmq-exporter - image: {{ $envAll.Values.images.tags.prometheus_rabbitmq_exporter }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll "prometheus_rabbitmq_exporter" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.prometheus_rabbitmq_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} ports: - name: metrics diff --git a/rabbitmq/templates/pod-test.yaml b/rabbitmq/templates/pod-test.yaml index 0b5166e689..9658fa1362 100644 --- a/rabbitmq/templates/pod-test.yaml +++ b/rabbitmq/templates/pod-test.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: {{.Release.Name}}-rabbitmq-test - image: {{ $envAll.Values.images.tags.scripted_test }} +{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }} env: - name: RABBITMQ_ADMIN_CONNECTION value: "{{ tuple "oslo_messaging" "internal" "user" "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" }}" diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml index fba7f1aaad..4de8ca4418 100644 --- a/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml @@ -80,8 +80,7 @@ spec: {{ tuple $envAll "rabbitmq" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if $envAll.Values.volume.chown_on_start }} - name: rabbitmq-perms - image: {{ $envAll.Values.images.tags.rabbitmq }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll "rabbitmq" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: runAsUser: 0 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} @@ -96,7 +95,7 @@ spec: {{- end }} containers: - name: rabbitmq - image: {{ $envAll.Values.images.tags.rabbitmq }} +{{ tuple $envAll "rabbitmq" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/rabbitmq-start.sh diff --git a/rally/templates/job-bootstrap.yaml b/rally/templates/job-bootstrap.yaml index 4de40bb52c..faaac8eb2c 100644 --- a/rally/templates/job-bootstrap.yaml +++ b/rally/templates/job-bootstrap.yaml @@ -42,8 +42,7 @@ spec: {{ tuple $envAll "bootstrap" $mounts_rally_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: rally-bootstrap - image: {{ .Values.images.tags.bootstrap }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/rally/templates/job-ks-endpoints.yaml b/rally/templates/job-ks-endpoints.yaml index 2fdc64b757..bc2f679078 100644 --- a/rally/templates/job-ks-endpoints.yaml +++ b/rally/templates/job-ks-endpoints.yaml @@ -40,8 +40,7 @@ spec: {{- range $key1, $osServiceType := tuple "benchmark" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.tags.ks_endpoints }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll "ks_endpoints" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ks-endpoints.sh diff --git a/rally/templates/job-ks-service.yaml b/rally/templates/job-ks-service.yaml index 0116174060..318f7e01e1 100644 --- a/rally/templates/job-ks-service.yaml +++ b/rally/templates/job-ks-service.yaml @@ -39,8 +39,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "benchmark" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.tags.ks_service }} - imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll "ks_service" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ks-service.sh diff --git a/rally/templates/job-manage-db.yaml b/rally/templates/job-manage-db.yaml index 5c3e3ec156..84d81cde4a 100644 --- a/rally/templates/job-manage-db.yaml +++ b/rally/templates/job-manage-db.yaml @@ -38,8 +38,7 @@ spec: {{ tuple $envAll "manage_db" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: rally-manage-db - image: {{ .Values.images.tags.manage_db }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "manage_db" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.manage_db | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/manage-db.sh diff --git a/rally/templates/job-run-task.yaml b/rally/templates/job-run-task.yaml index dc6cf0ed03..0b90d35072 100644 --- a/rally/templates/job-run-task.yaml +++ b/rally/templates/job-run-task.yaml @@ -37,8 +37,7 @@ spec: initContainers: {{ tuple $envAll "run_task" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: rally-run-task-init - image: {{ .Values.images.tags.run_task }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "run_task" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.run_task | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: 0 @@ -52,8 +51,7 @@ spec: mountPath: /var/lib/rally/data containers: - name: rally-run-task - image: {{ .Values.images.tags.run_task }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "run_task" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.run_task | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/run-task.sh diff --git a/senlin/templates/cron-job-engine-cleaner.yaml b/senlin/templates/cron-job-engine-cleaner.yaml index 15b560d39f..00169b139c 100644 --- a/senlin/templates/cron-job-engine-cleaner.yaml +++ b/senlin/templates/cron-job-engine-cleaner.yaml @@ -50,8 +50,7 @@ spec: {{ tuple $envAll "engine_cleaner" $mounts_senlin_engine_cleaner_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} containers: - name: senlin-engine-cleaner - image: {{ .Values.images.tags.senlin_engine_cleaner }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "senlin_engine_cleaner" | include "helm-toolkit.snippets.image" | indent 14 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.engine_cleaner | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }} command: - /tmp/senlin-engine-cleaner.sh diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml index bcb8d07e15..56cf364a27 100644 --- a/senlin/templates/deployment-api.yaml +++ b/senlin/templates/deployment-api.yaml @@ -48,8 +48,7 @@ spec: {{ tuple $envAll "api" $mounts_senlin_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-api - image: {{ .Values.images.tags.senlin_api }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "senlin_api" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.senlin.uid }} diff --git a/senlin/templates/deployment-engine.yaml b/senlin/templates/deployment-engine.yaml index c4f3674bc6..069ff76548 100644 --- a/senlin/templates/deployment-engine.yaml +++ b/senlin/templates/deployment-engine.yaml @@ -46,8 +46,7 @@ spec: {{ tuple $envAll "engine" $mounts_senlin_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-engine - image: {{ .Values.images.tags.senlin_engine }} - imagePullPolicy: {{ .Values.images.pull_policy }} +{{ tuple $envAll "senlin_engine" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: {{ .Values.pod.user.senlin.uid }} diff --git a/senlin/templates/pod-test.yaml b/senlin/templates/pod-test.yaml index 73a5e63d8c..c4d67f2bbc 100644 --- a/senlin/templates/pod-test.yaml +++ b/senlin/templates/pod-test.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll "tests" $mounts_senlin_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: {{.Release.Name}}-senlin-test - image: {{ .Values.images.tags.scripted_test }} +{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }} diff --git a/tempest/templates/job-run-tests.yaml b/tempest/templates/job-run-tests.yaml index 4d1d8929d4..7c2080a1de 100644 --- a/tempest/templates/job-run-tests.yaml +++ b/tempest/templates/job-run-tests.yaml @@ -38,9 +38,8 @@ spec: initContainers: {{ tuple $envAll "run_tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: tempest-run-tests-init - image: {{ .Values.images.tags.tempest_run_tests }} - imagePullPolicy: {{ .Values.images.tags.pull_policy }} - {{ tuple $envAll $envAll.Values.pod.resources.jobs.run_tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll "tempest_run_tests" | include "helm-toolkit.snippets.image" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.jobs.run_tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: runAsUser: 0 command: @@ -53,8 +52,7 @@ spec: mountPath: /var/lib/tempest/data containers: - name: tempest-run-tests - image: {{ .Values.images.tags.tempest_run_tests }} - imagePullPolicy: {{ .Values.images.tags.pull_policy }} +{{ tuple $envAll "tempest_run_tests" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.run_tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/run-tests.sh