From fe6107cf7692c03b014d063b7bd3bd5241aa3b9f Mon Sep 17 00:00:00 2001 From: intlabs Date: Mon, 23 Oct 2017 08:59:08 -0500 Subject: [PATCH] Images: Update values to allow simple parse of images being used This PS updates the values file layout for images to allow simple parsing of the images in use by charts, allowing them to be queried and modified much more simply. By moving the image tags to a 'tags' key, we can extend the options used simply to accomodate extra options simply (eg prefixing the tag for use with an internal registry) or pre-pulling the images to reduce chart deploy failure. Change-Id: I9ec1dbb00d997ab6cb021bf0b698f7aae740e95d --- barbican/templates/deployment-api.yaml | 2 +- barbican/templates/job-bootstrap.yaml | 2 +- barbican/templates/job-db-drop.yaml | 2 +- barbican/templates/job-db-init.yaml | 2 +- barbican/templates/job-db-sync.yaml | 2 +- barbican/templates/job-ks-endpoints.yaml | 2 +- barbican/templates/job-ks-service.yaml | 2 +- barbican/templates/job-ks-user.yaml | 2 +- barbican/templates/pod-test.yaml | 2 +- barbican/values.yaml | 21 +++++------ ceilometer/templates/deployment-api.yaml | 2 +- ceilometer/templates/deployment-central.yaml | 2 +- .../templates/deployment-collector.yaml | 2 +- ceilometer/templates/deployment-compute.yaml | 2 +- .../templates/deployment-notification.yaml | 2 +- ceilometer/templates/job-db-init-mongodb.yaml | 2 +- ceilometer/templates/job-db-init.yaml | 2 +- ceilometer/templates/job-db-sync.yaml | 2 +- ceilometer/templates/job-ks-endpoints.yaml | 2 +- ceilometer/templates/job-ks-service.yaml | 2 +- ceilometer/templates/job-ks-user.yaml | 2 +- ceilometer/templates/pod-rally-test.yaml | 2 +- ceilometer/values.yaml | 27 +++++++------- ceph/templates/daemonset-mon.yaml | 4 +-- ceph/templates/daemonset-osd.yaml | 4 +-- ceph/templates/deployment-mds.yaml | 4 +-- ceph/templates/deployment-moncheck.yaml | 4 +-- .../templates/deployment-rbd-provisioner.yaml | 2 +- ceph/templates/deployment-rgw.yaml | 6 ++-- ceph/templates/job-bootstrap.yaml | 2 +- ceph/templates/job-keyring.yaml | 2 +- ceph/templates/job-ks-endpoints.yaml | 2 +- ceph/templates/job-ks-service.yaml | 2 +- ceph/templates/job-ks-user.yaml | 2 +- .../job-namespace-client-key-cleaner.yaml | 2 +- ceph/templates/job-namespace-client-key.yaml | 2 +- ceph/templates/job-storage-admin-keys.yaml | 2 +- ceph/values.yaml | 17 ++++----- .../cron-job-cinder-volume-usage-audit.yaml | 2 +- cinder/templates/deployment-api.yaml | 2 +- cinder/templates/deployment-backup.yaml | 4 +-- cinder/templates/deployment-scheduler.yaml | 2 +- cinder/templates/deployment-volume.yaml | 4 +-- cinder/templates/job-bootstrap.yaml | 2 +- cinder/templates/job-db-drop.yaml | 2 +- cinder/templates/job-db-init.yaml | 2 +- cinder/templates/job-db-sync.yaml | 2 +- cinder/templates/job-ks-endpoints.yaml | 2 +- cinder/templates/job-ks-service.yaml | 2 +- cinder/templates/job-ks-user.yaml | 2 +- cinder/templates/pod-rally-test.yaml | 2 +- cinder/values.yaml | 29 +++++++-------- .../templates/daemonset-dns-helper.yaml | 2 +- dns-helper/values.yaml | 3 +- etcd/templates/deployment.yaml | 2 +- etcd/values.yaml | 3 +- glance/templates/deployment-api.yaml | 6 ++-- glance/templates/deployment-registry.yaml | 2 +- glance/templates/job-bootstrap.yaml | 2 +- glance/templates/job-clean.yaml | 4 +-- glance/templates/job-db-drop.yaml | 2 +- glance/templates/job-db-init.yaml | 2 +- glance/templates/job-db-sync.yaml | 2 +- glance/templates/job-ks-endpoints.yaml | 2 +- glance/templates/job-ks-service.yaml | 2 +- glance/templates/job-ks-user.yaml | 2 +- glance/templates/job-storage-init.yaml | 4 +-- glance/templates/pod-rally-test.yaml | 2 +- glance/values.yaml | 27 +++++++------- gnocchi/templates/daemonset-metricd.yaml | 4 +-- gnocchi/templates/daemonset-statsd.yaml | 4 +-- gnocchi/templates/deployment-api.yaml | 4 +-- gnocchi/templates/job-db-init-indexer.yaml | 2 +- gnocchi/templates/job-db-init-keystone.yaml | 2 +- gnocchi/templates/job-db-sync.yaml | 4 +-- gnocchi/templates/job-ks-endpoints.yaml | 2 +- gnocchi/templates/job-ks-service.yaml | 2 +- gnocchi/templates/job-ks-user.yaml | 2 +- gnocchi/templates/job-storage-init.yaml | 4 +-- gnocchi/templates/pod-gnocchi-test.yaml | 4 +-- gnocchi/values.yaml | 27 +++++++------- heat/templates/deployment-api.yaml | 2 +- heat/templates/deployment-cfn.yaml | 2 +- heat/templates/deployment-cloudwatch.yaml | 2 +- heat/templates/deployment-engine.yaml | 2 +- heat/templates/job-bootstrap.yaml | 2 +- heat/templates/job-db-drop.yaml | 2 +- heat/templates/job-db-init.yaml | 2 +- heat/templates/job-db-sync.yaml | 2 +- heat/templates/job-ks-endpoints.yaml | 2 +- heat/templates/job-ks-service.yaml | 2 +- heat/templates/job-ks-user.yaml | 6 ++-- heat/templates/job-trusts.yaml | 2 +- heat/values.yaml | 25 ++++++------- .../_kubernetes_entrypoint_init_container.tpl | 2 +- horizon/templates/deployment.yaml | 2 +- horizon/templates/job-db-drop.yaml | 2 +- horizon/templates/job-db-init.yaml | 2 +- horizon/templates/job-db-sync.yaml | 2 +- horizon/values.yaml | 11 +++--- ingress/templates/deployment-error.yaml | 2 +- ingress/templates/deployment-ingress.yaml | 2 +- ingress/values.yaml | 9 ++--- .../templates/cron-job-credential-rotate.yaml | 2 +- .../templates/cron-job-fernet-rotate.yaml | 2 +- keystone/templates/deployment-api.yaml | 2 +- keystone/templates/job-bootstrap.yaml | 2 +- keystone/templates/job-credential-setup.yaml | 2 +- keystone/templates/job-db-drop.yaml | 2 +- keystone/templates/job-db-init.yaml | 2 +- keystone/templates/job-db-sync.yaml | 2 +- keystone/templates/job-fernet-setup.yaml | 2 +- keystone/templates/pod-rally-test.yaml | 2 +- keystone/values.yaml | 23 ++++++------ ldap/templates/statefulset.yaml | 2 +- ldap/values.yaml | 3 +- libvirt/templates/daemonset-libvirt.yaml | 4 +-- libvirt/values.yaml | 3 +- magnum/templates/deployment-api.yaml | 2 +- magnum/templates/job-bootstrap.yaml | 2 +- magnum/templates/job-db-drop.yaml | 2 +- magnum/templates/job-db-init.yaml | 2 +- magnum/templates/job-db-sync.yaml | 2 +- magnum/templates/job-ks-endpoints.yaml | 2 +- magnum/templates/job-ks-service.yaml | 2 +- magnum/templates/job-ks-user.yaml | 2 +- magnum/templates/statefulset-conductor.yaml | 2 +- magnum/values.yaml | 21 +++++------ mariadb/templates/statefulset.yaml | 2 +- mariadb/values.yaml | 3 +- memcached/templates/deployment.yaml | 2 +- memcached/values.yaml | 3 +- mistral/templates/deployment-api.yaml | 2 +- mistral/templates/deployment-executor.yaml | 2 +- mistral/templates/job-bootstrap.yaml | 2 +- mistral/templates/job-db-drop.yaml | 2 +- mistral/templates/job-db-init.yaml | 2 +- mistral/templates/job-db-sync.yaml | 2 +- mistral/templates/job-ks-endpoints.yaml | 2 +- mistral/templates/job-ks-service.yaml | 2 +- mistral/templates/job-ks-user.yaml | 2 +- mistral/templates/statefulset-engine.yaml | 2 +- .../templates/statefulset-event-engine.yaml | 2 +- mistral/values.yaml | 25 ++++++------- mongodb/templates/statefulset.yaml | 2 +- mongodb/values.yaml | 3 +- neutron/templates/daemonset-dhcp-agent.yaml | 2 +- neutron/templates/daemonset-l3-agent.yaml | 2 +- neutron/templates/daemonset-lb-agent.yaml | 4 +-- .../templates/daemonset-metadata-agent.yaml | 4 +-- neutron/templates/daemonset-ovs-agent.yaml | 4 +-- neutron/templates/deployment-server.yaml | 2 +- neutron/templates/job-bootstrap.yaml | 2 +- neutron/templates/job-db-drop.yaml | 2 +- neutron/templates/job-db-init.yaml | 2 +- neutron/templates/job-db-sync.yaml | 2 +- neutron/templates/job-ks-endpoints.yaml | 2 +- neutron/templates/job-ks-service.yaml | 2 +- neutron/templates/job-ks-user.yaml | 2 +- neutron/templates/pod-rally-test.yaml | 2 +- neutron/values.yaml | 31 ++++++++-------- nfs-provisioner/templates/deployment.yaml | 2 +- nfs-provisioner/values.yaml | 3 +- nova/templates/daemonset-compute.yaml | 10 +++--- nova/templates/deployment-api-metadata.yaml | 4 +-- nova/templates/deployment-api-osapi.yaml | 2 +- nova/templates/deployment-conductor.yaml | 2 +- nova/templates/deployment-consoleauth.yaml | 2 +- nova/templates/deployment-novncproxy.yaml | 6 ++-- nova/templates/deployment-scheduler.yaml | 2 +- nova/templates/job-bootstrap.yaml | 2 +- nova/templates/job-db-drop.yaml | 4 +-- nova/templates/job-db-init.yaml | 4 +-- nova/templates/job-db-sync.yaml | 2 +- nova/templates/job-ks-endpoints.yaml | 2 +- nova/templates/job-ks-service.yaml | 2 +- nova/templates/job-ks-user.yaml | 2 +- nova/templates/pod-rally-test.yaml | 2 +- nova/values.yaml | 35 ++++++++++--------- openvswitch/templates/daemonset-ovs-db.yaml | 2 +- .../templates/daemonset-ovs-vswitchd.yaml | 2 +- openvswitch/values.yaml | 5 +-- postgresql/templates/statefulset.yaml | 2 +- postgresql/values.yaml | 3 +- rabbitmq/templates/deployment.yaml | 2 +- rabbitmq/values.yaml | 5 +-- rally/templates/job-bootstrap.yaml | 2 +- rally/templates/job-db-init.yaml | 2 +- rally/templates/job-ks-endpoints.yaml | 2 +- rally/templates/job-ks-service.yaml | 2 +- rally/templates/job-ks-user.yaml | 2 +- rally/templates/job-manage-db.yaml | 2 +- rally/templates/job-run-task.yaml | 4 +-- rally/values.yaml | 19 +++++----- senlin/templates/deployment-api.yaml | 2 +- senlin/templates/job-bootstrap.yaml | 2 +- senlin/templates/job-db-drop.yaml | 2 +- senlin/templates/job-db-init.yaml | 2 +- senlin/templates/job-db-sync.yaml | 2 +- senlin/templates/job-ks-endpoints.yaml | 2 +- senlin/templates/job-ks-service.yaml | 2 +- senlin/templates/job-ks-user.yaml | 2 +- senlin/templates/statefulset-engine.yaml | 2 +- senlin/values.yaml | 21 +++++------ 204 files changed, 427 insertions(+), 400 deletions(-) diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index a9c8d4fe..ce18d61b 100644 --- a/barbican/templates/deployment-api.yaml +++ b/barbican/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_barbican_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: barbican-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/barbican/templates/job-bootstrap.yaml b/barbican/templates/job-bootstrap.yaml index e5eb6a7e..89cb43dc 100644 --- a/barbican/templates/job-bootstrap.yaml +++ b/barbican/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies $mounts_barbican_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: barbican-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/barbican/templates/job-db-drop.yaml b/barbican/templates/job-db-drop.yaml index 279b4a90..6ab37dc6 100644 --- a/barbican/templates/job-db-drop.yaml +++ b/barbican/templates/job-db-drop.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: barbican-db-drop - image: {{ .Values.images.db_drop }} + image: {{ .Values.images.tags.db_drop }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/barbican/templates/job-db-init.yaml b/barbican/templates/job-db-init.yaml index f369acf9..edb7fc38 100644 --- a/barbican/templates/job-db-init.yaml +++ b/barbican/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: barbican-db-init - image: {{ .Values.images.db_init }} + image: {{ .Values.images.tags.db_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/barbican/templates/job-db-sync.yaml b/barbican/templates/job-db-sync.yaml index 4a20783b..ec657584 100644 --- a/barbican/templates/job-db-sync.yaml +++ b/barbican/templates/job-db-sync.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: barbican-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/barbican/templates/job-ks-endpoints.yaml b/barbican/templates/job-ks-endpoints.yaml index a0bac441..5b86e57b 100644 --- a/barbican/templates/job-ks-endpoints.yaml +++ b/barbican/templates/job-ks-endpoints.yaml @@ -37,7 +37,7 @@ spec: {{- range $key1, $osServiceType := tuple "key-manager" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/barbican/templates/job-ks-service.yaml b/barbican/templates/job-ks-service.yaml index 00ea4fd8..f749a987 100644 --- a/barbican/templates/job-ks-service.yaml +++ b/barbican/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "key-manager" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/barbican/templates/job-ks-user.yaml b/barbican/templates/job-ks-user.yaml index 185ea982..9aaace26 100644 --- a/barbican/templates/job-ks-user.yaml +++ b/barbican/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: barbican-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/barbican/templates/pod-test.yaml b/barbican/templates/pod-test.yaml index 1947b15d..582729ad 100644 --- a/barbican/templates/pod-test.yaml +++ b/barbican/templates/pod-test.yaml @@ -31,7 +31,7 @@ spec: {{ tuple $envAll $dependencies $mounts_barbican_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: {{.Release.Name}}-barbican-test - image: {{ .Values.images.test }} + image: {{ .Values.images.tags.scripted_test }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }} diff --git a/barbican/values.yaml b/barbican/values.yaml index 8d111dc6..465635c9 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -17,16 +17,17 @@ labels: release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 - test: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 + tags: + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + scripted_test: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + barbican_db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + barbican_api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 pull_policy: "IfNotPresent" pod: diff --git a/ceilometer/templates/deployment-api.yaml b/ceilometer/templates/deployment-api.yaml index acf3aee4..3fdb4485 100644 --- a/ceilometer/templates/deployment-api.yaml +++ b/ceilometer/templates/deployment-api.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml index 6412152f..58991653 100644 --- a/ceilometer/templates/deployment-central.yaml +++ b/ceilometer/templates/deployment-central.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_central_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-central - image: {{ .Values.images.central }} + image: {{ .Values.images.tags.central }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.central | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/deployment-collector.yaml b/ceilometer/templates/deployment-collector.yaml index 43aaccfd..39146d69 100644 --- a/ceilometer/templates/deployment-collector.yaml +++ b/ceilometer/templates/deployment-collector.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_collector_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-collector - image: {{ .Values.images.collector }} + image: {{ .Values.images.tags.collector }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.collector | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/deployment-compute.yaml b/ceilometer/templates/deployment-compute.yaml index cd5aeca9..d26fa076 100644 --- a/ceilometer/templates/deployment-compute.yaml +++ b/ceilometer/templates/deployment-compute.yaml @@ -46,7 +46,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-compute - image: {{ .Values.images.compute }} + image: {{ .Values.images.tags.compute }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml index a8240b8f..18c9f1c7 100644 --- a/ceilometer/templates/deployment-notification.yaml +++ b/ceilometer/templates/deployment-notification.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_notification_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-notification - image: {{ .Values.images.notification }} + image: {{ .Values.images.tags.notification }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.notification | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/job-db-init-mongodb.yaml b/ceilometer/templates/job-db-init-mongodb.yaml index 9f662f26..6ee05c91 100644 --- a/ceilometer/templates/job-db-init-mongodb.yaml +++ b/ceilometer/templates/job-db-init-mongodb.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-db-init-mongodb - image: {{ .Values.images.db_init_mongodb | quote }} + image: {{ .Values.images.tags.db_init_mongodb | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init_mongodb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceilometer/templates/job-db-init.yaml b/ceilometer/templates/job-db-init.yaml index 1bdd36e3..7f5ce905 100644 --- a/ceilometer/templates/job-db-init.yaml +++ b/ceilometer/templates/job-db-init.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-db-init - image: {{ .Values.images.db_init | quote }} + image: {{ .Values.images.tags.db_init | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceilometer/templates/job-db-sync.yaml b/ceilometer/templates/job-db-sync.yaml index 152f9041..cff4bd63 100644 --- a/ceilometer/templates/job-db-sync.yaml +++ b/ceilometer/templates/job-db-sync.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/job-ks-endpoints.yaml b/ceilometer/templates/job-ks-endpoints.yaml index e4057074..3e002f89 100644 --- a/ceilometer/templates/job-ks-endpoints.yaml +++ b/ceilometer/templates/job-ks-endpoints.yaml @@ -34,7 +34,7 @@ spec: {{- range $key1, $osServiceType := tuple "metering" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/job-ks-service.yaml b/ceilometer/templates/job-ks-service.yaml index 946111ae..39948845 100644 --- a/ceilometer/templates/job-ks-service.yaml +++ b/ceilometer/templates/job-ks-service.yaml @@ -33,7 +33,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "metering" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/job-ks-user.yaml b/ceilometer/templates/job-ks-user.yaml index f1da0a74..ad82e8b8 100644 --- a/ceilometer/templates/job-ks-user.yaml +++ b/ceilometer/templates/job-ks-user.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceilometer-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceilometer/templates/pod-rally-test.yaml b/ceilometer/templates/pod-rally-test.yaml index 789649d4..3a3fb998 100644 --- a/ceilometer/templates/pod-rally-test.yaml +++ b/ceilometer/templates/pod-rally-test.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies $mounts_ceilometer_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: {{.Release.Name}}-token-issue-test - image: {{ .Values.images.test }} + image: {{ .Values.images.tags.test }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 3da9579c..18e08caf 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -38,19 +38,20 @@ labels: node_selector_value: enabled images: - test: docker.io/kolla/ubuntu-binary-rally:4.0.0 - db_init_mongodb: docker.io/mongo:3.4.9-jessie - db_init: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - api: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3 - central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3 - collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3 - compute: quay.io/larryrensing/ubuntu-source-ceilometer-compute:3.0.3 - notification: quay.io/larryrensing/ubuntu-source-ceilometer-notification:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + test: docker.io/kolla/ubuntu-binary-rally:4.0.0 + db_init_mongodb: docker.io/mongo:3.4.9-jessie + db_init: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + api: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3 + central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3 + collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3 + compute: quay.io/larryrensing/ubuntu-source-ceilometer-compute:3.0.3 + notification: quay.io/larryrensing/ubuntu-source-ceilometer-notification:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" network: diff --git a/ceph/templates/daemonset-mon.yaml b/ceph/templates/daemonset-mon.yaml index 931fd4f3..aca490f5 100644 --- a/ceph/templates/daemonset-mon.yaml +++ b/ceph/templates/daemonset-mon.yaml @@ -37,7 +37,7 @@ spec: initContainers: {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init_dirs.sh @@ -58,7 +58,7 @@ spec: readOnly: false containers: - name: ceph-mon - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/daemonset-osd.yaml b/ceph/templates/daemonset-osd.yaml index b9323b75..4f9b41cf 100644 --- a/ceph/templates/daemonset-osd.yaml +++ b/ceph/templates/daemonset-osd.yaml @@ -36,7 +36,7 @@ spec: initContainers: {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init_dirs.sh @@ -57,7 +57,7 @@ spec: readOnly: false containers: - name: osd-pod - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/ceph/templates/deployment-mds.yaml b/ceph/templates/deployment-mds.yaml index 7fc7909d..005397fb 100644 --- a/ceph/templates/deployment-mds.yaml +++ b/ceph/templates/deployment-mds.yaml @@ -40,7 +40,7 @@ spec: initContainers: {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init_dirs.sh @@ -61,7 +61,7 @@ spec: readOnly: false containers: - name: ceph-mds - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.mds | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/deployment-moncheck.yaml b/ceph/templates/deployment-moncheck.yaml index 1eaa92af..c6fd9468 100644 --- a/ceph/templates/deployment-moncheck.yaml +++ b/ceph/templates/deployment-moncheck.yaml @@ -38,7 +38,7 @@ spec: initContainers: {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init_dirs.sh @@ -56,7 +56,7 @@ spec: readOnly: false containers: - name: ceph-mon - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.moncheck | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/deployment-rbd-provisioner.yaml b/ceph/templates/deployment-rbd-provisioner.yaml index 15a2c871..e4767b6e 100644 --- a/ceph/templates/deployment-rbd-provisioner.yaml +++ b/ceph/templates/deployment-rbd-provisioner.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-rbd-provisioner - image: {{ .Values.images.rbd_provisioner }} + image: {{ .Values.images.tags.rbd_provisioner }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.rbd_provisioner | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/deployment-rgw.yaml b/ceph/templates/deployment-rgw.yaml index 6afc65d8..5d3ea4f8 100644 --- a/ceph/templates/deployment-rgw.yaml +++ b/ceph/templates/deployment-rgw.yaml @@ -39,7 +39,7 @@ spec: initContainers: {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-init-dirs - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/init_dirs.sh @@ -60,7 +60,7 @@ spec: readOnly: false {{ if .Values.ceph.rgw_keystone_auth }} - name: ceph-rgw-ks-init - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: @@ -92,7 +92,7 @@ spec: {{ end }} containers: - name: ceph-rgw - image: {{ .Values.images.daemon }} + image: {{ .Values.images.tags.daemon }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/job-bootstrap.yaml b/ceph/templates/job-bootstrap.yaml index 73ba74c7..da2deddf 100644 --- a/ceph/templates/job-bootstrap.yaml +++ b/ceph/templates/job-bootstrap.yaml @@ -36,7 +36,7 @@ spec: {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceph/templates/job-keyring.yaml b/ceph/templates/job-keyring.yaml index b90cccad..913d53fb 100644 --- a/ceph/templates/job-keyring.yaml +++ b/ceph/templates/job-keyring.yaml @@ -36,7 +36,7 @@ spec: {{ $envAll.Values.labels.jobs.node_selector_key }}: {{ $envAll.Values.labels.jobs.node_selector_value }} containers: - name: ceph-{{ $jobName }} - image: {{ $envAll.Values.images.ceph_config_helper }} + image: {{ $envAll.Values.images.tags.ceph_config_helper }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/job-ks-endpoints.yaml b/ceph/templates/job-ks-endpoints.yaml index 21ca384f..caca3152 100644 --- a/ceph/templates/job-ks-endpoints.yaml +++ b/ceph/templates/job-ks-endpoints.yaml @@ -38,7 +38,7 @@ spec: {{- range $key1, $osServiceType := tuple "object-store" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceph/templates/job-ks-service.yaml b/ceph/templates/job-ks-service.yaml index 7aa81c58..c91cbba9 100644 --- a/ceph/templates/job-ks-service.yaml +++ b/ceph/templates/job-ks-service.yaml @@ -37,7 +37,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "object-store" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceph/templates/job-ks-user.yaml b/ceph/templates/job-ks-user.yaml index 1a1b24fc..f08f20d4 100644 --- a/ceph/templates/job-ks-user.yaml +++ b/ceph/templates/job-ks-user.yaml @@ -36,7 +36,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: ceph-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/ceph/templates/job-namespace-client-key-cleaner.yaml b/ceph/templates/job-namespace-client-key-cleaner.yaml index ee6f85b5..0005c002 100644 --- a/ceph/templates/job-namespace-client-key-cleaner.yaml +++ b/ceph/templates/job-namespace-client-key-cleaner.yaml @@ -35,7 +35,7 @@ spec: {{ $envAll.Values.labels.jobs.node_selector_key }}: {{ $envAll.Values.labels.jobs.node_selector_value }} containers: - name: ceph-namespace-client-keys-cleaner - image: {{ .Values.images.ceph_config_helper }} + image: {{ .Values.images.tags.ceph_config_helper }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/job-namespace-client-key.yaml b/ceph/templates/job-namespace-client-key.yaml index b333cdb9..f95e3273 100644 --- a/ceph/templates/job-namespace-client-key.yaml +++ b/ceph/templates/job-namespace-client-key.yaml @@ -33,7 +33,7 @@ spec: {{ $envAll.Values.labels.jobs.node_selector_key }}: {{ $envAll.Values.labels.jobs.node_selector_value }} containers: - name: ceph-storage-keys-generator - image: {{ .Values.images.ceph_config_helper }} + image: {{ .Values.images.tags.ceph_config_helper }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/templates/job-storage-admin-keys.yaml b/ceph/templates/job-storage-admin-keys.yaml index dde5aa36..cfeaa126 100644 --- a/ceph/templates/job-storage-admin-keys.yaml +++ b/ceph/templates/job-storage-admin-keys.yaml @@ -33,7 +33,7 @@ spec: {{ $envAll.Values.labels.jobs.node_selector_key }}: {{ $envAll.Values.labels.jobs.node_selector_value }} containers: - name: ceph-storage-keys-generator - image: {{ .Values.images.ceph_config_helper }} + image: {{ .Values.images.tags.ceph_config_helper }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/ceph/values.yaml b/ceph/values.yaml index 6459dbd6..edeabcf0 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -20,14 +20,15 @@ deployment: rgw_keystone_user_and_endpoints: false images: - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - bootstrap: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 - daemon: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 - ceph_config_helper: docker.io/port/ceph-config-helper:v1.7.5 - rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1 + tags: + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + bootstrap: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + daemon: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 + ceph_config_helper: docker.io/port/ceph-config-helper:v1.7.5 + rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1 pull_policy: "IfNotPresent" labels: diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml index debfcd87..eea1fedd 100644 --- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml +++ b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml @@ -41,7 +41,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: cinder-volume-usage-audit - image: {{ .Values.images.volume_usage_audit }} + image: {{ .Values.images.tags.volume_usage_audit }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.volume_usage_audit | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }} command: diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index 3cf75b4a..8bb9350a 100644 --- a/cinder/templates/deployment-api.yaml +++ b/cinder/templates/deployment-api.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_cinder_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: cinder-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml index 40b8a9d6..16134dcc 100644 --- a/cinder/templates/deployment-backup.yaml +++ b/cinder/templates/deployment-backup.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_cinder_backup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if include "cinder.is_ceph_backup_configured" . }} - name: ceph-keyring-placement - image: {{ .Values.images.backup }} + image: {{ .Values.images.tags.backup }} imagePullPolicy: {{ .Values.images.pull_policy }} securityContext: runAsUser: 0 @@ -63,7 +63,7 @@ spec: {{ end }} containers: - name: cinder-backup - image: {{ .Values.images.backup }} + image: {{ .Values.images.tags.backup }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index e887125c..ccb256fc 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/cinder/templates/deployment-scheduler.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_cinder_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: cinder-scheduler - image: {{ .Values.images.scheduler }} + image: {{ .Values.images.tags.scheduler }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index 121ff2a7..29aa8663 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_cinder_volume_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if include "cinder.is_ceph_volume_configured" . }} - name: ceph-keyring-placement - image: {{ .Values.images.volume }} + image: {{ .Values.images.tags.volume }} imagePullPolicy: {{ .Values.images.pull_policy }} securityContext: runAsUser: 0 @@ -63,7 +63,7 @@ spec: {{ end }} containers: - name: cinder-volume - image: {{ .Values.images.volume }} + image: {{ .Values.images.tags.volume }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.volume | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/cinder/templates/job-bootstrap.yaml b/cinder/templates/job-bootstrap.yaml index f82e7b4d..bde25c77 100644 --- a/cinder/templates/job-bootstrap.yaml +++ b/cinder/templates/job-bootstrap.yaml @@ -36,7 +36,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: cinder-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/cinder/templates/job-db-drop.yaml b/cinder/templates/job-db-drop.yaml index 573a9611..5c9ff36e 100644 --- a/cinder/templates/job-db-drop.yaml +++ b/cinder/templates/job-db-drop.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: cinder-db-drop - image: {{ .Values.images.db_drop | quote }} + image: {{ .Values.images.tags.db_drop | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml index 1cbbc5e7..28c2a808 100644 --- a/cinder/templates/job-db-init.yaml +++ b/cinder/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: cinder-db-init - image: {{ .Values.images.db_init | quote }} + image: {{ .Values.images.tags.db_init | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml index d28b89b7..46dc5f1b 100644 --- a/cinder/templates/job-db-sync.yaml +++ b/cinder/templates/job-db-sync.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: cinder-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/cinder/templates/job-ks-endpoints.yaml b/cinder/templates/job-ks-endpoints.yaml index c8830c4c..40521ed9 100644 --- a/cinder/templates/job-ks-endpoints.yaml +++ b/cinder/templates/job-ks-endpoints.yaml @@ -37,7 +37,7 @@ spec: {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml index 8001ec6d..94397439 100644 --- a/cinder/templates/job-ks-service.yaml +++ b/cinder/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml index 4d982535..d336e4d8 100644 --- a/cinder/templates/job-ks-user.yaml +++ b/cinder/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: cinder-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/cinder/templates/pod-rally-test.yaml b/cinder/templates/pod-rally-test.yaml index 0f038955..60d52d69 100644 --- a/cinder/templates/pod-rally-test.yaml +++ b/cinder/templates/pod-rally-test.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies $mounts_cinder_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} containers: - name: {{.Release.Name}}-token-issue-test - image: {{ .Values.images.test }} + image: {{ .Values.images.tags.test }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: diff --git a/cinder/values.yaml b/cinder/values.yaml index 20a073f1..3ff3d439 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -26,20 +26,21 @@ labels: release_group: null images: - test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - api: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3 - volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3 - volume_usage_audit: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3 - backup: docker.io/kolla/ubuntu-source-cinder-backup:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + test: docker.io/kolla/ubuntu-source-rally:4.0.0 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + api: docker.io/kolla/ubuntu-source-cinder-api:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3 + volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3 + volume_usage_audit: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3 + backup: docker.io/kolla/ubuntu-source-cinder-backup:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" jobs: diff --git a/dns-helper/templates/daemonset-dns-helper.yaml b/dns-helper/templates/daemonset-dns-helper.yaml index b6af2931..b90136a3 100644 --- a/dns-helper/templates/daemonset-dns-helper.yaml +++ b/dns-helper/templates/daemonset-dns-helper.yaml @@ -30,7 +30,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: dns-helper - image: {{ .Values.images.dns_helper }} + image: {{ .Values.images.tags.dns_helper }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/dns-helper.sh diff --git a/dns-helper/values.yaml b/dns-helper/values.yaml index f6010afd..041810ca 100644 --- a/dns-helper/values.yaml +++ b/dns-helper/values.yaml @@ -22,5 +22,6 @@ labels: node_selector_value: enabled images: - dns_helper: docker.io/ubuntu:16.04 + tags: + dns_helper: docker.io/ubuntu:16.04 pull_policy: "IfNotPresent" diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml index e77fab7c..bf0dd891 100644 --- a/etcd/templates/deployment.yaml +++ b/etcd/templates/deployment.yaml @@ -32,7 +32,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: etcd - image: {{ .Values.images.etcd }} + image: {{ .Values.images.tags.etcd }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - etcd diff --git a/etcd/values.yaml b/etcd/values.yaml index 50d7521d..691bc8b7 100644 --- a/etcd/values.yaml +++ b/etcd/values.yaml @@ -18,7 +18,8 @@ # name: value images: - etcd: 'gcr.io/google_containers/etcd-amd64:2.2.5' + tags: + etcd: 'gcr.io/google_containers/etcd-amd64:2.2.5' pull_policy: IfNotPresent labels: diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index 3bb02621..49b94b0f 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: glance-perms - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} securityContext: runAsUser: 0 @@ -58,7 +58,7 @@ spec: mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }} {{ if eq .Values.storage "rbd" }} - name: ceph-keyring-placement - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} securityContext: runAsUser: {{ .Values.pod.user.glance.uid }} @@ -81,7 +81,7 @@ spec: {{ end }} containers: - name: glance-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 810cdd4f..b28cbc3c 100644 --- a/glance/templates/deployment-registry.yaml +++ b/glance/templates/deployment-registry.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_glance_registry_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: glance-registry - image: {{ .Values.images.registry }} + image: {{ .Values.images.tags.registry }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.registry | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/glance/templates/job-bootstrap.yaml b/glance/templates/job-bootstrap.yaml index 2fbc7b02..9578503f 100644 --- a/glance/templates/job-bootstrap.yaml +++ b/glance/templates/job-bootstrap.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: glance-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/glance/templates/job-clean.yaml b/glance/templates/job-clean.yaml index 986ed1df..d20c1d62 100644 --- a/glance/templates/job-clean.yaml +++ b/glance/templates/job-clean.yaml @@ -34,7 +34,7 @@ spec: containers: {{- if eq .Values.storage "rbd" }} - name: glance-secret-clean - image: {{ .Values.images.storage_init }} + image: {{ .Values.images.tags.storage_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: @@ -53,7 +53,7 @@ spec: readOnly: true {{ end }} - name: glance-image-clean - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/glance/templates/job-db-drop.yaml b/glance/templates/job-db-drop.yaml index 6d1d7277..8441be78 100644 --- a/glance/templates/job-db-drop.yaml +++ b/glance/templates/job-db-drop.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: glance-db-drop - image: {{ .Values.images.db_drop }} + image: {{ .Values.images.tags.db_drop }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/glance/templates/job-db-init.yaml b/glance/templates/job-db-init.yaml index 8e3149e3..22a85bfc 100644 --- a/glance/templates/job-db-init.yaml +++ b/glance/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: glance-db-init - image: {{ .Values.images.db_init }} + image: {{ .Values.images.tags.db_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/glance/templates/job-db-sync.yaml b/glance/templates/job-db-sync.yaml index 7a34211f..c7bf1605 100644 --- a/glance/templates/job-db-sync.yaml +++ b/glance/templates/job-db-sync.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: glance-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/glance/templates/job-ks-endpoints.yaml b/glance/templates/job-ks-endpoints.yaml index c2310ac4..b28f7943 100644 --- a/glance/templates/job-ks-endpoints.yaml +++ b/glance/templates/job-ks-endpoints.yaml @@ -37,7 +37,7 @@ spec: {{- range $key1, $osServiceType := tuple "image" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/glance/templates/job-ks-service.yaml b/glance/templates/job-ks-service.yaml index 7c0e06ae..f79f18d0 100644 --- a/glance/templates/job-ks-service.yaml +++ b/glance/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "image" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/glance/templates/job-ks-user.yaml b/glance/templates/job-ks-user.yaml index 0afba60b..d30d2316 100644 --- a/glance/templates/job-ks-user.yaml +++ b/glance/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: glance-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml index 1107b8db..65d94802 100644 --- a/glance/templates/job-storage-init.yaml +++ b/glance/templates/job-storage-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | 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.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} securityContext: runAsUser: {{ .Values.pod.user.glance.uid }} @@ -55,7 +55,7 @@ spec: {{ end }} containers: - name: glance-storage-init - image: {{ .Values.images.storage_init }} + image: {{ .Values.images.tags.storage_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/glance/templates/pod-rally-test.yaml b/glance/templates/pod-rally-test.yaml index c82e55ed..04f68def 100644 --- a/glance/templates/pod-rally-test.yaml +++ b/glance/templates/pod-rally-test.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies $mounts_glance_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} containers: - name: {{.Release.Name}}-token-issue-test - image: {{ .Values.images.test }} + image: {{ .Values.images.tags.test }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: diff --git a/glance/values.yaml b/glance/values.yaml index 152f1fd6..328db970 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -27,19 +27,20 @@ labels: release_group: null images: - test: docker.io/kolla/ubuntu-source-rally:4.0.0 - storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-glance-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - api: docker.io/kolla/ubuntu-source-glance-api:3.0.3 - registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.3 - # Bootstrap image requires curl - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + test: docker.io/kolla/ubuntu-source-rally:4.0.0 + storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-glance-api:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + api: docker.io/kolla/ubuntu-source-glance-api:3.0.3 + registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.3 + # Bootstrap image requires curl + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" bootstrap: diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml index 924c7628..c0bf5b76 100644 --- a/gnocchi/templates/daemonset-metricd.yaml +++ b/gnocchi/templates/daemonset-metricd.yaml @@ -39,7 +39,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_gnocchi_metricd_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/ceph-keyring.sh @@ -56,7 +56,7 @@ spec: readOnly: true containers: - name: gnocchi-metricd - image: {{ .Values.images.metricd }} + image: {{ .Values.images.tags.metricd }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.metricd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/gnocchi/templates/daemonset-statsd.yaml b/gnocchi/templates/daemonset-statsd.yaml index 1d8d307c..5edf650d 100644 --- a/gnocchi/templates/daemonset-statsd.yaml +++ b/gnocchi/templates/daemonset-statsd.yaml @@ -38,7 +38,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_gnocchi_statsd_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/ceph-keyring.sh @@ -55,7 +55,7 @@ spec: readOnly: true containers: - name: gnocchi-statsd - image: {{ .Values.images.statsd }} + image: {{ .Values.images.tags.statsd }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.statsd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml index eb083614..3ede6386 100644 --- a/gnocchi/templates/deployment-api.yaml +++ b/gnocchi/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_gnocchi_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/ceph-keyring.sh @@ -60,7 +60,7 @@ spec: readOnly: true containers: - name: gnocchi-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/gnocchi/templates/job-db-init-indexer.yaml b/gnocchi/templates/job-db-init-indexer.yaml index 0e1c9ca3..98f26c11 100644 --- a/gnocchi/templates/job-db-init-indexer.yaml +++ b/gnocchi/templates/job-db-init-indexer.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: gnocchi-db-init-indexer - image: {{ .Values.images.db_init_indexer | quote }} + image: {{ .Values.images.tags.db_init_indexer | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init_indexer | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/gnocchi/templates/job-db-init-keystone.yaml b/gnocchi/templates/job-db-init-keystone.yaml index c960c051..6b173876 100644 --- a/gnocchi/templates/job-db-init-keystone.yaml +++ b/gnocchi/templates/job-db-init-keystone.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: keystone-db-init - image: {{ .Values.images.db_init_keystone | quote }} + image: {{ .Values.images.tags.db_init_keystone | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/gnocchi/templates/job-db-sync.yaml b/gnocchi/templates/job-db-sync.yaml index 6424845e..174e1e9b 100644 --- a/gnocchi/templates/job-db-sync.yaml +++ b/gnocchi/templates/job-db-sync.yaml @@ -34,7 +34,7 @@ spec: initContainers: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/ceph-keyring.sh @@ -51,7 +51,7 @@ spec: readOnly: true containers: - name: gnocchi-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/gnocchi/templates/job-ks-endpoints.yaml b/gnocchi/templates/job-ks-endpoints.yaml index e00e679f..5ca8af27 100644 --- a/gnocchi/templates/job-ks-endpoints.yaml +++ b/gnocchi/templates/job-ks-endpoints.yaml @@ -39,7 +39,7 @@ spec: {{- range $key1, $osServiceType := tuple "metric" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/gnocchi/templates/job-ks-service.yaml b/gnocchi/templates/job-ks-service.yaml index 671f2d89..d5233caf 100644 --- a/gnocchi/templates/job-ks-service.yaml +++ b/gnocchi/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "metric" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/gnocchi/templates/job-ks-user.yaml b/gnocchi/templates/job-ks-user.yaml index 988e7082..b7d88927 100644 --- a/gnocchi/templates/job-ks-user.yaml +++ b/gnocchi/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: gnocchi-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/gnocchi/templates/job-storage-init.yaml b/gnocchi/templates/job-storage-init.yaml index 96af867a..765ea4d3 100644 --- a/gnocchi/templates/job-storage-init.yaml +++ b/gnocchi/templates/job-storage-init.yaml @@ -34,7 +34,7 @@ spec: initContainers: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} securityContext: runAsUser: {{ .Values.pod.user.gnocchi.uid }} @@ -53,7 +53,7 @@ spec: readOnly: true containers: - name: gnocchi-storage-init - image: {{ .Values.images.storage_init }} + image: {{ .Values.images.tags.storage_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/gnocchi/templates/pod-gnocchi-test.yaml b/gnocchi/templates/pod-gnocchi-test.yaml index 261322d8..a44f530c 100644 --- a/gnocchi/templates/pod-gnocchi-test.yaml +++ b/gnocchi/templates/pod-gnocchi-test.yaml @@ -31,7 +31,7 @@ spec: initContainers: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} - name: ceph-keyring-placement - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/ceph-keyring.sh @@ -48,7 +48,7 @@ spec: readOnly: true containers: - name: {{.Release.Name}}-helm-tests - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index d712ac7e..fc8d1f1f 100644 --- a/gnocchi/values.yaml +++ b/gnocchi/values.yaml @@ -7,19 +7,20 @@ labels: node_selector_value: enabled images: - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 - storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 - db_init_indexer: docker.io/postgres:9.5 - # using non-kolla images until kolla supports postgres as - # an indexer - db_init_keystone: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 - db_sync: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - api: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 - statsd: quay.io/attcomdev/ubuntu-source-gnocchi-statsd:3.0.3 - metricd: quay.io/attcomdev/ubuntu-source-gnocchi-metricd:3.0.3 + tags: + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04 + db_init_indexer: docker.io/postgres:9.5 + # using non-kolla images until kolla supports postgres as + # an indexer + db_init_keystone: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 + db_sync: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + api: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3 + statsd: quay.io/attcomdev/ubuntu-source-gnocchi-statsd:3.0.3 + metricd: quay.io/attcomdev/ubuntu-source-gnocchi-metricd:3.0.3 pull_policy: "IfNotPresent" network: diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index 96bae85f..9e5cb346 100644 --- a/heat/templates/deployment-api.yaml +++ b/heat/templates/deployment-api.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_heat_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index 3d53fb59..909301d1 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/heat/templates/deployment-cfn.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_heat_cfn_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-cfn - image: {{ .Values.images.cfn }} + image: {{ .Values.images.tags.cfn }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.cfn | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index 3f0e9d7b..5a89967d 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/heat/templates/deployment-cloudwatch.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_heat_cloudwatch_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-cloudwatch - image: {{ .Values.images.cloudwatch }} + image: {{ .Values.images.tags.cloudwatch }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.cloudwatch | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/heat/templates/deployment-engine.yaml b/heat/templates/deployment-engine.yaml index 5b9af9de..686a66fe 100644 --- a/heat/templates/deployment-engine.yaml +++ b/heat/templates/deployment-engine.yaml @@ -52,7 +52,7 @@ spec: {{ tuple $envAll $dependencies $mounts_heat_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-engine - image: {{ .Values.images.engine }} + image: {{ .Values.images.tags.engine }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/heat/templates/job-bootstrap.yaml b/heat/templates/job-bootstrap.yaml index 30b046cb..c220f808 100644 --- a/heat/templates/job-bootstrap.yaml +++ b/heat/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies $mounts_heat_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/heat/templates/job-db-drop.yaml b/heat/templates/job-db-drop.yaml index 2cb7703e..f045a37e 100644 --- a/heat/templates/job-db-drop.yaml +++ b/heat/templates/job-db-drop.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-db-drop - image: {{ .Values.images.db_drop | quote }} + image: {{ .Values.images.tags.db_drop | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml index 16e728fc..33999557 100644 --- a/heat/templates/job-db-init.yaml +++ b/heat/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-db-init - image: {{ .Values.images.db_init | quote }} + image: {{ .Values.images.tags.db_init | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml index e3cb11cf..ddd7cb6b 100644 --- a/heat/templates/job-db-sync.yaml +++ b/heat/templates/job-db-sync.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/heat/templates/job-ks-endpoints.yaml b/heat/templates/job-ks-endpoints.yaml index 3233bf0e..48d71d8e 100644 --- a/heat/templates/job-ks-endpoints.yaml +++ b/heat/templates/job-ks-endpoints.yaml @@ -37,7 +37,7 @@ spec: {{- range $key1, $osServiceType := tuple "orchestration" "cloudformation" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml index 326b77c2..aca5c93b 100644 --- a/heat/templates/job-ks-service.yaml +++ b/heat/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "orchestration" "cloudformation" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml index eedcb0d7..22568a66 100644 --- a/heat/templates/job-ks-user.yaml +++ b/heat/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: @@ -57,7 +57,7 @@ spec: - name: SERVICE_OS_ROLE value: {{ .Values.endpoints.identity.auth.user.role | quote }} - name: heat-ks-trustee-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/ks-user.sh @@ -78,7 +78,7 @@ spec: - name: SERVICE_OS_ROLE value: {{ .Values.endpoints.identity.auth.trustee.role | quote }} - name: heat-ks-domain-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} command: - /tmp/ks-domain-user.sh diff --git a/heat/templates/job-trusts.yaml b/heat/templates/job-trusts.yaml index bd093d7b..468e0e18 100644 --- a/heat/templates/job-trusts.yaml +++ b/heat/templates/job-trusts.yaml @@ -37,7 +37,7 @@ spec: {{ tuple $envAll $dependencies $mounts_heat_trusts_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: heat-trusts - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.trusts | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/heat/values.yaml b/heat/values.yaml index 920eddfe..d13e96f3 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -24,18 +24,19 @@ labels: node_selector_value: enabled images: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - api: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3 - engine: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-heat-api:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + api: docker.io/kolla/ubuntu-source-heat-api:3.0.3 + cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3 + cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3 + engine: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" conf: diff --git a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl b/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl index 08c51c01..3c96d071 100644 --- a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl +++ b/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl @@ -19,7 +19,7 @@ limitations under the License. {{- $deps := index . 1 -}} {{- $mounts := index . 2 -}} - name: init - image: {{ $envAll.Values.images.dep_check }} + image: {{ $envAll.Values.images.tags.dep_check }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} env: - name: POD_NAME diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index c2cfba94..7339b9ce 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_horizon_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: horizon - image: {{ .Values.images.horizon }} + image: {{ .Values.images.tags.horizon }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/horizon/templates/job-db-drop.yaml b/horizon/templates/job-db-drop.yaml index c472c432..a6926c07 100644 --- a/horizon/templates/job-db-drop.yaml +++ b/horizon/templates/job-db-drop.yaml @@ -41,7 +41,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: horizon-db-drop - image: {{ .Values.images.db_drop }} + image: {{ .Values.images.tags.db_drop }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/horizon/templates/job-db-init.yaml b/horizon/templates/job-db-init.yaml index dd07c3fd..613f3076 100644 --- a/horizon/templates/job-db-init.yaml +++ b/horizon/templates/job-db-init.yaml @@ -37,7 +37,7 @@ spec: {{ tuple $envAll $dependencies $mounts_horizon_db_init_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: horizon-db-init - image: {{ .Values.images.db_init }} + image: {{ .Values.images.tags.db_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/horizon/templates/job-db-sync.yaml b/horizon/templates/job-db-sync.yaml index 991ce332..c32710f9 100644 --- a/horizon/templates/job-db-sync.yaml +++ b/horizon/templates/job-db-sync.yaml @@ -37,7 +37,7 @@ spec: {{ tuple $envAll $dependencies $mounts_horizon_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: horizon-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/horizon/values.yaml b/horizon/values.yaml index b45203c5..91184890 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -18,11 +18,12 @@ # name: value images: - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-horizon:4.0.0 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - horizon: docker.io/kolla/ubuntu-source-horizon:4.0.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-horizon:4.0.0 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + horizon: docker.io/kolla/ubuntu-source-horizon:4.0.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" release_group: null diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml index e3ac5f5c..f46c2365 100644 --- a/ingress/templates/deployment-error.yaml +++ b/ingress/templates/deployment-error.yaml @@ -37,7 +37,7 @@ spec: terminationGracePeriodSeconds: 60 containers: - name: ingress-error-pages - image: {{ .Values.images.error_pages }} + image: {{ .Values.images.tags.error_pages }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.error_pages | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} livenessProbe: diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index 75d253ed..1af6ce36 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -50,7 +50,7 @@ spec: terminationGracePeriodSeconds: 60 containers: - name: ingress-api - image: {{ .Values.images.ingress }} + image: {{ .Values.images.tags.ingress }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.ingress | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} readinessProbe: diff --git a/ingress/values.yaml b/ingress/values.yaml index 02758bac..7f1907b2 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -18,10 +18,11 @@ # name: value images: - entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 - # https://github.com/kubernetes/ingress/blob/master/controllers/nginx/Changelog.md - ingress: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.8 - error_pages: gcr.io/google_containers/defaultbackend:1.0 + tags: + entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + # https://github.com/kubernetes/ingress/blob/master/controllers/nginx/Changelog.md + ingress: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.8 + error_pages: gcr.io/google_containers/defaultbackend:1.0 pull_policy: "IfNotPresent" pod: diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml index 2af41f78..b40bac2d 100644 --- a/keystone/templates/cron-job-credential-rotate.yaml +++ b/keystone/templates/cron-job-credential-rotate.yaml @@ -41,7 +41,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: keystone-credential-rotate - image: {{ .Values.images.credential_rotate }} + image: {{ .Values.images.tags.credential_rotate }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.credential_rotate | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }} env: diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml index b0777895..1f8efabe 100644 --- a/keystone/templates/cron-job-fernet-rotate.yaml +++ b/keystone/templates/cron-job-fernet-rotate.yaml @@ -41,7 +41,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: keystone-fernet-rotate - image: {{ .Values.images.fernet_rotate }} + image: {{ .Values.images.tags.fernet_rotate }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.fernet_rotate | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }} env: diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml index 390dc551..e771acf0 100644 --- a/keystone/templates/deployment-api.yaml +++ b/keystone/templates/deployment-api.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_keystone_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: keystone-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/keystone/templates/job-bootstrap.yaml b/keystone/templates/job-bootstrap.yaml index 8bdae00c..14805bc8 100644 --- a/keystone/templates/job-bootstrap.yaml +++ b/keystone/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies $mounts_keystone_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: keystone-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml index 00aa6d4a..9b30c93b 100644 --- a/keystone/templates/job-credential-setup.yaml +++ b/keystone/templates/job-credential-setup.yaml @@ -36,7 +36,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: keystone-credential-setup - image: {{ .Values.images.credential_setup }} + image: {{ .Values.images.tags.credential_setup }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.credential_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/keystone/templates/job-db-drop.yaml b/keystone/templates/job-db-drop.yaml index fdb4c573..09d2d656 100644 --- a/keystone/templates/job-db-drop.yaml +++ b/keystone/templates/job-db-drop.yaml @@ -40,7 +40,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: keystone-db-drop - image: {{ .Values.images.db_drop }} + image: {{ .Values.images.tags.db_drop }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/keystone/templates/job-db-init.yaml b/keystone/templates/job-db-init.yaml index 71c205ea..04c2f327 100644 --- a/keystone/templates/job-db-init.yaml +++ b/keystone/templates/job-db-init.yaml @@ -37,7 +37,7 @@ spec: {{ tuple $envAll $dependencies $mounts_keystone_db_init_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: keystone-db-init - image: {{ .Values.images.db_init }} + image: {{ .Values.images.tags.db_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml index 926c64ff..42874d8e 100644 --- a/keystone/templates/job-db-sync.yaml +++ b/keystone/templates/job-db-sync.yaml @@ -37,7 +37,7 @@ spec: {{ tuple $envAll $dependencies $mounts_keystone_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: keystone-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml index 689b718a..5da31ec2 100644 --- a/keystone/templates/job-fernet-setup.yaml +++ b/keystone/templates/job-fernet-setup.yaml @@ -37,7 +37,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: keystone-fernet-setup - image: {{ .Values.images.fernet_setup }} + image: {{ .Values.images.tags.fernet_setup }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.fernet_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/keystone/templates/pod-rally-test.yaml b/keystone/templates/pod-rally-test.yaml index 3655970a..195633d1 100644 --- a/keystone/templates/pod-rally-test.yaml +++ b/keystone/templates/pod-rally-test.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies $mounts_keystone_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} containers: - name: {{.Release.Name}}-token-issue-test - image: {{ .Values.images.test }} + image: {{ .Values.images.tags.test }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: diff --git a/keystone/values.yaml b/keystone/values.yaml index bd671de5..a6fb4b7a 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -24,17 +24,18 @@ labels: release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-keystone:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - fernet_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3 - fernet_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3 - credential_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3 - credential_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3 - api: docker.io/kolla/ubuntu-source-keystone:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + test: docker.io/kolla/ubuntu-source-rally:4.0.0 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-keystone:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + fernet_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3 + fernet_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3 + credential_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3 + credential_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3 + api: docker.io/kolla/ubuntu-source-keystone:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" bootstrap: diff --git a/ldap/templates/statefulset.yaml b/ldap/templates/statefulset.yaml index 0d0fac98..17cf9c52 100644 --- a/ldap/templates/statefulset.yaml +++ b/ldap/templates/statefulset.yaml @@ -35,7 +35,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: ldap - image: {{ .Values.images.ldap }} + image: {{ .Values.images.tags.ldap }} imagePullPolicy: {{ .Values.images.pull_policy }} env: - name: LDAP_DOMAIN diff --git a/ldap/values.yaml b/ldap/values.yaml index 1ee4faf4..480893ca 100644 --- a/ldap/values.yaml +++ b/ldap/values.yaml @@ -35,7 +35,8 @@ pod: memory: "1024Mi" cpu: "2000m" images: - ldap: "docker.io/osixia/openldap:1.1.9" + tags: + ldap: "docker.io/osixia/openldap:1.1.9" pull_policy: IfNotPresent storage: diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml index c26c65b0..dd3ad2ad 100644 --- a/libvirt/templates/daemonset-libvirt.yaml +++ b/libvirt/templates/daemonset-libvirt.yaml @@ -41,7 +41,7 @@ spec: {{- if .Values.ceph.enabled }} initContainers: - name: ceph-keyring-placement - image: {{ .Values.images.libvirt }} + image: {{ .Values.images.tags.libvirt }} imagePullPolicy: {{ .Values.images.pull_policy }} securityContext: runAsUser: 0 @@ -70,7 +70,7 @@ spec: {{- end }} containers: - name: libvirt - image: {{ .Values.images.libvirt }} + image: {{ .Values.images.tags.libvirt }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.libvirt | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/libvirt/values.yaml b/libvirt/values.yaml index 95ae6da0..b3c5c0ac 100644 --- a/libvirt/values.yaml +++ b/libvirt/values.yaml @@ -26,7 +26,8 @@ labels: node_selector_value: enabled images: - libvirt: docker.io/kolla/ubuntu-source-nova-libvirt:3.0.3 + tags: + libvirt: docker.io/kolla/ubuntu-source-nova-libvirt:3.0.3 pull_policy: "IfNotPresent" ceph: diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index 0e006a4b..fc9fb4dd 100644 --- a/magnum/templates/deployment-api.yaml +++ b/magnum/templates/deployment-api.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_magnum_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: magnum-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/magnum/templates/job-bootstrap.yaml b/magnum/templates/job-bootstrap.yaml index 841f3c67..c1a099e8 100644 --- a/magnum/templates/job-bootstrap.yaml +++ b/magnum/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies $mounts_magnum_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: magnum-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/magnum/templates/job-db-drop.yaml b/magnum/templates/job-db-drop.yaml index e9afd1f0..5be61d4c 100644 --- a/magnum/templates/job-db-drop.yaml +++ b/magnum/templates/job-db-drop.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: magnum-db-drop - image: {{ .Values.images.db_drop | quote }} + image: {{ .Values.images.tags.db_drop | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/magnum/templates/job-db-init.yaml b/magnum/templates/job-db-init.yaml index 9db9b92f..dd6ddd87 100644 --- a/magnum/templates/job-db-init.yaml +++ b/magnum/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: magnum-db-init - image: {{ .Values.images.db_init | quote }} + image: {{ .Values.images.tags.db_init | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/magnum/templates/job-db-sync.yaml b/magnum/templates/job-db-sync.yaml index 5fc2753a..b27fa7a0 100644 --- a/magnum/templates/job-db-sync.yaml +++ b/magnum/templates/job-db-sync.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: magnum-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/magnum/templates/job-ks-endpoints.yaml b/magnum/templates/job-ks-endpoints.yaml index a1bfd27a..2e9ef28e 100644 --- a/magnum/templates/job-ks-endpoints.yaml +++ b/magnum/templates/job-ks-endpoints.yaml @@ -37,7 +37,7 @@ spec: {{- range $key1, $osServiceType := tuple "container-infra" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/magnum/templates/job-ks-service.yaml b/magnum/templates/job-ks-service.yaml index fbce1fa7..2440bc99 100644 --- a/magnum/templates/job-ks-service.yaml +++ b/magnum/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "container-infra" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/magnum/templates/job-ks-user.yaml b/magnum/templates/job-ks-user.yaml index 89e5e87d..631d0e82 100644 --- a/magnum/templates/job-ks-user.yaml +++ b/magnum/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: magnum-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml index 9127a8db..f6bc9373 100644 --- a/magnum/templates/statefulset-conductor.yaml +++ b/magnum/templates/statefulset-conductor.yaml @@ -40,7 +40,7 @@ spec: {{ tuple $envAll $dependencies $mounts_magnum_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: magnum-conductor - image: {{ .Values.images.conductor }} + image: {{ .Values.images.tags.conductor }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/magnum/values.yaml b/magnum/values.yaml index 8faad8c0..5b5c7cc9 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -24,16 +24,17 @@ labels: node_selector_value: enabled images: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - api: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 - conductor: docker.io/kolla/ubuntu-source-magnum-conductor:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + api: docker.io/kolla/ubuntu-source-magnum-api:3.0.3 + conductor: docker.io/kolla/ubuntu-source-magnum-conductor:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" conf: diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml index baff6c1f..c6858697 100644 --- a/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml @@ -34,7 +34,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: mariadb - image: {{ .Values.images.mariadb }} + image: {{ .Values.images.tags.mariadb }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/mariadb/values.yaml b/mariadb/values.yaml index 5293f9da..f5aaf9c8 100644 --- a/mariadb/values.yaml +++ b/mariadb/values.yaml @@ -38,7 +38,8 @@ pod: cpu: "500m" images: - mariadb: docker.io/mariadb:10.1.23 + tags: + mariadb: docker.io/mariadb:10.1.23 pull_policy: IfNotPresent volume: diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index b9b8bddc..7b94f673 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: memcached - image: {{ .Values.images.memcached }} + image: {{ .Values.images.tags.memcached }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: ["sh", "-xec"] diff --git a/memcached/values.yaml b/memcached/values.yaml index d4631b0a..eb50515c 100644 --- a/memcached/values.yaml +++ b/memcached/values.yaml @@ -18,7 +18,8 @@ # name: value images: - memcached: docker.io/memcached:1.4 + tags: + memcached: docker.io/memcached:1.4 pull_policy: "IfNotPresent" pod: diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index c7f394ab..93972f5b 100644 --- a/mistral/templates/deployment-api.yaml +++ b/mistral/templates/deployment-api.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_mistral_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index b33c6bdf..294e3c1e 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/mistral/templates/deployment-executor.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_mistral_executor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-executor - image: {{ .Values.images.executor }} + image: {{ .Values.images.tags.executor }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.executor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/mistral/templates/job-bootstrap.yaml b/mistral/templates/job-bootstrap.yaml index 772769f0..43966c2f 100644 --- a/mistral/templates/job-bootstrap.yaml +++ b/mistral/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies $mounts_mistral_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/mistral/templates/job-db-drop.yaml b/mistral/templates/job-db-drop.yaml index 1fd6569b..5374824f 100644 --- a/mistral/templates/job-db-drop.yaml +++ b/mistral/templates/job-db-drop.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-db-drop - image: {{ .Values.images.db_drop | quote }} + image: {{ .Values.images.tags.db_drop | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/mistral/templates/job-db-init.yaml b/mistral/templates/job-db-init.yaml index 7c64ba67..bcc05550 100644 --- a/mistral/templates/job-db-init.yaml +++ b/mistral/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-db-init - image: {{ .Values.images.db_init | quote }} + image: {{ .Values.images.tags.db_init | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/mistral/templates/job-db-sync.yaml b/mistral/templates/job-db-sync.yaml index 65117abf..830115fc 100644 --- a/mistral/templates/job-db-sync.yaml +++ b/mistral/templates/job-db-sync.yaml @@ -36,7 +36,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/mistral/templates/job-ks-endpoints.yaml b/mistral/templates/job-ks-endpoints.yaml index 341684b4..946df53a 100644 --- a/mistral/templates/job-ks-endpoints.yaml +++ b/mistral/templates/job-ks-endpoints.yaml @@ -37,7 +37,7 @@ spec: {{- range $key1, $osServiceType := tuple "workflow" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/mistral/templates/job-ks-service.yaml b/mistral/templates/job-ks-service.yaml index ac6a5e18..f4cda996 100644 --- a/mistral/templates/job-ks-service.yaml +++ b/mistral/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "workflow" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/mistral/templates/job-ks-user.yaml b/mistral/templates/job-ks-user.yaml index cdd57a7d..fdb6d9c3 100644 --- a/mistral/templates/job-ks-user.yaml +++ b/mistral/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index 26651f0e..a96be01d 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/mistral/templates/statefulset-engine.yaml @@ -40,7 +40,7 @@ spec: {{ tuple $envAll $dependencies $mounts_mistral_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-engine - image: {{ .Values.images.engine }} + image: {{ .Values.images.tags.engine }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index d2022d2c..e31c4ef0 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/mistral/templates/statefulset-event-engine.yaml @@ -40,7 +40,7 @@ spec: {{ tuple $envAll $dependencies $mounts_mistral_event_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: mistral-event-engine - image: {{ .Values.images.event_engine }} + image: {{ .Values.images.tags.event_engine }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.event_engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/mistral/values.yaml b/mistral/values.yaml index 7115d921..4ac59d53 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -24,18 +24,19 @@ labels: release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - api: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 - engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3 - event_engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3 - executor: docker.io/kolla/ubuntu-source-mistral-executor:3.0.3 + tags: + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + api: docker.io/kolla/ubuntu-source-mistral-api:3.0.3 + engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3 + event_engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3 + executor: docker.io/kolla/ubuntu-source-mistral-executor:3.0.3 pull_policy: "IfNotPresent" network: diff --git a/mongodb/templates/statefulset.yaml b/mongodb/templates/statefulset.yaml index a2be50d9..116e6104 100644 --- a/mongodb/templates/statefulset.yaml +++ b/mongodb/templates/statefulset.yaml @@ -35,7 +35,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: mongodb - image: {{ .Values.images.mongodb }} + image: {{ .Values.images.tags.mongodb }} imagePullPolicy: {{ .Values.images.pull_policy }} ports: - containerPort: {{ tuple "mongodb" "internal" "mongodb" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} diff --git a/mongodb/values.yaml b/mongodb/values.yaml index 90751021..c0fb6bad 100644 --- a/mongodb/values.yaml +++ b/mongodb/values.yaml @@ -38,7 +38,8 @@ pod: # using dockerhub mongodb: https://hub.docker.com/r/library/mongo/tags/ images: - mongodb: docker.io/mongo:3.4.9-jessie + tags: + mongodb: docker.io/mongo:3.4.9-jessie pull_policy: IfNotPresent storage: diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index 68f32522..e34d8494 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/neutron/templates/daemonset-dhcp-agent.yaml @@ -42,7 +42,7 @@ spec: {{ tuple $envAll $dependencies $mounts_neutron_dhcp_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-dhcp-agent - image: {{ .Values.images.dhcp }} + image: {{ .Values.images.tags.dhcp }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.agent.dhcp | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index 5efdf214..0cd58472 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/neutron/templates/daemonset-l3-agent.yaml @@ -42,7 +42,7 @@ spec: {{ tuple $envAll $dependencies $mounts_neutron_l3_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-l3-agent - image: {{ .Values.images.l3 }} + image: {{ .Values.images.tags.l3 }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.agent.l3 | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemonset-lb-agent.yaml index e1dc5efe..5af6fb7b 100644 --- a/neutron/templates/daemonset-lb-agent.yaml +++ b/neutron/templates/daemonset-lb-agent.yaml @@ -41,7 +41,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_neutron_lb_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: neutron-lb-agent-init - image: {{ .Values.images.neutron_linuxbridge_agent }} + image: {{ .Values.images.tags.neutron_linuxbridge_agent }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: @@ -127,7 +127,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.neutron_linuxbridge_agent }} + image: {{ .Values.images.tags.neutron_linuxbridge_agent }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index 61e34949..28cceb6e 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/neutron/templates/daemonset-metadata-agent.yaml @@ -41,7 +41,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_neutron_metadata_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: neutron-metadata-agent-init - image: {{ .Values.images.metadata }} + image: {{ .Values.images.tags.metadata }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: @@ -61,7 +61,7 @@ spec: mountPath: /tmp/pod-shared containers: - name: neutron-metadata-agent - image: {{ .Values.images.metadata }} + image: {{ .Values.images.tags.metadata }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index 82715d04..a73ec9e0 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/neutron/templates/daemonset-ovs-agent.yaml @@ -41,7 +41,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_neutron_ovs_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: neutron-ovs-agent-init - image: {{ .Values.images.neutron_openvswitch_agent }} + image: {{ .Values.images.tags.neutron_openvswitch_agent }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: @@ -127,7 +127,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.neutron_openvswitch_agent }} + image: {{ .Values.images.tags.neutron_openvswitch_agent }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index cf359016..b5677af6 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_neutron_server_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-server - image: {{ .Values.images.server }} + image: {{ .Values.images.tags.server }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/neutron/templates/job-bootstrap.yaml b/neutron/templates/job-bootstrap.yaml index ab67a303..cf7012b3 100644 --- a/neutron/templates/job-bootstrap.yaml +++ b/neutron/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies $mounts_neutron_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/neutron/templates/job-db-drop.yaml b/neutron/templates/job-db-drop.yaml index c13ef0f7..e84aa8dc 100644 --- a/neutron/templates/job-db-drop.yaml +++ b/neutron/templates/job-db-drop.yaml @@ -39,7 +39,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-db-drop - image: {{ .Values.images.db_drop }} + image: {{ .Values.images.tags.db_drop }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/neutron/templates/job-db-init.yaml b/neutron/templates/job-db-init.yaml index e33a2072..3e6af438 100644 --- a/neutron/templates/job-db-init.yaml +++ b/neutron/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-db-init - image: {{ .Values.images.db_init }} + image: {{ .Values.images.tags.db_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml index efd0e607..c0a2345c 100644 --- a/neutron/templates/job-db-sync.yaml +++ b/neutron/templates/job-db-sync.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{- if .Values.pod.resources.enabled }} diff --git a/neutron/templates/job-ks-endpoints.yaml b/neutron/templates/job-ks-endpoints.yaml index 93c9a800..537a1734 100644 --- a/neutron/templates/job-ks-endpoints.yaml +++ b/neutron/templates/job-ks-endpoints.yaml @@ -37,7 +37,7 @@ spec: {{- range $key1, $osServiceType := tuple "network" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/neutron/templates/job-ks-service.yaml b/neutron/templates/job-ks-service.yaml index 039bfff4..296c5f1a 100644 --- a/neutron/templates/job-ks-service.yaml +++ b/neutron/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "network" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/neutron/templates/job-ks-user.yaml b/neutron/templates/job-ks-user.yaml index 7b2ff58f..eaf69379 100644 --- a/neutron/templates/job-ks-user.yaml +++ b/neutron/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml index 7fe1961a..5114bba6 100644 --- a/neutron/templates/pod-rally-test.yaml +++ b/neutron/templates/pod-rally-test.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies $mounts_neutron_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} containers: - name: {{.Release.Name}}-token-issue-test - image: {{ .Values.images.test }} + image: {{ .Values.images.tags.test }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} env: diff --git a/neutron/values.yaml b/neutron/values.yaml index bd25ab6c..b6fe3f2c 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -20,21 +20,22 @@ release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - server: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 - dhcp: docker.io/kolla/ubuntu-source-neutron-dhcp-agent:3.0.3 - metadata: docker.io/kolla/ubuntu-source-neutron-metadata-agent:3.0.3 - l3: docker.io/kolla/ubuntu-source-neutron-l3-agent:3.0.3 - neutron_openvswitch_agent: docker.io/kolla/ubuntu-source-neutron-openvswitch-agent:3.0.3 - neutron_linuxbridge_agent: docker.io/kolla/ubuntu-source-neutron-linuxbridge-agent:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + test: docker.io/kolla/ubuntu-source-rally:4.0.0 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + server: docker.io/kolla/ubuntu-source-neutron-server:3.0.3 + dhcp: docker.io/kolla/ubuntu-source-neutron-dhcp-agent:3.0.3 + metadata: docker.io/kolla/ubuntu-source-neutron-metadata-agent:3.0.3 + l3: docker.io/kolla/ubuntu-source-neutron-l3-agent:3.0.3 + neutron_openvswitch_agent: docker.io/kolla/ubuntu-source-neutron-openvswitch-agent:3.0.3 + neutron_linuxbridge_agent: docker.io/kolla/ubuntu-source-neutron-linuxbridge-agent:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" labels: diff --git a/nfs-provisioner/templates/deployment.yaml b/nfs-provisioner/templates/deployment.yaml index 1f08dca6..7ad149d7 100644 --- a/nfs-provisioner/templates/deployment.yaml +++ b/nfs-provisioner/templates/deployment.yaml @@ -36,7 +36,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: nfs-provisioner - image: {{ .Values.images.nfs_provisioner }} + image: {{ .Values.images.tags.nfs_provisioner }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/nfs-provisioner/values.yaml b/nfs-provisioner/values.yaml index 15deb2cc..cfa8aa0f 100644 --- a/nfs-provisioner/values.yaml +++ b/nfs-provisioner/values.yaml @@ -37,7 +37,8 @@ pod: cpu: "2000m" images: - nfs_provisioner: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.7 + tags: + nfs_provisioner: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.7 pull_policy: IfNotPresent storage: diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index ee0c7aa7..eebb378d 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -42,7 +42,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_nova_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: nova-compute-init - image: {{ .Values.images.compute }} + image: {{ .Values.images.tags.compute }} imagePullPolicy: {{ .Values.images.pull_policy }} securityContext: runAsUser: 0 @@ -60,7 +60,7 @@ spec: mountPath: /var/lib/nova {{- if .Values.ceph.enabled }} - name: ceph-keyring-placement - image: {{ .Values.images.compute }} + image: {{ .Values.images.tags.compute }} imagePullPolicy: {{ .Values.images.pull_policy }} securityContext: runAsUser: {{ .Values.pod.user.nova.uid }} @@ -87,7 +87,7 @@ spec: readOnly: true {{ end }} - name: nova-compute-vnc-init - image: {{ .Values.images.compute }} + image: {{ .Values.images.tags.compute }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: @@ -103,7 +103,7 @@ spec: mountPath: /tmp/pod-shared containers: - name: nova-compute - image: {{ .Values.images.compute }} + image: {{ .Values.images.tags.compute }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: @@ -196,7 +196,7 @@ spec: readOnly: true {{ if $mounts_nova_compute.volumeMounts }}{{ toYaml $mounts_nova_compute.volumeMounts | indent 12 }}{{ end }} - name: nova-compute-ssh - image: {{ .Values.images.compute_ssh }} + image: {{ .Values.images.tags.compute_ssh }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.ssh | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml index d3080bbd..ac2a6971 100644 --- a/nova/templates/deployment-api-metadata.yaml +++ b/nova/templates/deployment-api-metadata.yaml @@ -43,7 +43,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_nova_api_metadata_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: nova-api-metadata-init - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: @@ -63,7 +63,7 @@ spec: mountPath: /tmp/pod-shared containers: - name: nova-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml index d9b663ff..a1414b06 100644 --- a/nova/templates/deployment-api-osapi.yaml +++ b/nova/templates/deployment-api-osapi.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_nova_api_osapi_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-osapi - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml index f026d397..735db7e2 100644 --- a/nova/templates/deployment-conductor.yaml +++ b/nova/templates/deployment-conductor.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_nova_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-conductor - image: {{ .Values.images.conductor }} + image: {{ .Values.images.tags.conductor }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml index ee515535..46bdd4ee 100644 --- a/nova/templates/deployment-consoleauth.yaml +++ b/nova/templates/deployment-consoleauth.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_nova_consoleauth_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-consoleauth - image: {{ .Values.images.consoleauth }} + image: {{ .Values.images.tags.consoleauth }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml index 1d161307..c27a6508 100644 --- a/nova/templates/deployment-novncproxy.yaml +++ b/nova/templates/deployment-novncproxy.yaml @@ -45,7 +45,7 @@ spec: initContainers: {{ tuple $envAll $dependencies $mounts_nova_novncproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: nova-novncproxy-init - image: {{ .Values.images.novncproxy }} + image: {{ .Values.images.tags.novncproxy }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: @@ -64,7 +64,7 @@ spec: - name: pod-shared mountPath: /tmp/pod-shared - name: nova-novncproxy-init-assets - image: {{ .Values.images.novncproxy_assets }} + image: {{ .Values.images.tags.novncproxy_assets }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: @@ -78,7 +78,7 @@ spec: mountPath: /tmp/usr/share/novnc containers: - name: nova-novncproxy - image: {{ .Values.images.novncproxy }} + image: {{ .Values.images.tags.novncproxy }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml index 82293aab..33a0784c 100644 --- a/nova/templates/deployment-scheduler.yaml +++ b/nova/templates/deployment-scheduler.yaml @@ -43,7 +43,7 @@ spec: {{ tuple $envAll $dependencies $mounts_nova_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-scheduler - image: {{ .Values.images.scheduler }} + image: {{ .Values.images.tags.scheduler }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/nova/templates/job-bootstrap.yaml b/nova/templates/job-bootstrap.yaml index de27d117..85b5264b 100644 --- a/nova/templates/job-bootstrap.yaml +++ b/nova/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies $mounts_nova_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/nova/templates/job-db-drop.yaml b/nova/templates/job-db-drop.yaml index 87ed03f8..9a8d8507 100644 --- a/nova/templates/job-db-drop.yaml +++ b/nova/templates/job-db-drop.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-db-drop - image: {{ .Values.images.db_drop }} + image: {{ .Values.images.tags.db_drop }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: @@ -67,7 +67,7 @@ spec: subPath: nova.conf readOnly: true - name: nova-db-drop-api - image: {{ .Values.images.db_drop }} + image: {{ .Values.images.tags.db_drop }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/nova/templates/job-db-init.yaml b/nova/templates/job-db-init.yaml index d66c2283..8f884ba1 100644 --- a/nova/templates/job-db-init.yaml +++ b/nova/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-db-init - image: {{ .Values.images.db_init }} + image: {{ .Values.images.tags.db_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: @@ -64,7 +64,7 @@ spec: subPath: nova.conf readOnly: true - name: nova-db-init-api - image: {{ .Values.images.db_init }} + image: {{ .Values.images.tags.db_init }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml index d28f142f..db6cd67d 100644 --- a/nova/templates/job-db-sync.yaml +++ b/nova/templates/job-db-sync.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/nova/templates/job-ks-endpoints.yaml b/nova/templates/job-ks-endpoints.yaml index 3e2e8cb9..3eae18c7 100644 --- a/nova/templates/job-ks-endpoints.yaml +++ b/nova/templates/job-ks-endpoints.yaml @@ -37,7 +37,7 @@ spec: {{- range $key1, $osServiceType := tuple "compute" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/nova/templates/job-ks-service.yaml b/nova/templates/job-ks-service.yaml index 36697aa9..8fa52a14 100644 --- a/nova/templates/job-ks-service.yaml +++ b/nova/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "compute" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/nova/templates/job-ks-user.yaml b/nova/templates/job-ks-user.yaml index 3bbe1cea..d85554b2 100644 --- a/nova/templates/job-ks-user.yaml +++ b/nova/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/nova/templates/pod-rally-test.yaml b/nova/templates/pod-rally-test.yaml index d726f127..ee246744 100644 --- a/nova/templates/pod-rally-test.yaml +++ b/nova/templates/pod-rally-test.yaml @@ -32,7 +32,7 @@ spec: {{ tuple $envAll $dependencies $mounts_nova_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} containers: - name: {{.Release.Name}}-token-issue-test - image: {{ .Values.images.test }} + image: {{ .Values.images.tags.test }} imagePullPolicy: {{ .Values.images.pull_policy }} env: {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }} diff --git a/nova/values.yaml b/nova/values.yaml index a4b87ecc..f7541d42 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -47,23 +47,24 @@ labels: node_selector_value: enabled images: - test: docker.io/kolla/ubuntu-source-rally:4.0.0 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-nova-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - api: docker.io/kolla/ubuntu-source-nova-api:3.0.3 - conductor: docker.io/kolla/ubuntu-source-nova-conductor:3.0.3 - scheduler: docker.io/kolla/ubuntu-source-nova-scheduler:3.0.3 - novncproxy: docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3 - novncproxy_assets: docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3 - consoleauth: docker.io/kolla/ubuntu-source-nova-consoleauth:3.0.3 - compute: docker.io/kolla/ubuntu-source-nova-compute:3.0.3 - compute_ssh: docker.io/kolla/ubuntu-source-nova-ssh:3.0.3 - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + test: docker.io/kolla/ubuntu-source-rally:4.0.0 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-nova-api:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + api: docker.io/kolla/ubuntu-source-nova-api:3.0.3 + conductor: docker.io/kolla/ubuntu-source-nova-conductor:3.0.3 + scheduler: docker.io/kolla/ubuntu-source-nova-scheduler:3.0.3 + novncproxy: docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3 + novncproxy_assets: docker.io/kolla/ubuntu-source-nova-novncproxy:3.0.3 + consoleauth: docker.io/kolla/ubuntu-source-nova-consoleauth:3.0.3 + compute: docker.io/kolla/ubuntu-source-nova-compute:3.0.3 + compute_ssh: docker.io/kolla/ubuntu-source-nova-ssh:3.0.3 + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" bootstrap: diff --git a/openvswitch/templates/daemonset-ovs-db.yaml b/openvswitch/templates/daemonset-ovs-db.yaml index 3383591d..7a533932 100644 --- a/openvswitch/templates/daemonset-ovs-db.yaml +++ b/openvswitch/templates/daemonset-ovs-db.yaml @@ -36,7 +36,7 @@ spec: hostNetwork: true containers: - name: openvswitch-db - image: {{ .Values.images.openvswitch_db_server }} + image: {{ .Values.images.tags.openvswitch_db_server }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.ovs.db | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/openvswitch/templates/daemonset-ovs-vswitchd.yaml b/openvswitch/templates/daemonset-ovs-vswitchd.yaml index 9ea10679..60bfca7a 100644 --- a/openvswitch/templates/daemonset-ovs-vswitchd.yaml +++ b/openvswitch/templates/daemonset-ovs-vswitchd.yaml @@ -36,7 +36,7 @@ spec: hostNetwork: true containers: - name: openvswitch-vswitchd - image: {{ .Values.images.openvswitch_vswitchd }} + image: {{ .Values.images.tags.openvswitch_vswitchd }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.ovs.vswitchd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml index be162cd0..837fb059 100644 --- a/openvswitch/values.yaml +++ b/openvswitch/values.yaml @@ -20,8 +20,9 @@ release_group: null images: - openvswitch_db_server: docker.io/kolla/ubuntu-source-openvswitch-db-server:3.0.3 - openvswitch_vswitchd: docker.io/kolla/ubuntu-source-openvswitch-vswitchd:3.0.3 + tags: + openvswitch_db_server: docker.io/kolla/ubuntu-source-openvswitch-db-server:3.0.3 + openvswitch_vswitchd: docker.io/kolla/ubuntu-source-openvswitch-vswitchd:3.0.3 pull_policy: "IfNotPresent" labels: diff --git a/postgresql/templates/statefulset.yaml b/postgresql/templates/statefulset.yaml index 23398291..404aae0a 100644 --- a/postgresql/templates/statefulset.yaml +++ b/postgresql/templates/statefulset.yaml @@ -34,7 +34,7 @@ spec: {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} containers: - name: postgresql - image: {{ .Values.images.postgresql }} + image: {{ .Values.images.tags.postgresql }} imagePullPolicy: {{ .Values.images.pull_policy }} ports: - containerPort: {{ tuple "postgresql" "internal" "postgresql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} diff --git a/postgresql/values.yaml b/postgresql/values.yaml index 194cc91b..c297516d 100644 --- a/postgresql/values.yaml +++ b/postgresql/values.yaml @@ -38,7 +38,8 @@ pod: # using dockerhub postgresql: https://hub.docker.com/r/library/postgres/tags/ images: - postgresql: "docker.io/postgres:9.5" + tags: + postgresql: "docker.io/postgres:9.5" pull_policy: IfNotPresent storage: diff --git a/rabbitmq/templates/deployment.yaml b/rabbitmq/templates/deployment.yaml index 2027f3eb..09551973 100644 --- a/rabbitmq/templates/deployment.yaml +++ b/rabbitmq/templates/deployment.yaml @@ -39,7 +39,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 9 }} containers: - name: rabbitmq - image: {{ .Values.images.rabbitmq }} + image: {{ .Values.images.tags.rabbitmq }} {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /scripts/start.sh diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index 993c9e6a..adb40760 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -59,8 +59,9 @@ network: management: '15672' images: - rabbitmq: quay.io/attcomdev/fuel-mcp-rabbitmq:ocata-unstable - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + rabbitmq: quay.io/attcomdev/fuel-mcp-rabbitmq:ocata-unstable + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" enabled_plugins: diff --git a/rally/templates/job-bootstrap.yaml b/rally/templates/job-bootstrap.yaml index 65287dc2..68ceb379 100644 --- a/rally/templates/job-bootstrap.yaml +++ b/rally/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies $mounts_rally_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: rally-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/rally/templates/job-db-init.yaml b/rally/templates/job-db-init.yaml index a92c4444..9eed22c6 100644 --- a/rally/templates/job-db-init.yaml +++ b/rally/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: rally-db-init - image: {{ .Values.images.db_init | quote }} + image: {{ .Values.images.tags.db_init | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/rally/templates/job-ks-endpoints.yaml b/rally/templates/job-ks-endpoints.yaml index 643206ec..6065de26 100644 --- a/rally/templates/job-ks-endpoints.yaml +++ b/rally/templates/job-ks-endpoints.yaml @@ -36,7 +36,7 @@ spec: {{- range $key1, $osServiceType := tuple "benchmark" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/rally/templates/job-ks-service.yaml b/rally/templates/job-ks-service.yaml index 8088ea76..270e8e6f 100644 --- a/rally/templates/job-ks-service.yaml +++ b/rally/templates/job-ks-service.yaml @@ -35,7 +35,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "benchmark" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/rally/templates/job-ks-user.yaml b/rally/templates/job-ks-user.yaml index 122a1870..403875f8 100644 --- a/rally/templates/job-ks-user.yaml +++ b/rally/templates/job-ks-user.yaml @@ -34,7 +34,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: rally-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/rally/templates/job-manage-db.yaml b/rally/templates/job-manage-db.yaml index d0b94303..f7ff12ab 100644 --- a/rally/templates/job-manage-db.yaml +++ b/rally/templates/job-manage-db.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: rally-manage-db - image: {{ .Values.images.manage_db }} + image: {{ .Values.images.tags.manage_db }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.manage_db | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/rally/templates/job-run-task.yaml b/rally/templates/job-run-task.yaml index 371a13a2..57d63228 100644 --- a/rally/templates/job-run-task.yaml +++ b/rally/templates/job-run-task.yaml @@ -34,7 +34,7 @@ spec: initContainers: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: rally-run-task-init - image: {{ .Values.images.run_task }} + image: {{ .Values.images.tags.run_task }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.run_task | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: @@ -49,7 +49,7 @@ spec: mountPath: /var/lib/rally/data containers: - name: rally-run-task - image: {{ .Values.images.run_task }} + image: {{ .Values.images.tags.run_task }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.run_task | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/rally/values.yaml b/rally/values.yaml index 3073b8c2..b314fd64 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -17,15 +17,16 @@ labels: node_selector_value: enabled images: - bootstrap: docker.io/kolla/ubuntu-source-rally:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 - db_init: docker.io/kolla/ubuntu-source-rally:3.0.3 - manage_db: docker.io/kolla/ubuntu-source-rally:3.0.3 - run_task: docker.io/kolla/ubuntu-source-rally:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 - api: docker.io/kolla/ubuntu-source-rally:3.0.3 + tags: + bootstrap: docker.io/kolla/ubuntu-source-rally:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + db_init: docker.io/kolla/ubuntu-source-rally:3.0.3 + manage_db: docker.io/kolla/ubuntu-source-rally:3.0.3 + run_task: docker.io/kolla/ubuntu-source-rally:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 + api: docker.io/kolla/ubuntu-source-rally:3.0.3 pull_policy: "IfNotPresent" enabled_tasks: diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml index 5810eb80..559350fc 100644 --- a/senlin/templates/deployment-api.yaml +++ b/senlin/templates/deployment-api.yaml @@ -44,7 +44,7 @@ spec: {{ tuple $envAll $dependencies $mounts_senlin_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-api - image: {{ .Values.images.api }} + image: {{ .Values.images.tags.api }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/senlin/templates/job-bootstrap.yaml b/senlin/templates/job-bootstrap.yaml index defd39ea..a631a471 100644 --- a/senlin/templates/job-bootstrap.yaml +++ b/senlin/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies $mounts_senlin_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-bootstrap - image: {{ .Values.images.bootstrap }} + image: {{ .Values.images.tags.bootstrap }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/senlin/templates/job-db-drop.yaml b/senlin/templates/job-db-drop.yaml index fdf0d034..ca9a03ba 100644 --- a/senlin/templates/job-db-drop.yaml +++ b/senlin/templates/job-db-drop.yaml @@ -38,7 +38,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-db-drop - image: {{ .Values.images.db_drop | quote }} + image: {{ .Values.images.tags.db_drop | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/senlin/templates/job-db-init.yaml b/senlin/templates/job-db-init.yaml index 4a9f5c10..7c11ed66 100644 --- a/senlin/templates/job-db-init.yaml +++ b/senlin/templates/job-db-init.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-db-init - image: {{ .Values.images.db_init | quote }} + image: {{ .Values.images.tags.db_init | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: diff --git a/senlin/templates/job-db-sync.yaml b/senlin/templates/job-db-sync.yaml index 557ce133..4971d3d2 100644 --- a/senlin/templates/job-db-sync.yaml +++ b/senlin/templates/job-db-sync.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-db-sync - image: {{ .Values.images.db_sync }} + image: {{ .Values.images.tags.db_sync }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/senlin/templates/job-ks-endpoints.yaml b/senlin/templates/job-ks-endpoints.yaml index 4e554665..148da70a 100644 --- a/senlin/templates/job-ks-endpoints.yaml +++ b/senlin/templates/job-ks-endpoints.yaml @@ -37,7 +37,7 @@ spec: {{- range $key1, $osServiceType := tuple "clustering" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - image: {{ $envAll.Values.images.ks_endpoints }} + image: {{ $envAll.Values.images.tags.ks_endpoints }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/senlin/templates/job-ks-service.yaml b/senlin/templates/job-ks-service.yaml index 21841a06..15eb2948 100644 --- a/senlin/templates/job-ks-service.yaml +++ b/senlin/templates/job-ks-service.yaml @@ -36,7 +36,7 @@ spec: containers: {{- range $key1, $osServiceType := tuple "clustering" }} - name: {{ $osServiceType }}-ks-service-registration - image: {{ $envAll.Values.images.ks_service }} + image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/senlin/templates/job-ks-user.yaml b/senlin/templates/job-ks-user.yaml index f765e163..c62af667 100644 --- a/senlin/templates/job-ks-user.yaml +++ b/senlin/templates/job-ks-user.yaml @@ -35,7 +35,7 @@ spec: {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-ks-user - image: {{ .Values.images.ks_user }} + image: {{ .Values.images.tags.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: diff --git a/senlin/templates/statefulset-engine.yaml b/senlin/templates/statefulset-engine.yaml index 61e7546f..a9ce079d 100644 --- a/senlin/templates/statefulset-engine.yaml +++ b/senlin/templates/statefulset-engine.yaml @@ -40,7 +40,7 @@ spec: {{ tuple $envAll $dependencies $mounts_senlin_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-engine - image: {{ .Values.images.engine }} + image: {{ .Values.images.tags.engine }} imagePullPolicy: {{ .Values.images.pull_policy }} {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: diff --git a/senlin/values.yaml b/senlin/values.yaml index 833af4b9..8f45445d 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -24,16 +24,17 @@ labels: release_group: null images: - bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - db_sync: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 - db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - api: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 - engine: docker.io/kolla/ubuntu-source-senlin-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + tags: + bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + db_sync: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 + db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 + api: docker.io/kolla/ubuntu-source-senlin-api:3.0.3 + engine: docker.io/kolla/ubuntu-source-senlin-engine:3.0.3 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 pull_policy: "IfNotPresent" conf: