diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index 8e3d8cc89d..27cb680443 100644 --- a/barbican/templates/deployment-api.yaml +++ b/barbican/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_barbican_api := .Values.pod.mounts.barbican_api.barbican_api }} {{- $mounts_barbican_api_init := .Values.pod.mounts.barbican_api.init_container }} diff --git a/barbican/templates/job-db-drop.yaml b/barbican/templates/job-db-drop.yaml index 21fbdfe627..41365ccbc6 100644 --- a/barbican/templates/job-db-drop.yaml +++ b/barbican/templates/job-db-drop.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/barbican/templates/pod-test.yaml b/barbican/templates/pod-test.yaml index b31a089439..81756d6642 100644 --- a/barbican/templates/pod-test.yaml +++ b/barbican/templates/pod-test.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.pod_test }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.tests }} +{{- $dependencies := .Values.dependencies.static.tests }} {{- $mounts_barbican_tests := .Values.pod.mounts.barbican_tests.barbican_tests }} {{- $mounts_barbican_tests_init := .Values.pod.mounts.barbican_tests.init_container }} diff --git a/barbican/values.yaml b/barbican/values.yaml index 13b36a7c25..de8797667c 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -156,44 +156,45 @@ bootstrap: openstack token issue dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - barbican-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - barbican-ks-service - services: - - service: identity - endpoint: internal - api: - jobs: - - barbican-db-sync - - barbican-ks-user - - barbican-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal + static: + api: + jobs: + - barbican-db-sync + - barbican-ks-user + - barbican-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - barbican-db-init + services: + - endpoint: internal + service: oslo_db + ks_endpoints: + jobs: + - barbican-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity conf: paste: diff --git a/ceilometer/templates/deployment-api.yaml b/ceilometer/templates/deployment-api.yaml index c99912a4bd..eab9621d66 100644 --- a/ceilometer/templates/deployment-api.yaml +++ b/ceilometer/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_ceilometer_api := .Values.pod.mounts.ceilometer_api.ceilometer_api }} {{- $mounts_ceilometer_api_init := .Values.pod.mounts.ceilometer_api.init_container }} diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml index 7c9a147f51..03c8ca2513 100644 --- a/ceilometer/templates/deployment-central.yaml +++ b/ceilometer/templates/deployment-central.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_central }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.central }} +{{- $dependencies := .Values.dependencies.static.central }} {{- $mounts_ceilometer_central := .Values.pod.mounts.ceilometer_central.ceilometer_central }} {{- $mounts_ceilometer_central_init := .Values.pod.mounts.ceilometer_central.init_container }} diff --git a/ceilometer/templates/deployment-collector.yaml b/ceilometer/templates/deployment-collector.yaml index d402eda714..15c7b27d7d 100644 --- a/ceilometer/templates/deployment-collector.yaml +++ b/ceilometer/templates/deployment-collector.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_collector }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.collector }} +{{- $dependencies := .Values.dependencies.static.collector }} {{- $mounts_ceilometer_collector := .Values.pod.mounts.ceilometer_collector.ceilometer_collector }} {{- $mounts_ceilometer_collector_init := .Values.pod.mounts.ceilometer_collector.init_container }} diff --git a/ceilometer/templates/deployment-compute.yaml b/ceilometer/templates/deployment-compute.yaml index 2c0bb8781f..ad9a975cc2 100644 --- a/ceilometer/templates/deployment-compute.yaml +++ b/ceilometer/templates/deployment-compute.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_compute }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.compute }} +{{- $dependencies := .Values.dependencies.static.compute }} {{- $mounts_ceilometer_compute := .Values.pod.mounts.ceilometer_compute.ceilometer_compute }} {{- $mounts_ceilometer_compute_init := .Values.pod.mounts.ceilometer_compute.init_container }} diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml index 84644d68b3..2e1771a918 100644 --- a/ceilometer/templates/deployment-notification.yaml +++ b/ceilometer/templates/deployment-notification.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_notification }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.notification }} +{{- $dependencies := .Values.dependencies.static.notification }} {{- $mounts_ceilometer_notification := .Values.pod.mounts.ceilometer_notification.ceilometer_notification }} {{- $mounts_ceilometer_notification_init := .Values.pod.mounts.ceilometer_notification.init_container }} diff --git a/ceilometer/templates/job-db-init-mongodb.yaml b/ceilometer/templates/job-db-init-mongodb.yaml index 0adb95e5fc..4b362521ed 100644 --- a/ceilometer/templates/job-db-init-mongodb.yaml +++ b/ceilometer/templates/job-db-init-mongodb.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_init_mongodb }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_init_mongodb }} +{{- $dependencies := .Values.dependencies.static.db_init_mongodb }} {{- $serviceAccountName := "ceilometer-db-init-mongodb" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceilometer/templates/pod-rally-test.yaml b/ceilometer/templates/pod-rally-test.yaml index dc5d04ebaf..c6084c4c68 100644 --- a/ceilometer/templates/pod-rally-test.yaml +++ b/ceilometer/templates/pod-rally-test.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.pod_rally_test }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.tests }} +{{- $dependencies := .Values.dependencies.static.tests }} {{- $mounts_tests := .Values.pod.mounts.ceilometer_tests.ceilometer_tests }} {{- $mounts_tests_init := .Values.pod.mounts.ceilometer_tests.init_container }} diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml index 2fc9fcd7da..a41699074b 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -1487,117 +1487,118 @@ conf: override: null dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - db_init_mongodb: - services: - - service: mongodb - endpoint: internal - db_sync: - jobs: - - ceilometer-db-init - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - ceilometer-ks-service - services: - - service: identity - endpoint: internal - api: - jobs: - - ceilometer-db-init-mongodb - - ceilometer-db-sync - - ceilometer-ks-user - - ceilometer-ks-endpoints - services: - - service: identity - endpoint: internal - - service: oslo_db - endpoint: internal - - service: mongodb - endpoint: internal - - service: metric - endpoint: internal - compute: - jobs: - - ceilometer-db-init-mongodb - - ceilometer-db-sync - - ceilometer-ks-user - - ceilometer-ks-endpoints - services: - - service: identity - endpoint: internal - - service: oslo_db - endpoint: internal - - service: mongodb - endpoint: internal - - service: metric - endpoint: internal - collector: - jobs: - - ceilometer-db-init-mongodb - - ceilometer-db-sync - - ceilometer-ks-user - - ceilometer-ks-endpoints - services: - - service: identity - endpoint: internal - - service: oslo_db - endpoint: internal - - service: mongodb - endpoint: internal - - service: metric - endpoint: internal - central: - jobs: - - ceilometer-db-init-mongodb - - ceilometer-db-sync - - ceilometer-ks-user - - ceilometer-ks-endpoints - services: - - service: identity - endpoint: internal - - service: oslo_db - endpoint: internal - - service: mongodb - endpoint: internal - - service: metric - endpoint: internal - notification: - jobs: - - ceilometer-db-init-mongodb - - ceilometer-db-sync - - ceilometer-ks-user - - ceilometer-ks-endpoints - services: - - service: identity - endpoint: internal - - service: oslo_db - endpoint: internal - - service: mongodb - endpoint: internal - - service: metric - endpoint: internal - tests: - services: - - service: identity - endpoint: internal - - service: metering - endpoint: internal - - service: metric - endpoint: internal + static: + api: + jobs: + - ceilometer-db-init-mongodb + - ceilometer-db-sync + - ceilometer-ks-user + - ceilometer-ks-endpoints + services: + - endpoint: internal + service: identity + - endpoint: internal + service: oslo_db + - endpoint: internal + service: mongodb + - endpoint: internal + service: metric + central: + jobs: + - ceilometer-db-init-mongodb + - ceilometer-db-sync + - ceilometer-ks-user + - ceilometer-ks-endpoints + services: + - endpoint: internal + service: identity + - endpoint: internal + service: oslo_db + - endpoint: internal + service: mongodb + - endpoint: internal + service: metric + collector: + jobs: + - ceilometer-db-init-mongodb + - ceilometer-db-sync + - ceilometer-ks-user + - ceilometer-ks-endpoints + services: + - endpoint: internal + service: identity + - endpoint: internal + service: oslo_db + - endpoint: internal + service: mongodb + - endpoint: internal + service: metric + compute: + jobs: + - ceilometer-db-init-mongodb + - ceilometer-db-sync + - ceilometer-ks-user + - ceilometer-ks-endpoints + services: + - endpoint: internal + service: identity + - endpoint: internal + service: oslo_db + - endpoint: internal + service: mongodb + - endpoint: internal + service: metric + db_init: + services: + - endpoint: internal + service: oslo_db + db_init_mongodb: + services: + - endpoint: internal + service: mongodb + db_sync: + jobs: + - ceilometer-db-init + services: + - endpoint: internal + service: oslo_db + ks_endpoints: + jobs: + - ceilometer-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + notification: + jobs: + - ceilometer-db-init-mongodb + - ceilometer-db-sync + - ceilometer-ks-user + - ceilometer-ks-endpoints + services: + - endpoint: internal + service: identity + - endpoint: internal + service: oslo_db + - endpoint: internal + service: mongodb + - endpoint: internal + service: metric + tests: + services: + - endpoint: internal + service: identity + - endpoint: internal + service: metering + - endpoint: internal + service: metric # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/ceph/templates/daemonset-mon.yaml b/ceph/templates/daemonset-mon.yaml index 34507da001..1c31632dc5 100644 --- a/ceph/templates/daemonset-mon.yaml +++ b/ceph/templates/daemonset-mon.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.daemonset_mon .Values.deployment.ceph }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.mon }} +{{- $dependencies := .Values.dependencies.static.mon }} {{- $serviceAccountName := "ceph-mon"}} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/daemonset-osd.yaml b/ceph/templates/daemonset-osd.yaml index a0907b55a2..9a9934abd6 100644 --- a/ceph/templates/daemonset-osd.yaml +++ b/ceph/templates/daemonset-osd.yaml @@ -297,7 +297,7 @@ spec: {{- $daemonset := "osd" }} {{- $configMapName := "ceph-etc" }} {{- $serviceAccountName := "ceph-osd"}} -{{- $dependencies := .Values.dependencies.osd }} +{{- $dependencies := .Values.dependencies.static.osd }} {{ tuple . $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName $dependencies . | include "ceph.osd.daemonset" | toString | fromYaml }} {{- $configmap_yaml := "ceph.configmap.etc" }} diff --git a/ceph/templates/deployment-cephfs-provisioner.yaml b/ceph/templates/deployment-cephfs-provisioner.yaml index 83fb221ed5..557196cccc 100644 --- a/ceph/templates/deployment-cephfs-provisioner.yaml +++ b/ceph/templates/deployment-cephfs-provisioner.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_cephfs_provisioner .Values.deployment.cephfs_provisioner }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.cephfs_provisioner }} +{{- $dependencies := .Values.dependencies.static.cephfs_provisioner }} {{- $serviceAccountName := printf "%s-%s" .Release.Name "ceph-cephfs-provisioner" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/deployment-mds.yaml b/ceph/templates/deployment-mds.yaml index 817df9b588..63bf4653fe 100644 --- a/ceph/templates/deployment-mds.yaml +++ b/ceph/templates/deployment-mds.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_mds ( and .Values.deployment.ceph .Values.conf.features.mds) }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.mds }} +{{- $dependencies := .Values.dependencies.static.mds }} {{- $serviceAccountName := "ceph-mds"}} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/deployment-mgr.yaml b/ceph/templates/deployment-mgr.yaml index fa878de221..84af8dce6a 100644 --- a/ceph/templates/deployment-mgr.yaml +++ b/ceph/templates/deployment-mgr.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_mgr (and .Values.deployment.ceph .Values.conf.features.mgr ) }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.mgr }} +{{- $dependencies := .Values.dependencies.static.mgr }} {{- $serviceAccountName := "ceph-mgr"}} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/deployment-moncheck.yaml b/ceph/templates/deployment-moncheck.yaml index 3358dfeb3b..7ada6f5994 100644 --- a/ceph/templates/deployment-moncheck.yaml +++ b/ceph/templates/deployment-moncheck.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_moncheck .Values.deployment.ceph }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.moncheck }} +{{- $dependencies := .Values.dependencies.static.moncheck }} {{- $serviceAccountName := "ceph-mon-check"}} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/deployment-rbd-provisioner.yaml b/ceph/templates/deployment-rbd-provisioner.yaml index 7e51c8ef1b..253e4988c6 100644 --- a/ceph/templates/deployment-rbd-provisioner.yaml +++ b/ceph/templates/deployment-rbd-provisioner.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_rbd_provisioner .Values.deployment.rbd_provisioner }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.rbd_provisioner }} +{{- $dependencies := .Values.dependencies.static.rbd_provisioner }} {{- $serviceAccountName := printf "%s-%s" .Release.Name "ceph-rbd-provisioner" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/deployment-rgw.yaml b/ceph/templates/deployment-rgw.yaml index dcab62931d..42324c4ecc 100644 --- a/ceph/templates/deployment-rgw.yaml +++ b/ceph/templates/deployment-rgw.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.deployment_rgw ( and .Values.deployment.ceph .Values.conf.features.rgw ) }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.rgw }} +{{- $dependencies := .Values.dependencies.static.rgw }} {{- $serviceAccountName := "ceph-rgw"}} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/job-bootstrap.yaml b/ceph/templates/job-bootstrap.yaml index b788539231..63c46d1f04 100644 --- a/ceph/templates/job-bootstrap.yaml +++ b/ceph/templates/job-bootstrap.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.bootstrap }} +{{- $dependencies := .Values.dependencies.static.bootstrap }} {{- $serviceAccountName := "ceph-bootstrap"}} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/job-cephfs-client-key.yaml b/ceph/templates/job-cephfs-client-key.yaml index 9075a1fc0f..6578b92159 100644 --- a/ceph/templates/job-cephfs-client-key.yaml +++ b/ceph/templates/job-cephfs-client-key.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.job_cephfs_client_key .Values.deployment.cephfs_provisioner }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.cephfs_client_key_generator }} +{{- $dependencies := .Values.dependencies.static.cephfs_client_key_generator }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/ceph/templates/job-keyring.yaml b/ceph/templates/job-keyring.yaml index 089250fe07..54493e9a79 100644 --- a/ceph/templates/job-keyring.yaml +++ b/ceph/templates/job-keyring.yaml @@ -20,7 +20,7 @@ limitations under the License. {{- if not (and (not $envAll.Values.manifests.deployment_rgw) (eq $cephBootstrapKey "rgw")) }} {{- $jobName := print $cephBootstrapKey "-keyring-generator" }} -{{- $dependencies := $envAll.Values.dependencies.job_keyring_generator }} +{{- $dependencies := $envAll.Values.dependencies.static.job_keyring_generator }} {{- $serviceAccountName := print "ceph-" $jobName }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/job-namespace-client-key-cleaner.yaml b/ceph/templates/job-namespace-client-key-cleaner.yaml index 9fd3d373f6..3514e88403 100644 --- a/ceph/templates/job-namespace-client-key-cleaner.yaml +++ b/ceph/templates/job-namespace-client-key-cleaner.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.job_namespace_client_key_cleaner .Values.deployment.client_secrets }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.namespace_client_key_cleaner }} +{{- $dependencies := .Values.dependencies.static.namespace_client_key_cleaner }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/ceph/templates/job-namespace-client-key.yaml b/ceph/templates/job-namespace-client-key.yaml index 871ad7a08c..124a0af717 100644 --- a/ceph/templates/job-namespace-client-key.yaml +++ b/ceph/templates/job-namespace-client-key.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.job_namespace_client_key .Values.deployment.client_secrets }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.namespace_client_key_generator }} +{{- $dependencies := .Values.dependencies.static.namespace_client_key_generator }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/ceph/templates/job-rbd-pool.yaml b/ceph/templates/job-rbd-pool.yaml index bd71b52007..342a17f188 100644 --- a/ceph/templates/job-rbd-pool.yaml +++ b/ceph/templates/job-rbd-pool.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.job_rbd_pool .Values.deployment.ceph }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.rbd_pool }} +{{- $dependencies := .Values.dependencies.static.rbd_pool }} {{- $serviceAccountName := "ceph-rbd-pool" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/templates/job-storage-admin-keys.yaml b/ceph/templates/job-storage-admin-keys.yaml index b0d46db447..afec9f74be 100644 --- a/ceph/templates/job-storage-admin-keys.yaml +++ b/ceph/templates/job-storage-admin-keys.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.job_storage_admin_keys .Values.deployment.storage_secrets }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.storage_keys_generator }} +{{- $dependencies := .Values.dependencies.static.storage_keys_generator }} {{- $serviceAccountName := "ceph-storage-keys-generator" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ceph/values.yaml b/ceph/values.yaml index 0a08d6ca6e..68cb6daf65 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -349,92 +349,93 @@ conf: # location: /var/lib/openstack-helm/ceph/osd/journal-three dependencies: - cephfs_client_key_generator: - jobs: - job_keyring_generator: - jobs: - namespace_client_key_cleaner: - jobs: - namespace_client_key_generator: - jobs: - storage_keys_generator: - jobs: - mon: - jobs: - - ceph-storage-keys-generator - - ceph-mon-keyring-generator - osd: - jobs: - - ceph-storage-keys-generator - - ceph-osd-keyring-generator - services: - - service: ceph_mon - endpoint: internal - moncheck: - jobs: - - ceph-storage-keys-generator - - ceph-mon-keyring-generator - services: - - service: ceph_mon - endpoint: discovery - rgw: - jobs: - - ceph-storage-keys-generator - - ceph-rgw-keyring-generator - - ceph-rbd-pool - services: - - service: ceph_mon - endpoint: internal - mds: - jobs: - - ceph-storage-keys-generator - - ceph-mds-keyring-generator - - ceph-rbd-pool - services: - - service: ceph_mon - endpoint: internal - bootstrap: - jobs: - services: - - service: ceph_mon - endpoint: internal - rbd_provisioner: - jobs: - - ceph-rbd-pool - services: - - service: ceph_mon - endpoint: internal - cephfs_provisioner: - jobs: - - ceph-rbd-pool - services: - - service: ceph_mon - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - ceph-ks-service - services: - - service: identity - endpoint: internal - mgr: - jobs: - - ceph-storage-keys-generator - - ceph-mgr-keyring-generator - services: - - service: ceph_mon - endpoint: internal - rbd_pool: - services: - - service: ceph_mon - endpoint: internal + static: + bootstrap: + jobs: null + services: + - endpoint: internal + service: ceph_mon + cephfs_client_key_generator: + jobs: null + cephfs_provisioner: + jobs: + - ceph-rbd-pool + services: + - endpoint: internal + service: ceph_mon + job_keyring_generator: + jobs: null + ks_endpoints: + jobs: + - ceph-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + mds: + jobs: + - ceph-storage-keys-generator + - ceph-mds-keyring-generator + - ceph-rbd-pool + services: + - endpoint: internal + service: ceph_mon + mgr: + jobs: + - ceph-storage-keys-generator + - ceph-mgr-keyring-generator + services: + - endpoint: internal + service: ceph_mon + mon: + jobs: + - ceph-storage-keys-generator + - ceph-mon-keyring-generator + moncheck: + jobs: + - ceph-storage-keys-generator + - ceph-mon-keyring-generator + services: + - endpoint: discovery + service: ceph_mon + namespace_client_key_cleaner: + jobs: null + namespace_client_key_generator: + jobs: null + osd: + jobs: + - ceph-storage-keys-generator + - ceph-osd-keyring-generator + services: + - endpoint: internal + service: ceph_mon + rbd_pool: + services: + - endpoint: internal + service: ceph_mon + rbd_provisioner: + jobs: + - ceph-rbd-pool + services: + - endpoint: internal + service: ceph_mon + rgw: + jobs: + - ceph-storage-keys-generator + - ceph-rgw-keyring-generator + - ceph-rbd-pool + services: + - endpoint: internal + service: ceph_mon + storage_keys_generator: + jobs: null bootstrap: enabled: false diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml index 1b8b828687..152d609a4d 100644 --- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml +++ b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.cron_volume_usage_audit }} {{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.volume_usage_audit }} +{{- $dependencies := .Values.dependencies.static.volume_usage_audit }} {{- $mounts_cinder_volume_usage_audit := .Values.pod.mounts.cinder_volume_usage_audit.cinder_volume_usage_audit }} {{- $mounts_cinder_volume_usage_audit_init := .Values.pod.mounts.cinder_volume_usage_audit.init_container }} diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index 9b0a7b2976..820daea953 100644 --- a/cinder/templates/deployment-api.yaml +++ b/cinder/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_cinder_api := .Values.pod.mounts.cinder_api.cinder_api }} {{- $mounts_cinder_api_init := .Values.pod.mounts.cinder_api.init_container }} diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml index 13de7fb04d..5c4e9a0117 100644 --- a/cinder/templates/deployment-backup.yaml +++ b/cinder/templates/deployment-backup.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_backup }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.backup }} +{{- $dependencies := .Values.dependencies.static.backup }} {{- $mounts_cinder_backup := .Values.pod.mounts.cinder_backup.cinder_backup }} {{- $mounts_cinder_backup_init := .Values.pod.mounts.cinder_backup.init_container }} diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index b8d0844c50..72515fd275 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/cinder/templates/deployment-scheduler.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_scheduler }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.scheduler }} +{{- $dependencies := .Values.dependencies.static.scheduler }} {{- $mounts_cinder_scheduler := .Values.pod.mounts.cinder_scheduler.cinder_scheduler }} {{- $mounts_cinder_scheduler_init := .Values.pod.mounts.cinder_scheduler.init_container }} diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index ed213766dd..65bd2a2b46 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_volume }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.volume }} +{{- $dependencies := .Values.dependencies.static.volume }} {{- $mounts_cinder_volume := .Values.pod.mounts.cinder_volume.cinder_volume }} {{- $mounts_cinder_volume_init := .Values.pod.mounts.cinder_volume.init_container }} diff --git a/cinder/templates/job-backup-storage-init.yaml b/cinder/templates/job-backup-storage-init.yaml index e9601ec32b..d6d23e334e 100644 --- a/cinder/templates/job-backup-storage-init.yaml +++ b/cinder/templates/job-backup-storage-init.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_backup_storage_init }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.backup_storage_init }} +{{- $dependencies := .Values.dependencies.static.backup_storage_init }} {{- $serviceAccountName := "cinder-backup-storage-init" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/cinder/templates/job-clean.yaml b/cinder/templates/job-clean.yaml index 7beec5d5f6..0098e34171 100644 --- a/cinder/templates/job-clean.yaml +++ b/cinder/templates/job-clean.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_clean }} {{- $envAll := . }} {{ if or (eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph") (include "cinder.is_ceph_volume_configured" $envAll) }} -{{- $dependencies := .Values.dependencies.clean }} +{{- $dependencies := .Values.dependencies.static.clean }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/cinder/templates/job-db-drop.yaml b/cinder/templates/job-db-drop.yaml index 45e650bcb5..9ad3f36189 100644 --- a/cinder/templates/job-db-drop.yaml +++ b/cinder/templates/job-db-drop.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/cinder/templates/job-storage-init.yaml b/cinder/templates/job-storage-init.yaml index a72b24098d..80b2b95bd7 100644 --- a/cinder/templates/job-storage-init.yaml +++ b/cinder/templates/job-storage-init.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_storage_init }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.storage_init }} +{{- $dependencies := .Values.dependencies.static.storage_init }} {{- $serviceAccountName := "cinder-storage-init" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/cinder/templates/pod-rally-test.yaml b/cinder/templates/pod-rally-test.yaml index 57efada5e5..26eb27fd42 100644 --- a/cinder/templates/pod-rally-test.yaml +++ b/cinder/templates/pod-rally-test.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.pod_rally_test }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.tests }} +{{- $dependencies := .Values.dependencies.static.tests }} {{- $mounts_tests := .Values.pod.mounts.cinder_tests.cinder_tests }} {{- $mounts_tests_init := .Values.pod.mounts.cinder_tests.init_container }} diff --git a/cinder/values.yaml b/cinder/values.yaml index 740217770e..b3f2b6b6bd 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -506,108 +506,109 @@ backup: size: 10Gi dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - cinder-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - cinder-ks-service - services: - - service: identity - endpoint: internal - backup_storage_init: - jobs: - storage_init: - jobs: - clean: - jobs: - api: - jobs: - - cinder-db-sync - - cinder-ks-user - - cinder-ks-endpoints - - cinder-storage-init - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - bootstrap: - services: - - service: identity - endpoint: internal - - service: volume - endpoint: internal - volume: - jobs: - - cinder-db-sync - - cinder-ks-user - - cinder-ks-endpoints - - cinder-storage-init - services: - - service: identity - endpoint: internal - - service: volume - endpoint: internal - volume_usage_audit: - jobs: - - cinder-db-sync - - cinder-ks-user - - cinder-ks-endpoints - - cinder-storage-init - services: - - service: identity - endpoint: internal - - service: volume - endpoint: internal - scheduler: - jobs: - - cinder-db-sync - - cinder-ks-user - - cinder-ks-endpoints - - cinder-storage-init - services: - - service: identity - endpoint: internal - - service: volume - endpoint: internal - backup: - jobs: - - cinder-db-sync - - cinder-ks-user - - cinder-ks-endpoints - - cinder-storage-init - - cinder-backup-storage-init - services: - - service: identity - endpoint: internal - - service: volume - endpoint: internal - tests: - services: - - service: identity - endpoint: internal - - service: volume - endpoint: internal + static: + api: + jobs: + - cinder-db-sync + - cinder-ks-user + - cinder-ks-endpoints + - cinder-storage-init + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + backup: + jobs: + - cinder-db-sync + - cinder-ks-user + - cinder-ks-endpoints + - cinder-storage-init + - cinder-backup-storage-init + services: + - endpoint: internal + service: identity + - endpoint: internal + service: volume + backup_storage_init: + jobs: null + bootstrap: + services: + - endpoint: internal + service: identity + - endpoint: internal + service: volume + clean: + jobs: null + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - cinder-db-init + services: + - endpoint: internal + service: oslo_db + ks_endpoints: + jobs: + - cinder-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + scheduler: + jobs: + - cinder-db-sync + - cinder-ks-user + - cinder-ks-endpoints + - cinder-storage-init + services: + - endpoint: internal + service: identity + - endpoint: internal + service: volume + storage_init: + jobs: null + tests: + services: + - endpoint: internal + service: identity + - endpoint: internal + service: volume + volume: + jobs: + - cinder-db-sync + - cinder-ks-user + - cinder-ks-endpoints + - cinder-storage-init + services: + - endpoint: internal + service: identity + - endpoint: internal + service: volume + volume_usage_audit: + jobs: + - cinder-db-sync + - cinder-ks-user + - cinder-ks-endpoints + - cinder-storage-init + services: + - endpoint: internal + service: identity + - endpoint: internal + service: volume # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/congress/templates/deployment-api.yaml b/congress/templates/deployment-api.yaml index e04532a2e3..d90285fa70 100644 --- a/congress/templates/deployment-api.yaml +++ b/congress/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $serviceAccountName := "congress-api-dep" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/congress/templates/deployment-datasource.yaml b/congress/templates/deployment-datasource.yaml index f903e61ca1..341028d790 100644 --- a/congress/templates/deployment-datasource.yaml +++ b/congress/templates/deployment-datasource.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_datasource }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.datasource }} +{{- $dependencies := .Values.dependencies.static.datasource }} {{- $serviceAccountName := "congress-datasource-dep" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/congress/templates/deployment-policy-engine.yaml b/congress/templates/deployment-policy-engine.yaml index 7a76ac853b..0bfff049ac 100644 --- a/congress/templates/deployment-policy-engine.yaml +++ b/congress/templates/deployment-policy-engine.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_policy_engine }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.policy_engine }} +{{- $dependencies := .Values.dependencies.static.policy_engine }} {{- $serviceAccountName := "congress-policy-engine-dep" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/congress/templates/job-ds-create.yaml b/congress/templates/job-ds-create.yaml index 26cea83a3d..750394cb98 100644 --- a/congress/templates/job-ds-create.yaml +++ b/congress/templates/job-ds-create.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_ds_create }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ds_create }} +{{- $dependencies := .Values.dependencies.static.ds_create }} {{- $serviceAccountName := "congress-ds-create" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/congress/templates/pod-test.yaml b/congress/templates/pod-test.yaml index 668882bd07..e81206e522 100644 --- a/congress/templates/pod-test.yaml +++ b/congress/templates/pod-test.yaml @@ -15,7 +15,7 @@ limitations under the License. */}} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.tests }} +{{- $dependencies := .Values.dependencies.static.tests }} {{- $serviceAccountName := print .Release.Name "-test" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/congress/values.yaml b/congress/values.yaml index e711defb4c..ba172c7cea 100644 --- a/congress/values.yaml +++ b/congress/values.yaml @@ -65,90 +65,91 @@ volume: size: 2Gi dependencies: - storage_init: - services: - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - congress-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - bootstrap: - jobs: - - congress-db-sync - - congress-ks-user - - congress-ks-endpoints - services: - - service: identity - endpoint: internal - - service: image - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - congress-ks-service - services: - - service: identity - endpoint: internal - api: - jobs: - - congress-db-sync - - congress-ks-user - - congress-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - datasource: - jobs: - - congress-db-sync - - congress-ks-user - - congress-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - policy_engine: - jobs: - - congress-db-sync - - congress-ks-user - - congress-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - ds_create: - jobs: - - congress-ks-endpoints - services: - - service: policy - endpoint: internal - tests: - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - - service: policy - endpoint: internal + static: + api: + jobs: + - congress-db-sync + - congress-ks-user + - congress-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + bootstrap: + jobs: + - congress-db-sync + - congress-ks-user + - congress-ks-endpoints + services: + - endpoint: internal + service: identity + - endpoint: internal + service: image + datasource: + jobs: + - congress-db-sync + - congress-ks-user + - congress-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - congress-db-init + services: + - endpoint: internal + service: oslo_db + ds_create: + jobs: + - congress-ks-endpoints + services: + - endpoint: internal + service: policy + ks_endpoints: + jobs: + - congress-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + policy_engine: + jobs: + - congress-db-sync + - congress-ks-user + - congress-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + storage_init: + services: null + tests: + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + - endpoint: internal + service: policy secrets: identity: diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml index 1824cff648..be98a76cd0 100644 --- a/etcd/templates/deployment.yaml +++ b/etcd/templates/deployment.yaml @@ -15,7 +15,7 @@ {{- if .Values.manifests.deployment }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.etcd }} +{{- $dependencies := .Values.dependencies.static.etcd }} {{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "etcd" }} {{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "etcd-bin" }} diff --git a/etcd/values.yaml b/etcd/values.yaml index 2811944abb..4c7289c554 100644 --- a/etcd/values.yaml +++ b/etcd/values.yaml @@ -29,8 +29,9 @@ labels: node_selector_value: enabled dependencies: - etcd: - jobs: null + static: + etcd: + jobs: null pod: affinity: diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index 187a616b89..dfd316358c 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_glance_api := .Values.pod.mounts.glance_api.glance_api }} {{- $mounts_glance_api_init := .Values.pod.mounts.glance_api.init_container }} diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 16bb146d4a..3c0a692808 100644 --- a/glance/templates/deployment-registry.yaml +++ b/glance/templates/deployment-registry.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_registry }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.registry }} +{{- $dependencies := .Values.dependencies.static.registry }} {{- $mounts_glance_registry := .Values.pod.mounts.glance_registry.glance_registry }} {{- $mounts_glance_registry_init := .Values.pod.mounts.glance_registry.init_container }} diff --git a/glance/templates/job-clean.yaml b/glance/templates/job-clean.yaml index 5a002010a9..a2da6f2d69 100644 --- a/glance/templates/job-clean.yaml +++ b/glance/templates/job-clean.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_clean }} {{- $envAll := . }} {{- if .Values.bootstrap.enabled }} -{{- $dependencies := .Values.dependencies.clean }} +{{- $dependencies := .Values.dependencies.static.clean }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/glance/templates/job-db-drop.yaml b/glance/templates/job-db-drop.yaml index 8de41277d4..8c65bd0c28 100644 --- a/glance/templates/job-db-drop.yaml +++ b/glance/templates/job-db-drop.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml index db4e827df5..6f79fc4298 100644 --- a/glance/templates/job-storage-init.yaml +++ b/glance/templates/job-storage-init.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_storage_init }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.storage_init }} +{{- $dependencies := .Values.dependencies.static.storage_init }} {{- $serviceAccountName := "glance-storage-init" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/glance/templates/pod-rally-test.yaml b/glance/templates/pod-rally-test.yaml index 8ca0cd62a0..e82c116745 100644 --- a/glance/templates/pod-rally-test.yaml +++ b/glance/templates/pod-rally-test.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.pod_rally_test }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.tests }} +{{- $dependencies := .Values.dependencies.static.tests }} {{- $mounts_tests := .Values.pod.mounts.glance_tests.glance_tests }} {{- $mounts_tests_init := .Values.pod.mounts.glance_tests.init_container }} diff --git a/glance/values.yaml b/glance/values.yaml index 01cde9dc29..27cf8321fc 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -303,81 +303,82 @@ volume: size: 2Gi dependencies: - clean: - jobs: null - storage_init: - services: - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - glance-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - bootstrap: - jobs: - - glance-storage-init - - glance-db-sync - - glance-ks-user - - glance-ks-endpoints - services: - - service: identity - endpoint: internal - - service: image - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - glance-ks-service - services: - - service: identity - endpoint: internal - api: - jobs: - - glance-storage-init - - glance-db-sync - - glance-ks-user - - glance-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - registry: - jobs: - - glance-storage-init - - glance-db-sync - - glance-ks-user - - glance-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - - service: image - endpoint: internal - tests: - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - - service: image - endpoint: internal + static: + api: + jobs: + - glance-storage-init + - glance-db-sync + - glance-ks-user + - glance-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + bootstrap: + jobs: + - glance-storage-init + - glance-db-sync + - glance-ks-user + - glance-ks-endpoints + services: + - endpoint: internal + service: identity + - endpoint: internal + service: image + clean: + jobs: null + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - glance-db-init + services: + - endpoint: internal + service: oslo_db + ks_endpoints: + jobs: + - glance-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + registry: + jobs: + - glance-storage-init + - glance-db-sync + - glance-ks-user + - glance-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + - endpoint: internal + service: image + storage_init: + services: null + tests: + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + - endpoint: internal + service: image # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml index 6e884294da..c929643de4 100644 --- a/gnocchi/templates/daemonset-metricd.yaml +++ b/gnocchi/templates/daemonset-metricd.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_metricd }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.metricd }} +{{- $dependencies := .Values.dependencies.static.metricd }} {{- $mounts_gnocchi_metricd := .Values.pod.mounts.gnocchi_metricd.gnocchi_metricd }} {{- $mounts_gnocchi_metricd_init := .Values.pod.mounts.gnocchi_metricd.init_container }} diff --git a/gnocchi/templates/daemonset-statsd.yaml b/gnocchi/templates/daemonset-statsd.yaml index 03b2016a44..c79aa252f7 100644 --- a/gnocchi/templates/daemonset-statsd.yaml +++ b/gnocchi/templates/daemonset-statsd.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_statsd }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.statsd }} +{{- $dependencies := .Values.dependencies.static.statsd }} {{- $mounts_gnocchi_statsd := .Values.pod.mounts.gnocchi_statsd.gnocchi_statsd }} {{- $mounts_gnocchi_statsd_init := .Values.pod.mounts.gnocchi_statsd.init_container }} diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml index e288097d05..6a093d014b 100644 --- a/gnocchi/templates/deployment-api.yaml +++ b/gnocchi/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_gnocchi_api := .Values.pod.mounts.gnocchi_api.gnocchi_api }} {{- $mounts_gnocchi_api_init := .Values.pod.mounts.gnocchi_api.init_container }} diff --git a/gnocchi/templates/job-clean.yaml b/gnocchi/templates/job-clean.yaml index 5e35ab2467..1003d796a1 100644 --- a/gnocchi/templates/job-clean.yaml +++ b/gnocchi/templates/job-clean.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_clean }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.clean }} +{{- $dependencies := .Values.dependencies.static.clean }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/gnocchi/templates/job-db-init-indexer.yaml b/gnocchi/templates/job-db-init-indexer.yaml index dfbdcc2ad7..e71bff9704 100644 --- a/gnocchi/templates/job-db-init-indexer.yaml +++ b/gnocchi/templates/job-db-init-indexer.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_init_indexer }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_init_postgresql }} +{{- $dependencies := .Values.dependencies.static.db_init_postgresql }} {{- $serviceAccountName := "gnocchi-db-init-indexer" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/gnocchi/templates/job-db-sync.yaml b/gnocchi/templates/job-db-sync.yaml index 6540c5e3bf..faf6ec7449 100644 --- a/gnocchi/templates/job-db-sync.yaml +++ b/gnocchi/templates/job-db-sync.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_sync }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_sync }} +{{- $dependencies := .Values.dependencies.static.db_sync }} {{- $serviceAccountName := "gnocchi-db-sync" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/gnocchi/templates/job-storage-init.yaml b/gnocchi/templates/job-storage-init.yaml index 449bd8e469..7eb14ed898 100644 --- a/gnocchi/templates/job-storage-init.yaml +++ b/gnocchi/templates/job-storage-init.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_storage_init }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.storage_init }} +{{- $dependencies := .Values.dependencies.static.storage_init }} {{- $serviceAccountName := "gnocchi-storage-init" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/gnocchi/templates/pod-gnocchi-test.yaml b/gnocchi/templates/pod-gnocchi-test.yaml index f0f34b2f2d..67ac81a5c6 100644 --- a/gnocchi/templates/pod-gnocchi-test.yaml +++ b/gnocchi/templates/pod-gnocchi-test.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.pod_gnocchi_test }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.tests }} +{{- $dependencies := .Values.dependencies.static.tests }} {{- $mounts_gnocchi_tests := .Values.pod.mounts.gnocchi_tests.gnocchi_tests }} {{- $mounts_gnocchi_tests_init := .Values.pod.mounts.gnocchi_tests.init_container }} diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index d532aa6cca..0ca9a2d0ad 100644 --- a/gnocchi/values.yaml +++ b/gnocchi/values.yaml @@ -53,88 +53,89 @@ network: port: 8125 dependencies: - clean: - services: - storage_init: - services: - db_init: - services: - - service: oslo_db - endpoint: internal - db_init_postgresql: - jobs: - services: - - service: oslo_db_postgresql - endpoint: internal - db_sync: - jobs: - - gnocchi-storage-init - - gnocchi-db-init - - gnocchi-db-init-indexer - services: - - service: oslo_db_postgresql - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - gnocchi-ks-service - services: - - service: identity - endpoint: internal - api: - jobs: - - gnocchi-storage-init - - gnocchi-db-sync - - gnocchi-ks-endpoints - - gnocchi-ks-service - - gnocchi-ks-user - services: - - service: identity - endpoint: internal - - service: oslo_db - endpoint: internal - statsd: - jobs: - - gnocchi-storage-init - - gnocchi-db-sync - - gnocchi-ks-user - - gnocchi-ks-service - - gnocchi-ks-endpoints - services: - - service: oslo_db_postgresql - endpoint: internal - - service: metric - endpoint: internal - metricd: - jobs: - - gnocchi-storage-init - - gnocchi-db-sync - - gnocchi-ks-user - - gnocchi-ks-service - - gnocchi-ks-endpoints - services: - - service: oslo_db_postgresql - endpoint: internal - - service: metric - endpoint: internal - tests: - jobs: - - gnocchi-storage-init - - gnocchi-db-sync - services: - - service: identity - endpoint: internal - - service: oslo_db_postgresql - endpoint: internal - - service: metric - endpoint: internal + static: + api: + jobs: + - gnocchi-storage-init + - gnocchi-db-sync + - gnocchi-ks-endpoints + - gnocchi-ks-service + - gnocchi-ks-user + services: + - endpoint: internal + service: identity + - endpoint: internal + service: oslo_db + clean: + services: null + db_init: + services: + - endpoint: internal + service: oslo_db + db_init_postgresql: + jobs: null + services: + - endpoint: internal + service: oslo_db_postgresql + db_sync: + jobs: + - gnocchi-storage-init + - gnocchi-db-init + - gnocchi-db-init-indexer + services: + - endpoint: internal + service: oslo_db_postgresql + ks_endpoints: + jobs: + - gnocchi-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + metricd: + jobs: + - gnocchi-storage-init + - gnocchi-db-sync + - gnocchi-ks-user + - gnocchi-ks-service + - gnocchi-ks-endpoints + services: + - endpoint: internal + service: oslo_db_postgresql + - endpoint: internal + service: metric + statsd: + jobs: + - gnocchi-storage-init + - gnocchi-db-sync + - gnocchi-ks-user + - gnocchi-ks-service + - gnocchi-ks-endpoints + services: + - endpoint: internal + service: oslo_db_postgresql + - endpoint: internal + service: metric + storage_init: + services: null + tests: + jobs: + - gnocchi-storage-init + - gnocchi-db-sync + services: + - endpoint: internal + service: identity + - endpoint: internal + service: oslo_db_postgresql + - endpoint: internal + service: metric pod: user: diff --git a/heat/templates/cron-job-engine-cleaner.yaml b/heat/templates/cron-job-engine-cleaner.yaml index 1bf36b92d1..1f0fa227b7 100644 --- a/heat/templates/cron-job-engine-cleaner.yaml +++ b/heat/templates/cron-job-engine-cleaner.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.cron_job_engine_cleaner }} {{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.engine_cleaner }} +{{- $dependencies := .Values.dependencies.static.engine_cleaner }} {{- $mounts_heat_engine_cleaner := .Values.pod.mounts.heat_engine_cleaner.heat_engine_cleaner }} {{- $mounts_heat_engine_cleaner_init := .Values.pod.mounts.heat_engine_cleaner.init_container }} diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index d61fb12edb..337edbcbf7 100644 --- a/heat/templates/deployment-api.yaml +++ b/heat/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_heat_api := .Values.pod.mounts.heat_api.heat_api }} {{- $mounts_heat_api_init := .Values.pod.mounts.heat_api.init_container }} diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index 77886777ee..250c472a4e 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/heat/templates/deployment-cfn.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_cfn }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.cfn }} +{{- $dependencies := .Values.dependencies.static.cfn }} {{- $mounts_heat_cfn := .Values.pod.mounts.heat_cfn.heat_cfn }} {{- $mounts_heat_cfn_init := .Values.pod.mounts.heat_cfn.init_container }} diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index c42b9b927c..f3b531a94a 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/heat/templates/deployment-cloudwatch.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_cloudwatch }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.cloudwatch }} +{{- $dependencies := .Values.dependencies.static.cloudwatch }} {{- $mounts_heat_cloudwatch := .Values.pod.mounts.heat_cloudwatch.heat_cloudwatch }} {{- $mounts_heat_cloudwatch_init := .Values.pod.mounts.heat_cloudwatch.init_container }} diff --git a/heat/templates/deployment-engine.yaml b/heat/templates/deployment-engine.yaml index ccc6a831f5..5931084aa8 100644 --- a/heat/templates/deployment-engine.yaml +++ b/heat/templates/deployment-engine.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if or ( .Values.manifests.deployment_engine ) ( .Values.manifests.statefulset_engine ) }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.engine }} +{{- $dependencies := .Values.dependencies.static.engine }} {{- $mounts_heat_engine := .Values.pod.mounts.heat_engine.heat_engine }} {{- $mounts_heat_engine_init := .Values.pod.mounts.heat_engine.init_container }} diff --git a/heat/templates/job-db-drop.yaml b/heat/templates/job-db-drop.yaml index 4595c936ed..20ee0df34b 100644 --- a/heat/templates/job-db-drop.yaml +++ b/heat/templates/job-db-drop.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/heat/templates/job-ks-user-domain.yaml b/heat/templates/job-ks-user-domain.yaml index 4228d05903..eeb27e7b02 100644 --- a/heat/templates/job-ks-user-domain.yaml +++ b/heat/templates/job-ks-user-domain.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_ks_user_domain }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ks_user }} +{{- $dependencies := .Values.dependencies.static.ks_user }} {{- $serviceAccountName := "heat-ks-user-domain" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/heat/templates/job-trusts.yaml b/heat/templates/job-trusts.yaml index c31c4f5ece..46b09f74b0 100644 --- a/heat/templates/job-trusts.yaml +++ b/heat/templates/job-trusts.yaml @@ -15,7 +15,7 @@ limitations under the License. */}} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.trusts }} +{{- $dependencies := .Values.dependencies.static.trusts }} {{- $mounts_heat_trusts := .Values.pod.mounts.heat_trusts.heat_trusts }} {{- $mounts_heat_trusts_init := .Values.pod.mounts.heat_trusts.init_container }} diff --git a/heat/values.yaml b/heat/values.yaml index 9b558f2f4e..2e4a6802e5 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -276,102 +276,103 @@ bootstrap: openstack token issue dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - heat-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - heat-ks-service - services: - - service: identity - endpoint: internal - trusts: - jobs: - - heat-ks-user - - heat-trustee-ks-user - - heat-domain-ks-user - services: - - service: identity - endpoint: internal - api: - jobs: - - heat-db-sync - - heat-ks-user - - heat-trustee-ks-user - - heat-domain-ks-user - - heat-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - cfn: - jobs: - - heat-db-sync - - heat-ks-user - - heat-trustee-ks-user - - heat-domain-ks-user - - heat-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - cloudwatch: - jobs: - - heat-db-sync - - heat-ks-user - - heat-trustee-ks-user - - heat-domain-ks-user - - heat-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - engine: - jobs: - - heat-db-sync - - heat-ks-user - - heat-trustee-ks-user - - heat-domain-ks-user - - heat-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - engine_cleaner: - jobs: - - heat-db-sync - - heat-ks-user - - heat-trustee-ks-user - - heat-domain-ks-user - - heat-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal + static: + api: + jobs: + - heat-db-sync + - heat-ks-user + - heat-trustee-ks-user + - heat-domain-ks-user + - heat-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + cfn: + jobs: + - heat-db-sync + - heat-ks-user + - heat-trustee-ks-user + - heat-domain-ks-user + - heat-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + cloudwatch: + jobs: + - heat-db-sync + - heat-ks-user + - heat-trustee-ks-user + - heat-domain-ks-user + - heat-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - heat-db-init + services: + - endpoint: internal + service: oslo_db + engine: + jobs: + - heat-db-sync + - heat-ks-user + - heat-trustee-ks-user + - heat-domain-ks-user + - heat-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + engine_cleaner: + jobs: + - heat-db-sync + - heat-ks-user + - heat-trustee-ks-user + - heat-domain-ks-user + - heat-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + ks_endpoints: + jobs: + - heat-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + trusts: + jobs: + - heat-ks-user + - heat-trustee-ks-user + - heat-domain-ks-user + services: + - endpoint: internal + service: identity # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/helm-toolkit/templates/manifests/_job-bootstrap.yaml b/helm-toolkit/templates/manifests/_job-bootstrap.yaml index 086fc2370d..d820f30457 100644 --- a/helm-toolkit/templates/manifests/_job-bootstrap.yaml +++ b/helm-toolkit/templates/manifests/_job-bootstrap.yaml @@ -23,7 +23,7 @@ limitations under the License. {{- $envAll := index . "envAll" -}} {{- $serviceName := index . "serviceName" -}} {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}} -{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.bootstrap -}} +{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.static.bootstrap -}} {{- $podVolMounts := index . "podVolMounts" | default false -}} {{- $podVols := index . "podVols" | default false -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl index 0e55ebabfa..c325ccf920 100644 --- a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl @@ -28,7 +28,7 @@ limitations under the License. {{- $envAll := index . "envAll" -}} {{- $serviceName := index . "serviceName" -}} {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}} -{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.db_init -}} +{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.static.db_init -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} {{- $dbToInit := index . "dbToInit" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}} diff --git a/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl index 42e4bbf4a0..9ce4762681 100644 --- a/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl @@ -23,7 +23,7 @@ limitations under the License. {{- $envAll := index . "envAll" -}} {{- $serviceName := index . "serviceName" -}} {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}} -{{- $dependencies := $envAll.Values.dependencies.db_sync }} +{{- $dependencies := $envAll.Values.dependencies.static.db_sync }} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} {{- $podVolMounts := index . "podVolMounts" | default false -}} diff --git a/helm-toolkit/templates/manifests/_job-ks-endpoints.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-endpoints.yaml.tpl index 99830262ae..3038161491 100644 --- a/helm-toolkit/templates/manifests/_job-ks-endpoints.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-endpoints.yaml.tpl @@ -24,7 +24,7 @@ limitations under the License. {{- $serviceName := index . "serviceName" -}} {{- $serviceTypes := index . "serviceTypes" -}} {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}} -{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.ks_endpoints -}} +{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.static.ks_endpoints -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $serviceNamePretty := $serviceName | replace "_" "-" -}} diff --git a/helm-toolkit/templates/manifests/_job-ks-service.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-service.yaml.tpl index 63f3bd015e..9a7c4e9322 100644 --- a/helm-toolkit/templates/manifests/_job-ks-service.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-service.yaml.tpl @@ -24,7 +24,7 @@ limitations under the License. {{- $serviceName := index . "serviceName" -}} {{- $serviceTypes := index . "serviceTypes" -}} {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}} -{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.ks_service -}} +{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.static.ks_service -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $serviceNamePretty := $serviceName | replace "_" "-" -}} diff --git a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl index 49e11f220d..dce11eb213 100644 --- a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl @@ -23,7 +23,7 @@ limitations under the License. {{- $envAll := index . "envAll" -}} {{- $serviceName := index . "serviceName" -}} {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}} -{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.ks_user -}} +{{- $dependencies := index . "dependencies" | default $envAll.Values.dependencies.static.ks_user -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $serviceUser := index . "serviceUser" | default $serviceName -}} {{- $serviceUserPretty := $serviceUser | replace "_" "-" -}} diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index fbe63ca80e..ba35b441cc 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.dashboard }} +{{- $dependencies := .Values.dependencies.static.dashboard }} {{- $mounts_horizon := .Values.pod.mounts.horizon.horizon }} {{- $mounts_horizon_init := .Values.pod.mounts.horizon.init_container }} diff --git a/horizon/templates/job-db-drop.yaml b/horizon/templates/job-db-drop.yaml index c602834123..304ce33e9a 100644 --- a/horizon/templates/job-db-drop.yaml +++ b/horizon/templates/job-db-drop.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $mounts_horizon_db_init := .Values.pod.mounts.horizon_db_init.horizon_db_init }} {{- $mounts_horizon_db_init_init := .Values.pod.mounts.horizon_db_init.init_container }} diff --git a/horizon/templates/job-db-sync.yaml b/horizon/templates/job-db-sync.yaml index bfeb5312c4..c417b72769 100644 --- a/horizon/templates/job-db-sync.yaml +++ b/horizon/templates/job-db-sync.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_sync }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_sync }} +{{- $dependencies := .Values.dependencies.static.db_sync }} {{- $mounts_horizon_db_sync := .Values.pod.mounts.horizon_db_sync.horizon_db_sync }} {{- $mounts_horizon_db_sync_init := .Values.pod.mounts.horizon_db_sync.init_container }} diff --git a/horizon/values.yaml b/horizon/values.yaml index aab86f780c..84f3d6bb62 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -1129,36 +1129,37 @@ conf: os_compute_api:os-server-external-events:discoverable: "@" dependencies: - dashboard: - jobs: - - horizon-db-sync - services: - - service: oslo_cache - endpoint: internal - - service: oslo_db - endpoint: internal - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - horizon-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal + static: + dashboard: + jobs: + - horizon-db-sync + services: + - endpoint: internal + service: oslo_cache + - endpoint: internal + service: oslo_db + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - horizon-db-init + services: + - endpoint: internal + service: oslo_db pod: affinity: - anti: - type: - default: preferredDuringSchedulingIgnoredDuringExecution - topologyKey: - default: kubernetes.io/hostname + anti: + type: + default: preferredDuringSchedulingIgnoredDuringExecution + topologyKey: + default: kubernetes.io/hostname mounts: horizon_db_init: init_container: null diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml index a08781ba07..d6a467ee54 100644 --- a/ingress/templates/deployment-error.yaml +++ b/ingress/templates/deployment-error.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_error }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.error_pages }} +{{- $dependencies := .Values.dependencies.static.error_pages }} {{- $serviceAccountName := "ingress-error-pages"}} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index 9286cc9cd6..b55f2e3b73 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_ingress }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ingress }} +{{- $dependencies := .Values.dependencies.static.ingress }} {{- if empty .Values.conf.controller.INGRESS_CLASS -}} {{- if eq .Values.deployment.mode "cluster" }} diff --git a/ingress/values.yaml b/ingress/values.yaml index 5b14b958c5..7511532009 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -95,10 +95,11 @@ network: external_policy_local: false dependencies: - error_pages: - jobs: null - ingress: - jobs: null + static: + error_pages: + jobs: null + ingress: + jobs: null monitoring: prometheus: diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml index 32486060d4..2ee04c9471 100644 --- a/ironic/templates/deployment-api.yaml +++ b/ironic/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_ironic_api := .Values.pod.mounts.ironic_api.ironic_api }} {{- $mounts_ironic_api_init := .Values.pod.mounts.ironic_api.init_container }} diff --git a/ironic/templates/job-manage-cleaning-network.yaml b/ironic/templates/job-manage-cleaning-network.yaml index 794465087b..5c13f8386c 100644 --- a/ironic/templates/job-manage-cleaning-network.yaml +++ b/ironic/templates/job-manage-cleaning-network.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_manage_cleaning_network }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.manage_cleaning_network }} +{{- $dependencies := .Values.dependencies.static.manage_cleaning_network }} {{- $serviceAccountName := "ironic-manage-cleaning-network" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml index 82c80cb007..75d28acd3c 100644 --- a/ironic/templates/statefulset-conductor.yaml +++ b/ironic/templates/statefulset-conductor.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset_conductor }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.conductor }} +{{- $dependencies := .Values.dependencies.static.conductor }} {{- $mounts_ironic_conductor := .Values.pod.mounts.ironic_conductor.ironic_conductor }} {{- $mounts_ironic_conductor_init := .Values.pod.mounts.ironic_conductor.init_container }} diff --git a/ironic/values.yaml b/ironic/values.yaml index 2107002482..1d608d5af8 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -148,70 +148,71 @@ bootstrap: ) dependencies: - manage_cleaning_network: - services: - - service: network - endpoint: internal - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - ironic-db-init - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - ironic-ks-service - services: - - service: identity - endpoint: internal - bootstrap: - jobs: - - ironic-db-sync - - ironic-ks-user - - ironic-ks-endpoints - services: - - service: identity - endpoint: internal - - service: image - endpoint: internal - - service: baremetal - endpoint: internal - api: - jobs: - - ironic-db-sync - - ironic-ks-user - - ironic-ks-endpoints - - ironic-manage-cleaning-network - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - conductor: - jobs: - - ironic-db-sync - - ironic-ks-user - - ironic-ks-endpoints - - ironic-manage-cleaning-network - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - - service: baremetal - endpoint: internal + static: + api: + jobs: + - ironic-db-sync + - ironic-ks-user + - ironic-ks-endpoints + - ironic-manage-cleaning-network + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + bootstrap: + jobs: + - ironic-db-sync + - ironic-ks-user + - ironic-ks-endpoints + services: + - endpoint: internal + service: identity + - endpoint: internal + service: image + - endpoint: internal + service: baremetal + conductor: + jobs: + - ironic-db-sync + - ironic-ks-user + - ironic-ks-endpoints + - ironic-manage-cleaning-network + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + - endpoint: internal + service: baremetal + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - ironic-db-init + services: + - endpoint: internal + service: oslo_db + ks_endpoints: + jobs: + - ironic-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + manage_cleaning_network: + services: + - endpoint: internal + service: network # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml index 6ad3f7f5ca..9316b02e04 100644 --- a/keystone/templates/cron-job-credential-rotate.yaml +++ b/keystone/templates/cron-job-credential-rotate.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.cron_credential_rotate }} {{- if .Capabilities.APIVersions.Has "batch/v2alpha1"}} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.credential_rotate }} +{{- $dependencies := .Values.dependencies.static.credential_rotate }} {{- $mounts_keystone_credential_rotate := .Values.pod.mounts.keystone_credential_rotate.keystone_credential_rotate }} {{- $mounts_keystone_credential_rotate_init := .Values.pod.mounts.keystone_credential_rotate.init_container }} diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml index d56709c85e..4737662bf7 100644 --- a/keystone/templates/cron-job-fernet-rotate.yaml +++ b/keystone/templates/cron-job-fernet-rotate.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.cron_fernet_rotate }} {{- if and (eq .Values.conf.keystone.token.provider "fernet") (.Capabilities.APIVersions.Has "batch/v2alpha1") }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.fernet_rotate }} +{{- $dependencies := .Values.dependencies.static.fernet_rotate }} {{- $mounts_keystone_fernet_rotate := .Values.pod.mounts.keystone_fernet_rotate.keystone_fernet_rotate }} {{- $mounts_keystone_fernet_rotate_init := .Values.pod.mounts.keystone_fernet_rotate.init_container }} diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml index 54c6f7727a..91003b5532 100644 --- a/keystone/templates/deployment-api.yaml +++ b/keystone/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_keystone_api := .Values.pod.mounts.keystone_api.keystone_api }} {{- $mounts_keystone_api_init := .Values.pod.mounts.keystone_api.init_container }} diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml index c8664e5682..8dcc7aa892 100644 --- a/keystone/templates/job-credential-setup.yaml +++ b/keystone/templates/job-credential-setup.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_credential_setup }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.credential_setup }} +{{- $dependencies := .Values.dependencies.static.credential_setup }} {{- $mounts_keystone_credential_setup := .Values.pod.mounts.keystone_credential_setup.keystone_credential_setup }} {{- $mounts_keystone_credential_setup_init := .Values.pod.mounts.keystone_credential_setup.init_container }} diff --git a/keystone/templates/job-db-drop.yaml b/keystone/templates/job-db-drop.yaml index 5678f057c6..a9039af124 100644 --- a/keystone/templates/job-db-drop.yaml +++ b/keystone/templates/job-db-drop.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $mounts_keystone_db_init := .Values.pod.mounts.keystone_db_init.keystone_db_init }} {{- $mounts_keystone_db_init_init := .Values.pod.mounts.keystone_db_init.init_container }} diff --git a/keystone/templates/job-domain-manage.yaml b/keystone/templates/job-domain-manage.yaml index 86274170d2..d6f51f34f7 100644 --- a/keystone/templates/job-domain-manage.yaml +++ b/keystone/templates/job-domain-manage.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_domain_manage }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.domain_manage }} +{{- $dependencies := .Values.dependencies.static.domain_manage }} {{- $mounts_keystone_domain_manage := .Values.pod.mounts.keystone_domain_manage.keystone_domain_manage }} {{- $mounts_keystone_domain_manage_init := .Values.pod.mounts.keystone_domain_manage.init_container }} diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml index 1f860b6c4d..004f2965b5 100644 --- a/keystone/templates/job-fernet-setup.yaml +++ b/keystone/templates/job-fernet-setup.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_fernet_setup }} {{- if eq .Values.conf.keystone.token.provider "fernet" }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.fernet_setup }} +{{- $dependencies := .Values.dependencies.static.fernet_setup }} {{- $mounts_keystone_fernet_setup := .Values.pod.mounts.keystone_fernet_setup.keystone_fernet_setup }} {{- $mounts_keystone_fernet_setup_init := .Values.pod.mounts.keystone_fernet_setup.init_container }} diff --git a/keystone/templates/pod-rally-test.yaml b/keystone/templates/pod-rally-test.yaml index 6ec89c1588..efea96b764 100644 --- a/keystone/templates/pod-rally-test.yaml +++ b/keystone/templates/pod-rally-test.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.pod_rally_test }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.tests }} +{{- $dependencies := .Values.dependencies.static.tests }} {{- $mounts_tests := .Values.pod.mounts.keystone_tests.keystone_tests }} {{- $mounts_tests_init := .Values.pod.mounts.keystone_tests.init_container }} diff --git a/keystone/values.yaml b/keystone/values.yaml index 34660bfd08..254cc6f07d 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -74,56 +74,55 @@ network: port: 30357 dependencies: - api: - jobs: - - keystone-db-sync - - keystone-credential-setup - # Comment line below when not running fernet tokens. - - keystone-fernet-setup - services: - - service: oslo_cache - endpoint: internal - - service: oslo_db - endpoint: internal - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - keystone-db-init - - keystone-credential-setup - # Comment line below when not running fernet tokens. - - keystone-fernet-setup - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - fernet_setup: - fernet_rotate: - jobs: - - keystone-fernet-setup - credential_setup: - credential_rotate: - jobs: - - keystone-credential-setup - tests: - services: - - service: identity - endpoint: internal - bootstrap: - services: - - service: identity - endpoint: internal - jobs: - - keystone-domain-manage - domain_manage: - services: - - service: identity - endpoint: internal + static: + api: + jobs: + - keystone-db-sync + - keystone-credential-setup + - keystone-fernet-setup + services: + - endpoint: internal + service: oslo_cache + - endpoint: internal + service: oslo_db + bootstrap: + jobs: + - keystone-domain-manage + services: + - endpoint: internal + service: identity + credential_rotate: + jobs: + - keystone-credential-setup + credential_setup: null + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - keystone-db-init + - keystone-credential-setup + - keystone-fernet-setup + services: + - endpoint: internal + service: oslo_db + domain_manage: + services: + - endpoint: internal + service: identity + fernet_rotate: + jobs: + - keystone-fernet-setup + fernet_setup: null + tests: + services: + - endpoint: internal + service: identity pod: affinity: diff --git a/ldap/templates/statefulset.yaml b/ldap/templates/statefulset.yaml index efe052bfab..9720840d21 100644 --- a/ldap/templates/statefulset.yaml +++ b/ldap/templates/statefulset.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ldap }} +{{- $dependencies := .Values.dependencies.static.ldap }} {{- $serviceAccountName := "ldap" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/ldap/values.yaml b/ldap/values.yaml index 431cfa8419..ce90d53e46 100644 --- a/ldap/values.yaml +++ b/ldap/values.yaml @@ -41,8 +41,9 @@ images: pull_policy: IfNotPresent dependencies: - ldap: - jobs: null + static: + ldap: + jobs: null storage: pvc: diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml index db02a3a5df..b861400e45 100644 --- a/libvirt/templates/daemonset-libvirt.yaml +++ b/libvirt/templates/daemonset-libvirt.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_libvirt }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.libvirt }} +{{- $dependencies := .Values.dependencies.static.libvirt }} {{- $mounts_libvirt := .Values.pod.mounts.libvirt.libvirt }} {{- $mounts_libvirt_init := .Values.pod.mounts.libvirt.init_container }} diff --git a/libvirt/values.yaml b/libvirt/values.yaml index af43ad28ee..430dd3cc2b 100644 --- a/libvirt/values.yaml +++ b/libvirt/values.yaml @@ -81,7 +81,8 @@ pod: cpu: "2000m" dependencies: - libvirt: null + static: + libvirt: null manifests: configmap_bin: true diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index 63c4edb294..b1bc9665a6 100644 --- a/magnum/templates/deployment-api.yaml +++ b/magnum/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_magnum_api := .Values.pod.mounts.magnum_api.magnum_api }} {{- $mounts_magnum_api_init := .Values.pod.mounts.magnum_api.init_container }} diff --git a/magnum/templates/job-db-drop.yaml b/magnum/templates/job-db-drop.yaml index d4bf69c68e..f7615b5f5f 100644 --- a/magnum/templates/job-db-drop.yaml +++ b/magnum/templates/job-db-drop.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml index 62589c59fc..4213ccb87b 100644 --- a/magnum/templates/statefulset-conductor.yaml +++ b/magnum/templates/statefulset-conductor.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset_conductor }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.conductor }} +{{- $dependencies := .Values.dependencies.static.conductor }} {{- $mounts_magnum_conductor := .Values.pod.mounts.magnum_conductor.magnum_conductor }} {{- $mounts_magnum_conductor_init := .Values.pod.mounts.magnum_conductor.init_container }} diff --git a/magnum/values.yaml b/magnum/values.yaml index d22f67ba75..6f4f06779c 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -137,54 +137,55 @@ bootstrap: openstack token issue dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - magnum-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - magnum-ks-service - services: - - service: identity - endpoint: internal - api: - jobs: - - magnum-db-sync - - magnum-ks-user - - magnum-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - conductor: - jobs: - - magnum-db-sync - - magnum-ks-user - - magnum-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal + static: + api: + jobs: + - magnum-db-sync + - magnum-ks-user + - magnum-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + conductor: + jobs: + - magnum-db-sync + - magnum-ks-user + - magnum-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - magnum-db-init + services: + - endpoint: internal + service: oslo_db + ks_endpoints: + jobs: + - magnum-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml index 72f4492402..2ea9199f1b 100644 --- a/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/mariadb/templates/monitoring/prometheus/exporter-deployment.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.prometheus_mysql_exporter }} +{{- $dependencies := .Values.dependencies.static.prometheus_mysql_exporter }} {{- $serviceAccountName := "prometheus-mysql-exporter"}} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml index 64b2eb14b5..70ae460b80 100644 --- a/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml +++ b/mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.monitoring.prometheus.job_user_create .Values.monitoring.prometheus.enabled }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.prometheus_create_mysql_user }} +{{- $dependencies := .Values.dependencies.static.prometheus_create_mysql_user }} {{- $serviceAccountName := "exporter-create-sql-user" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml index 9cf29390b3..62c02083cd 100644 --- a/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.mariadb }} +{{- $dependencies := .Values.dependencies.static.mariadb }} {{- $serviceAccountName := "mariadb" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/mariadb/values.yaml b/mariadb/values.yaml index 64e8404616..b73cb45688 100644 --- a/mariadb/values.yaml +++ b/mariadb/values.yaml @@ -86,25 +86,26 @@ pod: cpu: "100m" dependencies: - mariadb: - jobs: null - services: null - prometheus_mysql_exporter: - services: - - service: oslo_db - endpoint: internal - jobs: - - exporter-create-sql-user - prometheus_mysql_exporter_tests: - services: - - service: prometheus_mysql_exporter - endpoint: internal - - service: monitoring - endpoint: internal - prometheus_create_mysql_user: - services: - - service: oslo_db - endpoint: internal + static: + mariadb: + jobs: null + services: null + prometheus_create_mysql_user: + services: + - endpoint: internal + service: oslo_db + prometheus_mysql_exporter: + jobs: + - exporter-create-sql-user + services: + - endpoint: internal + service: oslo_db + prometheus_mysql_exporter_tests: + services: + - endpoint: internal + service: prometheus_mysql_exporter + - endpoint: internal + service: monitoring force_bootstrap: false diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index 48a3ccbaba..7a0d072d1e 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.memcached }} +{{- $dependencies := .Values.dependencies.static.memcached }} {{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "memcached" }} {{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "memcached-bin" }} diff --git a/memcached/values.yaml b/memcached/values.yaml index 00bc84be20..4065ea63cf 100644 --- a/memcached/values.yaml +++ b/memcached/values.yaml @@ -25,8 +25,9 @@ conf: memory: 1024 dependencies: - memcached: - jobs: null + static: + memcached: + jobs: null endpoints: cluster_domain_suffix: cluster.local diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index 5c2a696454..22dc3e39fe 100644 --- a/mistral/templates/deployment-api.yaml +++ b/mistral/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_mistral_api := .Values.pod.mounts.mistral_api.mistral_api }} {{- $mounts_mistral_api_init := .Values.pod.mounts.mistral_api.init_container }} diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index 2b1447c484..0d8430e26f 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/mistral/templates/deployment-executor.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_executor }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.executor }} +{{- $dependencies := .Values.dependencies.static.executor }} {{- $mounts_mistral_executor := .Values.pod.mounts.mistral_executor.mistral_executor }} {{- $mounts_mistral_executor_init := .Values.pod.mounts.mistral_executor.init_container }} diff --git a/mistral/templates/job-db-drop.yaml b/mistral/templates/job-db-drop.yaml index c1dff16708..8783791a69 100644 --- a/mistral/templates/job-db-drop.yaml +++ b/mistral/templates/job-db-drop.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index 261df7e001..038677eee4 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/mistral/templates/statefulset-engine.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset_engine }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.engine }} +{{- $dependencies := .Values.dependencies.static.engine }} {{- $mounts_mistral_engine := .Values.pod.mounts.mistral_engine.mistral_engine }} {{- $mounts_mistral_engine_init := .Values.pod.mounts.mistral_engine.init_container }} diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index 07180b8097..5a677d27a3 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/mistral/templates/statefulset-event-engine.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset_event_engine }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.event_engine }} +{{- $dependencies := .Values.dependencies.static.event_engine }} {{- $mounts_mistral_event_engine := .Values.pod.mounts.mistral_event_engine.mistral_event_engine }} {{- $mounts_mistral_event_engine_init := .Values.pod.mounts.mistral_event_engine.init_container }} diff --git a/mistral/values.yaml b/mistral/values.yaml index 39126dc525..34a8a0cdc4 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -70,74 +70,75 @@ bootstrap: openstack token issue dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - mistral-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - mistral-ks-service - services: - - service: identity - endpoint: internal - api: - jobs: - - mistral-db-sync - - mistral-ks-user - - mistral-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - engine: - jobs: - - mistral-db-sync - - mistral-ks-user - - mistral-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - event_engine: - jobs: - - mistral-db-sync - - mistral-ks-user - - mistral-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - executor: - jobs: - - mistral-db-sync - - mistral-ks-user - - mistral-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal + static: + api: + jobs: + - mistral-db-sync + - mistral-ks-user + - mistral-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - mistral-db-init + services: + - endpoint: internal + service: oslo_db + engine: + jobs: + - mistral-db-sync + - mistral-ks-user + - mistral-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + event_engine: + jobs: + - mistral-db-sync + - mistral-ks-user + - mistral-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + executor: + jobs: + - mistral-db-sync + - mistral-ks-user + - mistral-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + ks_endpoints: + jobs: + - mistral-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/mongodb/templates/statefulset.yaml b/mongodb/templates/statefulset.yaml index 43b889e083..d324570ffa 100644 --- a/mongodb/templates/statefulset.yaml +++ b/mongodb/templates/statefulset.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.mongodb }} +{{- $dependencies := .Values.dependencies.static.mongodb }} {{- $serviceAccountName := "mongodb" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/mongodb/values.yaml b/mongodb/values.yaml index 3f3b46a2fd..37db16dadb 100644 --- a/mongodb/values.yaml +++ b/mongodb/values.yaml @@ -75,8 +75,9 @@ endpoints: default: 27017 dependencies: - mongodb: - jobs: null + static: + mongodb: + jobs: null manifests: configmap_bin: true diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index bffd449840..7117ceb187 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/neutron/templates/daemonset-dhcp-agent.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_dhcp_agent }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.dhcp }} +{{- $dependencies := .Values.dependencies.static.dhcp }} {{- $mounts_neutron_dhcp_agent := .Values.pod.mounts.neutron_dhcp_agent.neutron_dhcp_agent }} {{- $mounts_neutron_dhcp_agent_init := .Values.pod.mounts.neutron_dhcp_agent.init_container }} diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index 1d1e410cd7..86d303571d 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/neutron/templates/daemonset-l3-agent.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_l3_agent }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.l3 }} +{{- $dependencies := .Values.dependencies.static.l3 }} {{- $mounts_neutron_l3_agent := .Values.pod.mounts.neutron_l3_agent.neutron_l3_agent }} {{- $mounts_neutron_l3_agent_init := .Values.pod.mounts.neutron_l3_agent.init_container }} diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemonset-lb-agent.yaml index 74a8132773..65b174cef7 100644 --- a/neutron/templates/daemonset-lb-agent.yaml +++ b/neutron/templates/daemonset-lb-agent.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_lb_agent }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.lb_agent }} +{{- $dependencies := .Values.dependencies.static.lb_agent }} {{- $mounts_neutron_lb_agent := .Values.pod.mounts.neutron_lb_agent.neutron_lb_agent }} {{- $mounts_neutron_lb_agent_init := .Values.pod.mounts.neutron_lb_agent.init_container }} diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index 33e5a41917..bdfe394bdc 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/neutron/templates/daemonset-metadata-agent.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_metadata_agent }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.metadata }} +{{- $dependencies := .Values.dependencies.static.metadata }} {{- $mounts_neutron_metadata_agent := .Values.pod.mounts.neutron_metadata_agent.neutron_metadata_agent }} {{- $mounts_neutron_metadata_agent_init := .Values.pod.mounts.neutron_metadata_agent.init_container }} diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index cbb5b84307..b8944e0cdc 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/neutron/templates/daemonset-ovs-agent.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_ovs_agent }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ovs_agent }} +{{- $dependencies := .Values.dependencies.static.ovs_agent }} {{- $mounts_neutron_ovs_agent := .Values.pod.mounts.neutron_ovs_agent.neutron_ovs_agent }} {{- $mounts_neutron_ovs_agent_init := .Values.pod.mounts.neutron_ovs_agent.init_container }} diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index 7dab930e1c..8ca5b00915 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_server }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.server }} +{{- $dependencies := .Values.dependencies.static.server }} {{- $mounts_neutron_server := .Values.pod.mounts.neutron_server.neutron_server }} {{- $mounts_neutron_server_init := .Values.pod.mounts.neutron_server.init_container }} diff --git a/neutron/templates/job-db-drop.yaml b/neutron/templates/job-db-drop.yaml index f91d07abc1..8492c849bf 100644 --- a/neutron/templates/job-db-drop.yaml +++ b/neutron/templates/job-db-drop.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml index c027bb9e61..3900427a42 100644 --- a/neutron/templates/pod-rally-test.yaml +++ b/neutron/templates/pod-rally-test.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.pod_rally_test }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.tests }} +{{- $dependencies := .Values.dependencies.static.tests }} {{- $mounts_tests := .Values.pod.mounts.neutron_tests.neutron_tests }} {{- $mounts_tests_init := .Values.pod.mounts.neutron_tests.init_container }} diff --git a/neutron/values.yaml b/neutron/values.yaml index 028a0f6e4c..00a209b476 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -112,121 +112,122 @@ bootstrap: openstack token issue dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - neutron-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - neutron-ks-service - services: - - service: identity - endpoint: internal - server: - jobs: - - neutron-db-sync - - neutron-ks-user - - neutron-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: oslo_messaging - endpoint: internal - - service: oslo_cache - endpoint: internal - - service: identity - endpoint: internal - dhcp: - services: - - service: oslo_messaging - endpoint: internal - - service: network - endpoint: internal - - service: compute - endpoint: internal - daemonset: - # this should be set to corresponding neutron L2 agent - - neutron-ovs-agent - metadata: - services: - - service: oslo_messaging - endpoint: internal - - service: network - endpoint: internal - - service: compute - endpoint: internal - - service: compute_metadata - endpoint: public - daemonset: - # this should be set to corresponding neutron L2 agent - - neutron-ovs-agent - ovs_agent: - services: - - service: oslo_messaging - endpoint: internal - - service: network - endpoint: internal - daemonset: - - openvswitch-vswitchd - - openvswitch-db - lb_agent: - services: - - service: oslo_messaging - endpoint: internal - - service: network - endpoint: internal - l3: - services: - - service: oslo_messaging - endpoint: internal - - service: network - endpoint: internal - - service: compute - endpoint: internal - daemonset: - # this should be set to corresponding neutron L2 agent - - neutron-ovs-agent - tests: - services: - - service: network - endpoint: internal - - service: compute - endpoint: internal - bootstrap: - services: - - service: network - endpoint: internal - - service: compute - endpoint: internal + static: + bootstrap: + services: + - endpoint: internal + service: network + - endpoint: internal + service: compute + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - neutron-db-init + services: + - endpoint: internal + service: oslo_db + dhcp: + daemonset: + # this should be set to corresponding neutron L2 agent + - neutron-ovs-agent + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: network + - endpoint: internal + service: compute + ks_endpoints: + jobs: + - neutron-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + l3: + daemonset: + # this should be set to corresponding neutron L2 agent + - neutron-ovs-agent + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: network + - endpoint: internal + service: compute + lb_agent: + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: network + metadata: + daemonset: + # this should be set to corresponding neutron L2 agent + - neutron-ovs-agent + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: network + - endpoint: internal + service: compute + - endpoint: public + service: compute_metadata + ovs_agent: + daemonset: + - openvswitch-vswitchd + - openvswitch-db + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: network + server: + jobs: + - neutron-db-sync + - neutron-ks-user + - neutron-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: oslo_cache + - endpoint: internal + service: identity + tests: + services: + - endpoint: internal + service: network + - endpoint: internal + service: compute pod: user: neutron: uid: 42424 affinity: - anti: - type: - default: preferredDuringSchedulingIgnoredDuringExecution - topologyKey: - default: kubernetes.io/hostname + anti: + type: + default: preferredDuringSchedulingIgnoredDuringExecution + topologyKey: + default: kubernetes.io/hostname mounts: neutron_server: init_container: null diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index 501428b24c..e82a25c474 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -300,7 +300,7 @@ spec: {{- $daemonset := "compute" }} {{- $configMapName := "nova-etc" }} {{- $serviceAccountName := "nova-compute" }} -{{- $dependencies := .Values.dependencies.compute }} +{{- $dependencies := .Values.dependencies.static.compute }} {{ tuple . $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName $dependencies . | include "nova.compute.daemonset" | toString | fromYaml }} {{- $configmap_yaml := "nova.configmap.etc" }} diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml index e3e85add7d..1366b8d650 100644 --- a/nova/templates/deployment-api-metadata.yaml +++ b/nova/templates/deployment-api-metadata.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api_metadata }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_nova_api_metadata := .Values.pod.mounts.nova_api_metadata.nova_api_metadata }} {{- $mounts_nova_api_metadata_init := .Values.pod.mounts.nova_api_metadata.init_container }} diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml index 29fe83491d..b87daece4f 100644 --- a/nova/templates/deployment-api-osapi.yaml +++ b/nova/templates/deployment-api-osapi.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api_osapi }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_nova_api_osapi := .Values.pod.mounts.nova_api_osapi.nova_api_osapi }} {{- $mounts_nova_api_osapi_init := .Values.pod.mounts.nova_api_osapi.init_container }} diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml index 3cc89b1b76..f4e6e228c8 100644 --- a/nova/templates/deployment-conductor.yaml +++ b/nova/templates/deployment-conductor.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_conductor }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.conductor }} +{{- $dependencies := .Values.dependencies.static.conductor }} {{- $mounts_nova_conductor := .Values.pod.mounts.nova_conductor.nova_conductor }} {{- $mounts_nova_conductor_init := .Values.pod.mounts.nova_conductor.init_container }} diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml index 331d54ffd6..651ebcc407 100644 --- a/nova/templates/deployment-consoleauth.yaml +++ b/nova/templates/deployment-consoleauth.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_consoleauth }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.consoleauth }} +{{- $dependencies := .Values.dependencies.static.consoleauth }} {{- $mounts_nova_consoleauth := .Values.pod.mounts.nova_consoleauth.nova_conductor }} {{- $mounts_nova_consoleauth_init := .Values.pod.mounts.nova_consoleauth.init_container }} diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml index aa4162ea93..878bf2ee3f 100644 --- a/nova/templates/deployment-novncproxy.yaml +++ b/nova/templates/deployment-novncproxy.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.deployment_novncproxy }} {{- $envAll := . }} {{ if eq .Values.console.console_kind "novnc" }} -{{- $dependencies := .Values.dependencies.novncproxy }} +{{- $dependencies := .Values.dependencies.static.novncproxy }} {{- $mounts_nova_novncproxy := .Values.pod.mounts.nova_novncproxy.nova_novncproxy }} {{- $mounts_nova_novncproxy_init := .Values.pod.mounts.nova_novncproxy.init_novncproxy }} diff --git a/nova/templates/deployment-placement.yaml b/nova/templates/deployment-placement.yaml index 8b73d7ef5d..a72ff27dd3 100644 --- a/nova/templates/deployment-placement.yaml +++ b/nova/templates/deployment-placement.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_placement }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_nova_placement := .Values.pod.mounts.nova_placement.nova_placement }} {{- $mounts_nova_placement_init := .Values.pod.mounts.nova_placement.init_container }} diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml index a383f77f37..01eaefa89c 100644 --- a/nova/templates/deployment-scheduler.yaml +++ b/nova/templates/deployment-scheduler.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_scheduler }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.scheduler }} +{{- $dependencies := .Values.dependencies.static.scheduler }} {{- $mounts_nova_scheduler := .Values.pod.mounts.nova_scheduler.nova_conductor }} {{- $mounts_nova_scheduler_init := .Values.pod.mounts.nova_scheduler.init_container }} diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml index fd1d68f5a7..2155cd1877 100644 --- a/nova/templates/deployment-spiceproxy.yaml +++ b/nova/templates/deployment-spiceproxy.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.deployment_spiceproxy }} {{- $envAll := . }} {{ if eq .Values.console.console_kind "spice" }} -{{- $dependencies := .Values.dependencies.spiceproxy }} +{{- $dependencies := .Values.dependencies.static.spiceproxy }} {{- $mounts_nova_spiceproxy := .Values.pod.mounts.nova_spiceproxy.nova_spiceproxy }} {{- $mounts_nova_spiceproxy_init := .Values.pod.mounts.nova_spiceproxy.init_spiceproxy }} diff --git a/nova/templates/job-cell-setup.yaml b/nova/templates/job-cell-setup.yaml index a1a85063cc..f5da25a52f 100644 --- a/nova/templates/job-cell-setup.yaml +++ b/nova/templates/job-cell-setup.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_cell_setup }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.cell_setup }} +{{- $dependencies := .Values.dependencies.static.cell_setup }} {{- $serviceAccountName := "nova-cell-setup" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/nova/templates/job-db-drop.yaml b/nova/templates/job-db-drop.yaml index 1f5c3d9abd..b7be5c2d59 100644 --- a/nova/templates/job-db-drop.yaml +++ b/nova/templates/job-db-drop.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/nova/templates/job-ks-placement-endpoints.yaml b/nova/templates/job-ks-placement-endpoints.yaml index d7bae5df2c..fbe2988457 100644 --- a/nova/templates/job-ks-placement-endpoints.yaml +++ b/nova/templates/job-ks-placement-endpoints.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_ks_placement_endpoints }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ks_endpoints }} +{{- $dependencies := .Values.dependencies.static.ks_endpoints }} {{- $serviceAccountName := "placement-ks-endpoints" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/nova/templates/job-ks-placement-service.yaml b/nova/templates/job-ks-placement-service.yaml index b8a2570912..f3b8eed409 100644 --- a/nova/templates/job-ks-placement-service.yaml +++ b/nova/templates/job-ks-placement-service.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_ks_placement_service }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ks_service }} +{{- $dependencies := .Values.dependencies.static.ks_service }} {{- $serviceAccountName := "placement-ks-service" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/nova/templates/job-ks-placement-user.yaml b/nova/templates/job-ks-placement-user.yaml index 91839a52de..ac564d3b19 100644 --- a/nova/templates/job-ks-placement-user.yaml +++ b/nova/templates/job-ks-placement-user.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_ks_placement_user }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ks_user }} +{{- $dependencies := .Values.dependencies.static.ks_user }} {{- $serviceAccountName := "placement-ks-user" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/nova/templates/pod-rally-test.yaml b/nova/templates/pod-rally-test.yaml index 70ea1206fb..e70b59dfef 100644 --- a/nova/templates/pod-rally-test.yaml +++ b/nova/templates/pod-rally-test.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.pod_rally_test }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.tests }} +{{- $dependencies := .Values.dependencies.static.tests }} {{- $mounts_tests := .Values.pod.mounts.nova_tests.nova_tests }} {{- $mounts_tests_init := .Values.pod.mounts.nova_tests.init_container }} diff --git a/nova/templates/statefulset-compute-ironic.yaml b/nova/templates/statefulset-compute-ironic.yaml index 8fe5c7afea..cd92ad7ebb 100644 --- a/nova/templates/statefulset-compute-ironic.yaml +++ b/nova/templates/statefulset-compute-ironic.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset_compute_ironic }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.compute_ironic }} +{{- $dependencies := .Values.dependencies.static.compute_ironic }} {{- $mounts_nova_compute_ironic := .Values.pod.mounts.nova_compute_ironic.nova_compute_ironic }} {{- $mounts_nova_compute_ironic_init := .Values.pod.mounts.nova_compute_ironic.init_container }} diff --git a/nova/values.yaml b/nova/values.yaml index e516486db7..3180fc23a2 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -182,146 +182,147 @@ ceph: secret_uuid: 457eb676-33da-42ec-9a8c-9293d545c337 dependencies: - api: - jobs: - - nova-db-sync - - nova-ks-user - - nova-ks-endpoints - services: - - service: oslo_messaging - endpoint: internal - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - - service: compute_metadata - endpoint: public - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - nova-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - bootstrap: - services: - - service: identity - endpoint: internal - - service: compute - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - nova-ks-service - services: - - service: identity - endpoint: internal - compute: - jobs: - - nova-db-sync - services: - - service: oslo_messaging - endpoint: internal - - service: image - endpoint: internal - - service: compute - endpoint: internal - - service: network - endpoint: internal - daemonset: - - libvirt - # this should be set to corresponding neutron L2 agent - - neutron-ovs-agent - compute_ironic: - jobs: - - nova-db-sync - services: - - service: oslo_messaging - endpoint: internal - - service: image - endpoint: internal - - service: compute - endpoint: internal - - service: network - endpoint: internal - - service: baremetal - endpoint: internal - consoleauth: - jobs: - - nova-db-sync - services: - - service: oslo_messaging - endpoint: internal - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - - service: compute - endpoint: internal - scheduler: - jobs: - - nova-db-sync - services: - - service: oslo_messaging - endpoint: internal - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - - service: compute - endpoint: internal - conductor: - jobs: - - nova-db-sync - services: - - service: oslo_messaging - endpoint: internal - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - - service: compute - endpoint: internal - tests: - services: - - service: image - endpoint: internal - - service: compute - endpoint: internal - - service: network - endpoint: internal - novncproxy: - jobs: - - nova-db-sync - services: - - service: oslo_db - endpoint: internal - cell_setup: - jobs: - - nova-db-sync - services: - - service: oslo_messaging - endpoint: internal - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - - service: compute - endpoint: internal + static: + api: + jobs: + - nova-db-sync + - nova-ks-user + - nova-ks-endpoints + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + - endpoint: public + service: compute_metadata + bootstrap: + services: + - endpoint: internal + service: identity + - endpoint: internal + service: compute + cell_setup: + jobs: + - nova-db-sync + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + - endpoint: internal + service: compute + compute: + daemonset: + - libvirt + # this should be set to corresponding neutron L2 agent + - neutron-ovs-agent + jobs: + - nova-db-sync + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: image + - endpoint: internal + service: compute + - endpoint: internal + service: network + compute_ironic: + jobs: + - nova-db-sync + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: image + - endpoint: internal + service: compute + - endpoint: internal + service: network + - endpoint: internal + service: baremetal + conductor: + jobs: + - nova-db-sync + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + - endpoint: internal + service: compute + consoleauth: + jobs: + - nova-db-sync + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + - endpoint: internal + service: compute + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - nova-db-init + services: + - endpoint: internal + service: oslo_db + ks_endpoints: + jobs: + - nova-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + novncproxy: + jobs: + - nova-db-sync + services: + - endpoint: internal + service: oslo_db + scheduler: + jobs: + - nova-db-sync + services: + - endpoint: internal + service: oslo_messaging + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + - endpoint: internal + service: compute + tests: + services: + - endpoint: internal + service: image + - endpoint: internal + service: compute + - endpoint: internal + service: network console: # serial | spice | novnc | none diff --git a/openvswitch/templates/daemonset-ovs-db.yaml b/openvswitch/templates/daemonset-ovs-db.yaml index ac709d881d..a9e33917ce 100644 --- a/openvswitch/templates/daemonset-ovs-db.yaml +++ b/openvswitch/templates/daemonset-ovs-db.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_ovs_db }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db }} +{{- $dependencies := .Values.dependencies.static.db }} {{- $serviceAccountName := "openvswitch-db" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/openvswitch/templates/daemonset-ovs-vswitchd.yaml b/openvswitch/templates/daemonset-ovs-vswitchd.yaml index d102ab37a3..1654da40c0 100644 --- a/openvswitch/templates/daemonset-ovs-vswitchd.yaml +++ b/openvswitch/templates/daemonset-ovs-vswitchd.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.daemonset_ovs_vswitchd }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.vswitchd }} +{{- $dependencies := .Values.dependencies.static.vswitchd }} {{- $serviceAccountName := "openvswitch-vswitchd" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml index a5af914010..ff7a387623 100644 --- a/openvswitch/values.yaml +++ b/openvswitch/values.yaml @@ -81,8 +81,9 @@ pod: cpu: "2000m" dependencies: - vswitchd: null - db: null + static: + db: null + vswitchd: null manifests: configmap_bin: true diff --git a/postgresql/templates/statefulset.yaml b/postgresql/templates/statefulset.yaml index c9b2e53e6d..02252be577 100644 --- a/postgresql/templates/statefulset.yaml +++ b/postgresql/templates/statefulset.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.postgresql }} +{{- $dependencies := .Values.dependencies.static.postgresql }} {{- $serviceAccountName := "postgresql" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/postgresql/values.yaml b/postgresql/values.yaml index 88ec5d643f..c8b6869a0b 100644 --- a/postgresql/values.yaml +++ b/postgresql/values.yaml @@ -61,8 +61,9 @@ labels: node_selector_value: enabled dependencies: - postgresql: - jobs: null + static: + postgresql: + jobs: null secrets: postgresql: diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml index a86542bb28..5767cd54a8 100644 --- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.prometheus_rabbitmq_exporter }} +{{- $dependencies := .Values.dependencies.static.prometheus_rabbitmq_exporter }} {{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "rabbitmq-exporter" }} {{ tuple $envAll $dependencies $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml index 83ea34f85e..c3e77e824e 100644 --- a/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.rabbitmq }} +{{- $dependencies := .Values.dependencies.static.rabbitmq }} {{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "rabbitmq" }} {{ tuple $envAll $dependencies $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index 48d8ba05f0..4a52d76238 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -108,18 +108,19 @@ conf: loopback_users.guest: "false" dependencies: - rabbitmq: - jobs: null - prometheus_rabbitmq_exporter: - services: - - service: oslo_messaging - endpoint: internal - prometheus_rabbitmq_exporter_tests: - services: - - service: prometheus_rabbitmq_exporter - endpoint: internal - - service: monitoring - endpoint: internal + static: + prometheus_rabbitmq_exporter: + services: + - endpoint: internal + service: oslo_messaging + prometheus_rabbitmq_exporter_tests: + services: + - endpoint: internal + service: prometheus_rabbitmq_exporter + - endpoint: internal + service: monitoring + rabbitmq: + jobs: null monitoring: prometheus: diff --git a/rally/templates/job-bootstrap.yaml b/rally/templates/job-bootstrap.yaml index c9962e57d4..0310eb388d 100644 --- a/rally/templates/job-bootstrap.yaml +++ b/rally/templates/job-bootstrap.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_bootstrap }} {{- $envAll := . }} {{- if .Values.bootstrap.enabled }} -{{- $dependencies := .Values.dependencies.bootstrap }} +{{- $dependencies := .Values.dependencies.static.bootstrap }} {{- $mounts_rally_bootstrap := .Values.pod.mounts.rally_bootstrap.rally_bootstrap }} {{- $mounts_rally_bootstrap_init := .Values.pod.mounts.rally_bootstrap.init_container }} diff --git a/rally/templates/job-ks-endpoints.yaml b/rally/templates/job-ks-endpoints.yaml index e5ea534207..9f6fe84522 100644 --- a/rally/templates/job-ks-endpoints.yaml +++ b/rally/templates/job-ks-endpoints.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_ks_endpoints }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ks_endpoints }} +{{- $dependencies := .Values.dependencies.static.ks_endpoints }} {{- $serviceAccountName := "rally-ks-endpoints" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/rally/templates/job-ks-service.yaml b/rally/templates/job-ks-service.yaml index ae21606e68..b9f6fc9ecc 100644 --- a/rally/templates/job-ks-service.yaml +++ b/rally/templates/job-ks-service.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_ks_service }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ks_service }} +{{- $dependencies := .Values.dependencies.static.ks_service }} {{- $serviceAccountName := "rally-ks-service" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/rally/templates/job-manage-db.yaml b/rally/templates/job-manage-db.yaml index 9c2d5bfe12..2df177e448 100644 --- a/rally/templates/job-manage-db.yaml +++ b/rally/templates/job-manage-db.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_manage_db }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.manage_db }} +{{- $dependencies := .Values.dependencies.static.manage_db }} {{- $serviceAccountName := "rally-manage-db" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/rally/templates/job-run-task.yaml b/rally/templates/job-run-task.yaml index 86fac5b23f..6394ab973a 100644 --- a/rally/templates/job-run-task.yaml +++ b/rally/templates/job-run-task.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_run_task }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.run_task }} +{{- $dependencies := .Values.dependencies.static.run_task }} {{- $serviceAccountName := "rally-run-task" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/rally/values.yaml b/rally/values.yaml index 3e3efe8d81..753fc6c50c 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -137,43 +137,43 @@ bootstrap: openstack token issue dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - rally-ks-service - services: - - service: identity - endpoint: internal - manage_db: - jobs: - - rally-ks-user - - rally-ks-endpoints - - rally-db-init - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - run_task: - jobs: - - rally-manage-db - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - + static: + db_init: + services: + - endpoint: internal + service: oslo_db + ks_endpoints: + jobs: + - rally-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity + manage_db: + jobs: + - rally-ks-user + - rally-ks-endpoints + - rally-db-init + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + run_task: + jobs: + - rally-manage-db + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity # Names of secrets used by bootstrap and environmental checks secrets: diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml index 516c325a04..d06bc609d9 100644 --- a/senlin/templates/deployment-api.yaml +++ b/senlin/templates/deployment-api.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.deployment_api }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.api }} +{{- $dependencies := .Values.dependencies.static.api }} {{- $mounts_senlin_api := .Values.pod.mounts.senlin_api.senlin_api }} {{- $mounts_senlin_api_init := .Values.pod.mounts.senlin_api.init_container }} diff --git a/senlin/templates/job-db-drop.yaml b/senlin/templates/job-db-drop.yaml index fd53baf551..fc5000e57b 100644 --- a/senlin/templates/job-db-drop.yaml +++ b/senlin/templates/job-db-drop.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_drop }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_drop }} +{{- $dependencies := .Values.dependencies.static.db_drop }} {{- $randStringSuffix := randAlphaNum 5 | lower }} diff --git a/senlin/templates/statefulset-engine.yaml b/senlin/templates/statefulset-engine.yaml index e3c02655b5..791ce824e1 100644 --- a/senlin/templates/statefulset-engine.yaml +++ b/senlin/templates/statefulset-engine.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.statefulset_engine }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.engine }} +{{- $dependencies := .Values.dependencies.static.engine }} {{- $mounts_senlin_engine := .Values.pod.mounts.senlin_engine.senlin_engine }} {{- $mounts_senlin_engine_init := .Values.pod.mounts.senlin_engine.init_container }} diff --git a/senlin/values.yaml b/senlin/values.yaml index 916d03ff4e..de3b875228 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -149,54 +149,55 @@ bootstrap: openstack token issue dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - db_sync: - jobs: - - senlin-db-init - services: - - service: oslo_db - endpoint: internal - db_drop: - services: - - service: oslo_db - endpoint: internal - ks_user: - services: - - service: identity - endpoint: internal - ks_service: - services: - - service: identity - endpoint: internal - ks_endpoints: - jobs: - - senlin-ks-service - services: - - service: identity - endpoint: internal - api: - jobs: - - senlin-db-sync - - senlin-ks-user - - senlin-ks-endpoints - services: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal - engine: - jobs: - - senlin-db-sync - - senlin-ks-user - - senlin-ks-endpoints - servics: - - service: oslo_db - endpoint: internal - - service: identity - endpoint: internal + static: + api: + jobs: + - senlin-db-sync + - senlin-ks-user + - senlin-ks-endpoints + services: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + db_drop: + services: + - endpoint: internal + service: oslo_db + db_init: + services: + - endpoint: internal + service: oslo_db + db_sync: + jobs: + - senlin-db-init + services: + - endpoint: internal + service: oslo_db + engine: + jobs: + - senlin-db-sync + - senlin-ks-user + - senlin-ks-endpoints + servics: + - endpoint: internal + service: oslo_db + - endpoint: internal + service: identity + ks_endpoints: + jobs: + - senlin-ks-service + services: + - endpoint: internal + service: identity + ks_service: + services: + - endpoint: internal + service: identity + ks_user: + services: + - endpoint: internal + service: identity # Names of secrets used by bootstrap and environmental checks secrets: