dependencies: move static dependencies under a 'static' key
This PS moves static dependencies under a 'static' key to allow expansion to cover dynamic dependencies. Change-Id: I38990b93aa79fa1f70af6f2c78e5e5c61c63f32c
This commit is contained in:
Pete Birley
parent
3a251c2db4
commit
f57972b5b6
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.api }}
|
{{- $dependencies := .Values.dependencies.static.api }}
|
||||||
|
|
||||||
{{- $mounts_barbican_api := .Values.pod.mounts.barbican_api.barbican_api }}
|
{{- $mounts_barbican_api := .Values.pod.mounts.barbican_api.barbican_api }}
|
||||||
{{- $mounts_barbican_api_init := .Values.pod.mounts.barbican_api.init_container }}
|
{{- $mounts_barbican_api_init := .Values.pod.mounts.barbican_api.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_db_drop }}
|
{{- if .Values.manifests.job_db_drop }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.db_drop }}
|
{{- $dependencies := .Values.dependencies.static.db_drop }}
|
||||||
|
|
||||||
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.pod_test }}
|
{{- if .Values.manifests.pod_test }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.tests }}
|
{{- $dependencies := .Values.dependencies.static.tests }}
|
||||||
|
|
||||||
{{- $mounts_barbican_tests := .Values.pod.mounts.barbican_tests.barbican_tests }}
|
{{- $mounts_barbican_tests := .Values.pod.mounts.barbican_tests.barbican_tests }}
|
||||||
{{- $mounts_barbican_tests_init := .Values.pod.mounts.barbican_tests.init_container }}
|
{{- $mounts_barbican_tests_init := .Values.pod.mounts.barbican_tests.init_container }}
|
||||||
|
|||||||
@ -156,44 +156,45 @@ bootstrap:
|
|||||||
openstack token issue
|
openstack token issue
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
db_init:
|
static:
|
||||||
services:
|
api:
|
||||||
- service: oslo_db
|
jobs:
|
||||||
endpoint: internal
|
- barbican-db-sync
|
||||||
db_sync:
|
- barbican-ks-user
|
||||||
jobs:
|
- barbican-ks-endpoints
|
||||||
- barbican-db-init
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
db_drop:
|
service: identity
|
||||||
services:
|
db_drop:
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
ks_user:
|
service: oslo_db
|
||||||
services:
|
db_init:
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
ks_service:
|
service: oslo_db
|
||||||
services:
|
db_sync:
|
||||||
- service: identity
|
jobs:
|
||||||
endpoint: internal
|
- barbican-db-init
|
||||||
ks_endpoints:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- barbican-ks-service
|
service: oslo_db
|
||||||
services:
|
ks_endpoints:
|
||||||
- service: identity
|
jobs:
|
||||||
endpoint: internal
|
- barbican-ks-service
|
||||||
api:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- barbican-db-sync
|
service: identity
|
||||||
- barbican-ks-user
|
ks_service:
|
||||||
- barbican-ks-endpoints
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: identity
|
||||||
endpoint: internal
|
ks_user:
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
|
service: identity
|
||||||
|
|
||||||
conf:
|
conf:
|
||||||
paste:
|
paste:
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.api }}
|
{{- $dependencies := .Values.dependencies.static.api }}
|
||||||
|
|
||||||
{{- $mounts_ceilometer_api := .Values.pod.mounts.ceilometer_api.ceilometer_api }}
|
{{- $mounts_ceilometer_api := .Values.pod.mounts.ceilometer_api.ceilometer_api }}
|
||||||
{{- $mounts_ceilometer_api_init := .Values.pod.mounts.ceilometer_api.init_container }}
|
{{- $mounts_ceilometer_api_init := .Values.pod.mounts.ceilometer_api.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_central }}
|
{{- if .Values.manifests.deployment_central }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.central }}
|
{{- $dependencies := .Values.dependencies.static.central }}
|
||||||
|
|
||||||
{{- $mounts_ceilometer_central := .Values.pod.mounts.ceilometer_central.ceilometer_central }}
|
{{- $mounts_ceilometer_central := .Values.pod.mounts.ceilometer_central.ceilometer_central }}
|
||||||
{{- $mounts_ceilometer_central_init := .Values.pod.mounts.ceilometer_central.init_container }}
|
{{- $mounts_ceilometer_central_init := .Values.pod.mounts.ceilometer_central.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_collector }}
|
{{- if .Values.manifests.deployment_collector }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.collector }}
|
{{- $dependencies := .Values.dependencies.static.collector }}
|
||||||
|
|
||||||
{{- $mounts_ceilometer_collector := .Values.pod.mounts.ceilometer_collector.ceilometer_collector }}
|
{{- $mounts_ceilometer_collector := .Values.pod.mounts.ceilometer_collector.ceilometer_collector }}
|
||||||
{{- $mounts_ceilometer_collector_init := .Values.pod.mounts.ceilometer_collector.init_container }}
|
{{- $mounts_ceilometer_collector_init := .Values.pod.mounts.ceilometer_collector.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_compute }}
|
{{- if .Values.manifests.deployment_compute }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.compute }}
|
{{- $dependencies := .Values.dependencies.static.compute }}
|
||||||
|
|
||||||
{{- $mounts_ceilometer_compute := .Values.pod.mounts.ceilometer_compute.ceilometer_compute }}
|
{{- $mounts_ceilometer_compute := .Values.pod.mounts.ceilometer_compute.ceilometer_compute }}
|
||||||
{{- $mounts_ceilometer_compute_init := .Values.pod.mounts.ceilometer_compute.init_container }}
|
{{- $mounts_ceilometer_compute_init := .Values.pod.mounts.ceilometer_compute.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_notification }}
|
{{- if .Values.manifests.deployment_notification }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.notification }}
|
{{- $dependencies := .Values.dependencies.static.notification }}
|
||||||
|
|
||||||
{{- $mounts_ceilometer_notification := .Values.pod.mounts.ceilometer_notification.ceilometer_notification }}
|
{{- $mounts_ceilometer_notification := .Values.pod.mounts.ceilometer_notification.ceilometer_notification }}
|
||||||
{{- $mounts_ceilometer_notification_init := .Values.pod.mounts.ceilometer_notification.init_container }}
|
{{- $mounts_ceilometer_notification_init := .Values.pod.mounts.ceilometer_notification.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_db_init_mongodb }}
|
{{- if .Values.manifests.job_db_init_mongodb }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.db_init_mongodb }}
|
{{- $dependencies := .Values.dependencies.static.db_init_mongodb }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ceilometer-db-init-mongodb" }}
|
{{- $serviceAccountName := "ceilometer-db-init-mongodb" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.pod_rally_test }}
|
{{- if .Values.manifests.pod_rally_test }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.tests }}
|
{{- $dependencies := .Values.dependencies.static.tests }}
|
||||||
|
|
||||||
{{- $mounts_tests := .Values.pod.mounts.ceilometer_tests.ceilometer_tests }}
|
{{- $mounts_tests := .Values.pod.mounts.ceilometer_tests.ceilometer_tests }}
|
||||||
{{- $mounts_tests_init := .Values.pod.mounts.ceilometer_tests.init_container }}
|
{{- $mounts_tests_init := .Values.pod.mounts.ceilometer_tests.init_container }}
|
||||||
|
|||||||
@ -1487,117 +1487,118 @@ conf:
|
|||||||
override: null
|
override: null
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
db_init:
|
static:
|
||||||
services:
|
api:
|
||||||
- service: oslo_db
|
jobs:
|
||||||
endpoint: internal
|
- ceilometer-db-init-mongodb
|
||||||
db_init_mongodb:
|
- ceilometer-db-sync
|
||||||
services:
|
- ceilometer-ks-user
|
||||||
- service: mongodb
|
- ceilometer-ks-endpoints
|
||||||
endpoint: internal
|
services:
|
||||||
db_sync:
|
- endpoint: internal
|
||||||
jobs:
|
service: identity
|
||||||
- ceilometer-db-init
|
- endpoint: internal
|
||||||
services:
|
service: oslo_db
|
||||||
- service: oslo_db
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: mongodb
|
||||||
ks_user:
|
- endpoint: internal
|
||||||
services:
|
service: metric
|
||||||
- service: identity
|
central:
|
||||||
endpoint: internal
|
jobs:
|
||||||
ks_service:
|
- ceilometer-db-init-mongodb
|
||||||
services:
|
- ceilometer-db-sync
|
||||||
- service: identity
|
- ceilometer-ks-user
|
||||||
endpoint: internal
|
- ceilometer-ks-endpoints
|
||||||
ks_endpoints:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- ceilometer-ks-service
|
service: identity
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
api:
|
service: mongodb
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- ceilometer-db-init-mongodb
|
service: metric
|
||||||
- ceilometer-db-sync
|
collector:
|
||||||
- ceilometer-ks-user
|
jobs:
|
||||||
- ceilometer-ks-endpoints
|
- ceilometer-db-init-mongodb
|
||||||
services:
|
- ceilometer-db-sync
|
||||||
- service: identity
|
- ceilometer-ks-user
|
||||||
endpoint: internal
|
- ceilometer-ks-endpoints
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: mongodb
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: metric
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
compute:
|
service: mongodb
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- ceilometer-db-init-mongodb
|
service: metric
|
||||||
- ceilometer-db-sync
|
compute:
|
||||||
- ceilometer-ks-user
|
jobs:
|
||||||
- ceilometer-ks-endpoints
|
- ceilometer-db-init-mongodb
|
||||||
services:
|
- ceilometer-db-sync
|
||||||
- service: identity
|
- ceilometer-ks-user
|
||||||
endpoint: internal
|
- ceilometer-ks-endpoints
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: mongodb
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: metric
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
collector:
|
service: mongodb
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- ceilometer-db-init-mongodb
|
service: metric
|
||||||
- ceilometer-db-sync
|
db_init:
|
||||||
- ceilometer-ks-user
|
services:
|
||||||
- ceilometer-ks-endpoints
|
- endpoint: internal
|
||||||
services:
|
service: oslo_db
|
||||||
- service: identity
|
db_init_mongodb:
|
||||||
endpoint: internal
|
services:
|
||||||
- service: oslo_db
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: mongodb
|
||||||
- service: mongodb
|
db_sync:
|
||||||
endpoint: internal
|
jobs:
|
||||||
- service: metric
|
- ceilometer-db-init
|
||||||
endpoint: internal
|
services:
|
||||||
central:
|
- endpoint: internal
|
||||||
jobs:
|
service: oslo_db
|
||||||
- ceilometer-db-init-mongodb
|
ks_endpoints:
|
||||||
- ceilometer-db-sync
|
jobs:
|
||||||
- ceilometer-ks-user
|
- ceilometer-ks-service
|
||||||
- ceilometer-ks-endpoints
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: identity
|
||||||
endpoint: internal
|
ks_service:
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: mongodb
|
service: identity
|
||||||
endpoint: internal
|
ks_user:
|
||||||
- service: metric
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
notification:
|
service: identity
|
||||||
jobs:
|
notification:
|
||||||
- ceilometer-db-init-mongodb
|
jobs:
|
||||||
- ceilometer-db-sync
|
- ceilometer-db-init-mongodb
|
||||||
- ceilometer-ks-user
|
- ceilometer-db-sync
|
||||||
- ceilometer-ks-endpoints
|
- ceilometer-ks-user
|
||||||
services:
|
- ceilometer-ks-endpoints
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: mongodb
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: metric
|
service: mongodb
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
tests:
|
service: metric
|
||||||
services:
|
tests:
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: metering
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: metric
|
service: metering
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
|
service: metric
|
||||||
|
|
||||||
# Names of secrets used by bootstrap and environmental checks
|
# Names of secrets used by bootstrap and environmental checks
|
||||||
secrets:
|
secrets:
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.daemonset_mon .Values.deployment.ceph }}
|
{{- if and .Values.manifests.daemonset_mon .Values.deployment.ceph }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.mon }}
|
{{- $dependencies := .Values.dependencies.static.mon }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ceph-mon"}}
|
{{- $serviceAccountName := "ceph-mon"}}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -297,7 +297,7 @@ spec:
|
|||||||
{{- $daemonset := "osd" }}
|
{{- $daemonset := "osd" }}
|
||||||
{{- $configMapName := "ceph-etc" }}
|
{{- $configMapName := "ceph-etc" }}
|
||||||
{{- $serviceAccountName := "ceph-osd"}}
|
{{- $serviceAccountName := "ceph-osd"}}
|
||||||
{{- $dependencies := .Values.dependencies.osd }}
|
{{- $dependencies := .Values.dependencies.static.osd }}
|
||||||
{{ tuple . $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple . $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
{{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName $dependencies . | include "ceph.osd.daemonset" | toString | fromYaml }}
|
{{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName $dependencies . | include "ceph.osd.daemonset" | toString | fromYaml }}
|
||||||
{{- $configmap_yaml := "ceph.configmap.etc" }}
|
{{- $configmap_yaml := "ceph.configmap.etc" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.deployment_cephfs_provisioner .Values.deployment.cephfs_provisioner }}
|
{{- if and .Values.manifests.deployment_cephfs_provisioner .Values.deployment.cephfs_provisioner }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.cephfs_provisioner }}
|
{{- $dependencies := .Values.dependencies.static.cephfs_provisioner }}
|
||||||
|
|
||||||
{{- $serviceAccountName := printf "%s-%s" .Release.Name "ceph-cephfs-provisioner" }}
|
{{- $serviceAccountName := printf "%s-%s" .Release.Name "ceph-cephfs-provisioner" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.deployment_mds ( and .Values.deployment.ceph .Values.conf.features.mds) }}
|
{{- if and .Values.manifests.deployment_mds ( and .Values.deployment.ceph .Values.conf.features.mds) }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.mds }}
|
{{- $dependencies := .Values.dependencies.static.mds }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ceph-mds"}}
|
{{- $serviceAccountName := "ceph-mds"}}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.deployment_mgr (and .Values.deployment.ceph .Values.conf.features.mgr ) }}
|
{{- if and .Values.manifests.deployment_mgr (and .Values.deployment.ceph .Values.conf.features.mgr ) }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.mgr }}
|
{{- $dependencies := .Values.dependencies.static.mgr }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ceph-mgr"}}
|
{{- $serviceAccountName := "ceph-mgr"}}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.deployment_moncheck .Values.deployment.ceph }}
|
{{- if and .Values.manifests.deployment_moncheck .Values.deployment.ceph }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.moncheck }}
|
{{- $dependencies := .Values.dependencies.static.moncheck }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ceph-mon-check"}}
|
{{- $serviceAccountName := "ceph-mon-check"}}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.deployment_rbd_provisioner .Values.deployment.rbd_provisioner }}
|
{{- if and .Values.manifests.deployment_rbd_provisioner .Values.deployment.rbd_provisioner }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.rbd_provisioner }}
|
{{- $dependencies := .Values.dependencies.static.rbd_provisioner }}
|
||||||
|
|
||||||
{{- $serviceAccountName := printf "%s-%s" .Release.Name "ceph-rbd-provisioner" }}
|
{{- $serviceAccountName := printf "%s-%s" .Release.Name "ceph-rbd-provisioner" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.deployment_rgw ( and .Values.deployment.ceph .Values.conf.features.rgw ) }}
|
{{- if and .Values.manifests.deployment_rgw ( and .Values.deployment.ceph .Values.conf.features.rgw ) }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.rgw }}
|
{{- $dependencies := .Values.dependencies.static.rgw }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ceph-rgw"}}
|
{{- $serviceAccountName := "ceph-rgw"}}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }}
|
{{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.bootstrap }}
|
{{- $dependencies := .Values.dependencies.static.bootstrap }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ceph-bootstrap"}}
|
{{- $serviceAccountName := "ceph-bootstrap"}}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.job_cephfs_client_key .Values.deployment.cephfs_provisioner }}
|
{{- if and .Values.manifests.job_cephfs_client_key .Values.deployment.cephfs_provisioner }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.cephfs_client_key_generator }}
|
{{- $dependencies := .Values.dependencies.static.cephfs_client_key_generator }}
|
||||||
|
|
||||||
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@ limitations under the License.
|
|||||||
{{- if not (and (not $envAll.Values.manifests.deployment_rgw) (eq $cephBootstrapKey "rgw")) }}
|
{{- if not (and (not $envAll.Values.manifests.deployment_rgw) (eq $cephBootstrapKey "rgw")) }}
|
||||||
{{- $jobName := print $cephBootstrapKey "-keyring-generator" }}
|
{{- $jobName := print $cephBootstrapKey "-keyring-generator" }}
|
||||||
|
|
||||||
{{- $dependencies := $envAll.Values.dependencies.job_keyring_generator }}
|
{{- $dependencies := $envAll.Values.dependencies.static.job_keyring_generator }}
|
||||||
|
|
||||||
{{- $serviceAccountName := print "ceph-" $jobName }}
|
{{- $serviceAccountName := print "ceph-" $jobName }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.job_namespace_client_key_cleaner .Values.deployment.client_secrets }}
|
{{- if and .Values.manifests.job_namespace_client_key_cleaner .Values.deployment.client_secrets }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.namespace_client_key_cleaner }}
|
{{- $dependencies := .Values.dependencies.static.namespace_client_key_cleaner }}
|
||||||
|
|
||||||
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.job_namespace_client_key .Values.deployment.client_secrets }}
|
{{- if and .Values.manifests.job_namespace_client_key .Values.deployment.client_secrets }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.namespace_client_key_generator }}
|
{{- $dependencies := .Values.dependencies.static.namespace_client_key_generator }}
|
||||||
|
|
||||||
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.job_rbd_pool .Values.deployment.ceph }}
|
{{- if and .Values.manifests.job_rbd_pool .Values.deployment.ceph }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.rbd_pool }}
|
{{- $dependencies := .Values.dependencies.static.rbd_pool }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ceph-rbd-pool" }}
|
{{- $serviceAccountName := "ceph-rbd-pool" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if and .Values.manifests.job_storage_admin_keys .Values.deployment.storage_secrets }}
|
{{- if and .Values.manifests.job_storage_admin_keys .Values.deployment.storage_secrets }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.storage_keys_generator }}
|
{{- $dependencies := .Values.dependencies.static.storage_keys_generator }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ceph-storage-keys-generator" }}
|
{{- $serviceAccountName := "ceph-storage-keys-generator" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
173
ceph/values.yaml
173
ceph/values.yaml
@ -349,92 +349,93 @@ conf:
|
|||||||
# location: /var/lib/openstack-helm/ceph/osd/journal-three
|
# location: /var/lib/openstack-helm/ceph/osd/journal-three
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
cephfs_client_key_generator:
|
static:
|
||||||
jobs:
|
bootstrap:
|
||||||
job_keyring_generator:
|
jobs: null
|
||||||
jobs:
|
services:
|
||||||
namespace_client_key_cleaner:
|
- endpoint: internal
|
||||||
jobs:
|
service: ceph_mon
|
||||||
namespace_client_key_generator:
|
cephfs_client_key_generator:
|
||||||
jobs:
|
jobs: null
|
||||||
storage_keys_generator:
|
cephfs_provisioner:
|
||||||
jobs:
|
jobs:
|
||||||
mon:
|
- ceph-rbd-pool
|
||||||
jobs:
|
services:
|
||||||
- ceph-storage-keys-generator
|
- endpoint: internal
|
||||||
- ceph-mon-keyring-generator
|
service: ceph_mon
|
||||||
osd:
|
job_keyring_generator:
|
||||||
jobs:
|
jobs: null
|
||||||
- ceph-storage-keys-generator
|
ks_endpoints:
|
||||||
- ceph-osd-keyring-generator
|
jobs:
|
||||||
services:
|
- ceph-ks-service
|
||||||
- service: ceph_mon
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
moncheck:
|
service: identity
|
||||||
jobs:
|
ks_service:
|
||||||
- ceph-storage-keys-generator
|
services:
|
||||||
- ceph-mon-keyring-generator
|
- endpoint: internal
|
||||||
services:
|
service: identity
|
||||||
- service: ceph_mon
|
ks_user:
|
||||||
endpoint: discovery
|
services:
|
||||||
rgw:
|
- endpoint: internal
|
||||||
jobs:
|
service: identity
|
||||||
- ceph-storage-keys-generator
|
mds:
|
||||||
- ceph-rgw-keyring-generator
|
jobs:
|
||||||
- ceph-rbd-pool
|
- ceph-storage-keys-generator
|
||||||
services:
|
- ceph-mds-keyring-generator
|
||||||
- service: ceph_mon
|
- ceph-rbd-pool
|
||||||
endpoint: internal
|
services:
|
||||||
mds:
|
- endpoint: internal
|
||||||
jobs:
|
service: ceph_mon
|
||||||
- ceph-storage-keys-generator
|
mgr:
|
||||||
- ceph-mds-keyring-generator
|
jobs:
|
||||||
- ceph-rbd-pool
|
- ceph-storage-keys-generator
|
||||||
services:
|
- ceph-mgr-keyring-generator
|
||||||
- service: ceph_mon
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
bootstrap:
|
service: ceph_mon
|
||||||
jobs:
|
mon:
|
||||||
services:
|
jobs:
|
||||||
- service: ceph_mon
|
- ceph-storage-keys-generator
|
||||||
endpoint: internal
|
- ceph-mon-keyring-generator
|
||||||
rbd_provisioner:
|
moncheck:
|
||||||
jobs:
|
jobs:
|
||||||
- ceph-rbd-pool
|
- ceph-storage-keys-generator
|
||||||
services:
|
- ceph-mon-keyring-generator
|
||||||
- service: ceph_mon
|
services:
|
||||||
endpoint: internal
|
- endpoint: discovery
|
||||||
cephfs_provisioner:
|
service: ceph_mon
|
||||||
jobs:
|
namespace_client_key_cleaner:
|
||||||
- ceph-rbd-pool
|
jobs: null
|
||||||
services:
|
namespace_client_key_generator:
|
||||||
- service: ceph_mon
|
jobs: null
|
||||||
endpoint: internal
|
osd:
|
||||||
ks_user:
|
jobs:
|
||||||
services:
|
- ceph-storage-keys-generator
|
||||||
- service: identity
|
- ceph-osd-keyring-generator
|
||||||
endpoint: internal
|
services:
|
||||||
ks_service:
|
- endpoint: internal
|
||||||
services:
|
service: ceph_mon
|
||||||
- service: identity
|
rbd_pool:
|
||||||
endpoint: internal
|
services:
|
||||||
ks_endpoints:
|
- endpoint: internal
|
||||||
jobs:
|
service: ceph_mon
|
||||||
- ceph-ks-service
|
rbd_provisioner:
|
||||||
services:
|
jobs:
|
||||||
- service: identity
|
- ceph-rbd-pool
|
||||||
endpoint: internal
|
services:
|
||||||
mgr:
|
- endpoint: internal
|
||||||
jobs:
|
service: ceph_mon
|
||||||
- ceph-storage-keys-generator
|
rgw:
|
||||||
- ceph-mgr-keyring-generator
|
jobs:
|
||||||
services:
|
- ceph-storage-keys-generator
|
||||||
- service: ceph_mon
|
- ceph-rgw-keyring-generator
|
||||||
endpoint: internal
|
- ceph-rbd-pool
|
||||||
rbd_pool:
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: ceph_mon
|
service: ceph_mon
|
||||||
endpoint: internal
|
storage_keys_generator:
|
||||||
|
jobs: null
|
||||||
|
|
||||||
bootstrap:
|
bootstrap:
|
||||||
enabled: false
|
enabled: false
|
||||||
|
|||||||
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.cron_volume_usage_audit }}
|
{{- if .Values.manifests.cron_volume_usage_audit }}
|
||||||
{{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }}
|
{{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }}
|
||||||
{{- $envAll := . }}
|
{{- $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 := .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 }}
|
{{- $mounts_cinder_volume_usage_audit_init := .Values.pod.mounts.cinder_volume_usage_audit.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.api }}
|
{{- $dependencies := .Values.dependencies.static.api }}
|
||||||
|
|
||||||
{{- $mounts_cinder_api := .Values.pod.mounts.cinder_api.cinder_api }}
|
{{- $mounts_cinder_api := .Values.pod.mounts.cinder_api.cinder_api }}
|
||||||
{{- $mounts_cinder_api_init := .Values.pod.mounts.cinder_api.init_container }}
|
{{- $mounts_cinder_api_init := .Values.pod.mounts.cinder_api.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_backup }}
|
{{- if .Values.manifests.deployment_backup }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.backup }}
|
{{- $dependencies := .Values.dependencies.static.backup }}
|
||||||
|
|
||||||
{{- $mounts_cinder_backup := .Values.pod.mounts.cinder_backup.cinder_backup }}
|
{{- $mounts_cinder_backup := .Values.pod.mounts.cinder_backup.cinder_backup }}
|
||||||
{{- $mounts_cinder_backup_init := .Values.pod.mounts.cinder_backup.init_container }}
|
{{- $mounts_cinder_backup_init := .Values.pod.mounts.cinder_backup.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_scheduler }}
|
{{- if .Values.manifests.deployment_scheduler }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.scheduler }}
|
{{- $dependencies := .Values.dependencies.static.scheduler }}
|
||||||
|
|
||||||
{{- $mounts_cinder_scheduler := .Values.pod.mounts.cinder_scheduler.cinder_scheduler }}
|
{{- $mounts_cinder_scheduler := .Values.pod.mounts.cinder_scheduler.cinder_scheduler }}
|
||||||
{{- $mounts_cinder_scheduler_init := .Values.pod.mounts.cinder_scheduler.init_container }}
|
{{- $mounts_cinder_scheduler_init := .Values.pod.mounts.cinder_scheduler.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_volume }}
|
{{- if .Values.manifests.deployment_volume }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.volume }}
|
{{- $dependencies := .Values.dependencies.static.volume }}
|
||||||
|
|
||||||
{{- $mounts_cinder_volume := .Values.pod.mounts.cinder_volume.cinder_volume }}
|
{{- $mounts_cinder_volume := .Values.pod.mounts.cinder_volume.cinder_volume }}
|
||||||
{{- $mounts_cinder_volume_init := .Values.pod.mounts.cinder_volume.init_container }}
|
{{- $mounts_cinder_volume_init := .Values.pod.mounts.cinder_volume.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_backup_storage_init }}
|
{{- if .Values.manifests.job_backup_storage_init }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.backup_storage_init }}
|
{{- $dependencies := .Values.dependencies.static.backup_storage_init }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "cinder-backup-storage-init" }}
|
{{- $serviceAccountName := "cinder-backup-storage-init" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.job_clean }}
|
{{- if .Values.manifests.job_clean }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{ if or (eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph") (include "cinder.is_ceph_volume_configured" $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 }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_db_drop }}
|
{{- if .Values.manifests.job_db_drop }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.db_drop }}
|
{{- $dependencies := .Values.dependencies.static.db_drop }}
|
||||||
|
|
||||||
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_storage_init }}
|
{{- if .Values.manifests.job_storage_init }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.storage_init }}
|
{{- $dependencies := .Values.dependencies.static.storage_init }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "cinder-storage-init" }}
|
{{- $serviceAccountName := "cinder-storage-init" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.pod_rally_test }}
|
{{- if .Values.manifests.pod_rally_test }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.tests }}
|
{{- $dependencies := .Values.dependencies.static.tests }}
|
||||||
|
|
||||||
{{- $mounts_tests := .Values.pod.mounts.cinder_tests.cinder_tests }}
|
{{- $mounts_tests := .Values.pod.mounts.cinder_tests.cinder_tests }}
|
||||||
{{- $mounts_tests_init := .Values.pod.mounts.cinder_tests.init_container }}
|
{{- $mounts_tests_init := .Values.pod.mounts.cinder_tests.init_container }}
|
||||||
|
|||||||
@ -506,108 +506,109 @@ backup:
|
|||||||
size: 10Gi
|
size: 10Gi
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
db_init:
|
static:
|
||||||
services:
|
api:
|
||||||
- service: oslo_db
|
jobs:
|
||||||
endpoint: internal
|
- cinder-db-sync
|
||||||
db_sync:
|
- cinder-ks-user
|
||||||
jobs:
|
- cinder-ks-endpoints
|
||||||
- cinder-db-init
|
- cinder-storage-init
|
||||||
services:
|
services:
|
||||||
- service: oslo_db
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: oslo_db
|
||||||
db_drop:
|
- endpoint: internal
|
||||||
services:
|
service: identity
|
||||||
- service: oslo_db
|
backup:
|
||||||
endpoint: internal
|
jobs:
|
||||||
ks_user:
|
- cinder-db-sync
|
||||||
services:
|
- cinder-ks-user
|
||||||
- service: identity
|
- cinder-ks-endpoints
|
||||||
endpoint: internal
|
- cinder-storage-init
|
||||||
ks_service:
|
- cinder-backup-storage-init
|
||||||
services:
|
services:
|
||||||
- service: identity
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: identity
|
||||||
ks_endpoints:
|
- endpoint: internal
|
||||||
jobs:
|
service: volume
|
||||||
- cinder-ks-service
|
backup_storage_init:
|
||||||
services:
|
jobs: null
|
||||||
- service: identity
|
bootstrap:
|
||||||
endpoint: internal
|
services:
|
||||||
backup_storage_init:
|
- endpoint: internal
|
||||||
jobs:
|
service: identity
|
||||||
storage_init:
|
- endpoint: internal
|
||||||
jobs:
|
service: volume
|
||||||
clean:
|
clean:
|
||||||
jobs:
|
jobs: null
|
||||||
api:
|
db_drop:
|
||||||
jobs:
|
services:
|
||||||
- cinder-db-sync
|
- endpoint: internal
|
||||||
- cinder-ks-user
|
service: oslo_db
|
||||||
- cinder-ks-endpoints
|
db_init:
|
||||||
- cinder-storage-init
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: oslo_db
|
||||||
endpoint: internal
|
db_sync:
|
||||||
- service: identity
|
jobs:
|
||||||
endpoint: internal
|
- cinder-db-init
|
||||||
bootstrap:
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: oslo_db
|
||||||
endpoint: internal
|
ks_endpoints:
|
||||||
- service: volume
|
jobs:
|
||||||
endpoint: internal
|
- cinder-ks-service
|
||||||
volume:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- cinder-db-sync
|
service: identity
|
||||||
- cinder-ks-user
|
ks_service:
|
||||||
- cinder-ks-endpoints
|
services:
|
||||||
- cinder-storage-init
|
- endpoint: internal
|
||||||
services:
|
service: identity
|
||||||
- service: identity
|
ks_user:
|
||||||
endpoint: internal
|
services:
|
||||||
- service: volume
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: identity
|
||||||
volume_usage_audit:
|
scheduler:
|
||||||
jobs:
|
jobs:
|
||||||
- cinder-db-sync
|
- cinder-db-sync
|
||||||
- cinder-ks-user
|
- cinder-ks-user
|
||||||
- cinder-ks-endpoints
|
- cinder-ks-endpoints
|
||||||
- cinder-storage-init
|
- cinder-storage-init
|
||||||
services:
|
services:
|
||||||
- service: identity
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: identity
|
||||||
- service: volume
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: volume
|
||||||
scheduler:
|
storage_init:
|
||||||
jobs:
|
jobs: null
|
||||||
- cinder-db-sync
|
tests:
|
||||||
- cinder-ks-user
|
services:
|
||||||
- cinder-ks-endpoints
|
- endpoint: internal
|
||||||
- cinder-storage-init
|
service: identity
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: volume
|
||||||
endpoint: internal
|
volume:
|
||||||
- service: volume
|
jobs:
|
||||||
endpoint: internal
|
- cinder-db-sync
|
||||||
backup:
|
- cinder-ks-user
|
||||||
jobs:
|
- cinder-ks-endpoints
|
||||||
- cinder-db-sync
|
- cinder-storage-init
|
||||||
- cinder-ks-user
|
services:
|
||||||
- cinder-ks-endpoints
|
- endpoint: internal
|
||||||
- cinder-storage-init
|
service: identity
|
||||||
- cinder-backup-storage-init
|
- endpoint: internal
|
||||||
services:
|
service: volume
|
||||||
- service: identity
|
volume_usage_audit:
|
||||||
endpoint: internal
|
jobs:
|
||||||
- service: volume
|
- cinder-db-sync
|
||||||
endpoint: internal
|
- cinder-ks-user
|
||||||
tests:
|
- cinder-ks-endpoints
|
||||||
services:
|
- cinder-storage-init
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: volume
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
|
service: volume
|
||||||
|
|
||||||
# Names of secrets used by bootstrap and environmental checks
|
# Names of secrets used by bootstrap and environmental checks
|
||||||
secrets:
|
secrets:
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.api }}
|
{{- $dependencies := .Values.dependencies.static.api }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "congress-api-dep" }}
|
{{- $serviceAccountName := "congress-api-dep" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_datasource }}
|
{{- if .Values.manifests.deployment_datasource }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.datasource }}
|
{{- $dependencies := .Values.dependencies.static.datasource }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "congress-datasource-dep" }}
|
{{- $serviceAccountName := "congress-datasource-dep" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_policy_engine }}
|
{{- if .Values.manifests.deployment_policy_engine }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.policy_engine }}
|
{{- $dependencies := .Values.dependencies.static.policy_engine }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "congress-policy-engine-dep" }}
|
{{- $serviceAccountName := "congress-policy-engine-dep" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_ds_create }}
|
{{- if .Values.manifests.job_ds_create }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.ds_create }}
|
{{- $dependencies := .Values.dependencies.static.ds_create }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "congress-ds-create" }}
|
{{- $serviceAccountName := "congress-ds-create" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -15,7 +15,7 @@ limitations under the License.
|
|||||||
*/}}
|
*/}}
|
||||||
|
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.tests }}
|
{{- $dependencies := .Values.dependencies.static.tests }}
|
||||||
|
|
||||||
{{- $serviceAccountName := print .Release.Name "-test" }}
|
{{- $serviceAccountName := print .Release.Name "-test" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -65,90 +65,91 @@ volume:
|
|||||||
size: 2Gi
|
size: 2Gi
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
storage_init:
|
static:
|
||||||
services:
|
api:
|
||||||
db_init:
|
jobs:
|
||||||
services:
|
- congress-db-sync
|
||||||
- service: oslo_db
|
- congress-ks-user
|
||||||
endpoint: internal
|
- congress-ks-endpoints
|
||||||
db_sync:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- congress-db-init
|
service: oslo_db
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: identity
|
||||||
endpoint: internal
|
bootstrap:
|
||||||
db_drop:
|
jobs:
|
||||||
services:
|
- congress-db-sync
|
||||||
- service: oslo_db
|
- congress-ks-user
|
||||||
endpoint: internal
|
- congress-ks-endpoints
|
||||||
bootstrap:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- congress-db-sync
|
service: identity
|
||||||
- congress-ks-user
|
- endpoint: internal
|
||||||
- congress-ks-endpoints
|
service: image
|
||||||
services:
|
datasource:
|
||||||
- service: identity
|
jobs:
|
||||||
endpoint: internal
|
- congress-db-sync
|
||||||
- service: image
|
- congress-ks-user
|
||||||
endpoint: internal
|
- congress-ks-endpoints
|
||||||
ks_user:
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
ks_service:
|
service: identity
|
||||||
services:
|
db_drop:
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
ks_endpoints:
|
service: oslo_db
|
||||||
jobs:
|
db_init:
|
||||||
- congress-ks-service
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: oslo_db
|
||||||
endpoint: internal
|
db_sync:
|
||||||
api:
|
jobs:
|
||||||
jobs:
|
- congress-db-init
|
||||||
- congress-db-sync
|
services:
|
||||||
- congress-ks-user
|
- endpoint: internal
|
||||||
- congress-ks-endpoints
|
service: oslo_db
|
||||||
services:
|
ds_create:
|
||||||
- service: oslo_db
|
jobs:
|
||||||
endpoint: internal
|
- congress-ks-endpoints
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
datasource:
|
service: policy
|
||||||
jobs:
|
ks_endpoints:
|
||||||
- congress-db-sync
|
jobs:
|
||||||
- congress-ks-user
|
- congress-ks-service
|
||||||
- congress-ks-endpoints
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: identity
|
||||||
endpoint: internal
|
ks_service:
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
policy_engine:
|
service: identity
|
||||||
jobs:
|
ks_user:
|
||||||
- congress-db-sync
|
services:
|
||||||
- congress-ks-user
|
- endpoint: internal
|
||||||
- congress-ks-endpoints
|
service: identity
|
||||||
services:
|
policy_engine:
|
||||||
- service: oslo_db
|
jobs:
|
||||||
endpoint: internal
|
- congress-db-sync
|
||||||
- service: identity
|
- congress-ks-user
|
||||||
endpoint: internal
|
- congress-ks-endpoints
|
||||||
ds_create:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- congress-ks-endpoints
|
service: oslo_db
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: policy
|
service: identity
|
||||||
endpoint: internal
|
storage_init:
|
||||||
tests:
|
services: null
|
||||||
services:
|
tests:
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: identity
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: policy
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
|
service: policy
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
identity:
|
identity:
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
{{- if .Values.manifests.deployment }}
|
{{- if .Values.manifests.deployment }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
|
|
||||||
{{- $dependencies := .Values.dependencies.etcd }}
|
{{- $dependencies := .Values.dependencies.static.etcd }}
|
||||||
|
|
||||||
{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "etcd" }}
|
{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "etcd" }}
|
||||||
{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "etcd-bin" }}
|
{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "etcd-bin" }}
|
||||||
|
|||||||
@ -29,8 +29,9 @@ labels:
|
|||||||
node_selector_value: enabled
|
node_selector_value: enabled
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
etcd:
|
static:
|
||||||
jobs: null
|
etcd:
|
||||||
|
jobs: null
|
||||||
|
|
||||||
pod:
|
pod:
|
||||||
affinity:
|
affinity:
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.api }}
|
{{- $dependencies := .Values.dependencies.static.api }}
|
||||||
|
|
||||||
{{- $mounts_glance_api := .Values.pod.mounts.glance_api.glance_api }}
|
{{- $mounts_glance_api := .Values.pod.mounts.glance_api.glance_api }}
|
||||||
{{- $mounts_glance_api_init := .Values.pod.mounts.glance_api.init_container }}
|
{{- $mounts_glance_api_init := .Values.pod.mounts.glance_api.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_registry }}
|
{{- if .Values.manifests.deployment_registry }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.registry }}
|
{{- $dependencies := .Values.dependencies.static.registry }}
|
||||||
|
|
||||||
{{- $mounts_glance_registry := .Values.pod.mounts.glance_registry.glance_registry }}
|
{{- $mounts_glance_registry := .Values.pod.mounts.glance_registry.glance_registry }}
|
||||||
{{- $mounts_glance_registry_init := .Values.pod.mounts.glance_registry.init_container }}
|
{{- $mounts_glance_registry_init := .Values.pod.mounts.glance_registry.init_container }}
|
||||||
|
|||||||
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.job_clean }}
|
{{- if .Values.manifests.job_clean }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- if .Values.bootstrap.enabled }}
|
{{- if .Values.bootstrap.enabled }}
|
||||||
{{- $dependencies := .Values.dependencies.clean }}
|
{{- $dependencies := .Values.dependencies.static.clean }}
|
||||||
|
|
||||||
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_db_drop }}
|
{{- if .Values.manifests.job_db_drop }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.db_drop }}
|
{{- $dependencies := .Values.dependencies.static.db_drop }}
|
||||||
|
|
||||||
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_storage_init }}
|
{{- if .Values.manifests.job_storage_init }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.storage_init }}
|
{{- $dependencies := .Values.dependencies.static.storage_init }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "glance-storage-init" }}
|
{{- $serviceAccountName := "glance-storage-init" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.pod_rally_test }}
|
{{- if .Values.manifests.pod_rally_test }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.tests }}
|
{{- $dependencies := .Values.dependencies.static.tests }}
|
||||||
|
|
||||||
{{- $mounts_tests := .Values.pod.mounts.glance_tests.glance_tests }}
|
{{- $mounts_tests := .Values.pod.mounts.glance_tests.glance_tests }}
|
||||||
{{- $mounts_tests_init := .Values.pod.mounts.glance_tests.init_container }}
|
{{- $mounts_tests_init := .Values.pod.mounts.glance_tests.init_container }}
|
||||||
|
|||||||
@ -303,81 +303,82 @@ volume:
|
|||||||
size: 2Gi
|
size: 2Gi
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
clean:
|
static:
|
||||||
jobs: null
|
api:
|
||||||
storage_init:
|
jobs:
|
||||||
services:
|
- glance-storage-init
|
||||||
db_init:
|
- glance-db-sync
|
||||||
services:
|
- glance-ks-user
|
||||||
- service: oslo_db
|
- glance-ks-endpoints
|
||||||
endpoint: internal
|
services:
|
||||||
db_sync:
|
- endpoint: internal
|
||||||
jobs:
|
service: oslo_db
|
||||||
- glance-db-init
|
- endpoint: internal
|
||||||
services:
|
service: identity
|
||||||
- service: oslo_db
|
bootstrap:
|
||||||
endpoint: internal
|
jobs:
|
||||||
db_drop:
|
- glance-storage-init
|
||||||
services:
|
- glance-db-sync
|
||||||
- service: oslo_db
|
- glance-ks-user
|
||||||
endpoint: internal
|
- glance-ks-endpoints
|
||||||
bootstrap:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- glance-storage-init
|
service: identity
|
||||||
- glance-db-sync
|
- endpoint: internal
|
||||||
- glance-ks-user
|
service: image
|
||||||
- glance-ks-endpoints
|
clean:
|
||||||
services:
|
jobs: null
|
||||||
- service: identity
|
db_drop:
|
||||||
endpoint: internal
|
services:
|
||||||
- service: image
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: oslo_db
|
||||||
ks_user:
|
db_init:
|
||||||
services:
|
services:
|
||||||
- service: identity
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: oslo_db
|
||||||
ks_service:
|
db_sync:
|
||||||
services:
|
jobs:
|
||||||
- service: identity
|
- glance-db-init
|
||||||
endpoint: internal
|
services:
|
||||||
ks_endpoints:
|
- endpoint: internal
|
||||||
jobs:
|
service: oslo_db
|
||||||
- glance-ks-service
|
ks_endpoints:
|
||||||
services:
|
jobs:
|
||||||
- service: identity
|
- glance-ks-service
|
||||||
endpoint: internal
|
services:
|
||||||
api:
|
- endpoint: internal
|
||||||
jobs:
|
service: identity
|
||||||
- glance-storage-init
|
ks_service:
|
||||||
- glance-db-sync
|
services:
|
||||||
- glance-ks-user
|
- endpoint: internal
|
||||||
- glance-ks-endpoints
|
service: identity
|
||||||
services:
|
ks_user:
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: identity
|
service: identity
|
||||||
endpoint: internal
|
registry:
|
||||||
registry:
|
jobs:
|
||||||
jobs:
|
- glance-storage-init
|
||||||
- glance-storage-init
|
- glance-db-sync
|
||||||
- glance-db-sync
|
- glance-ks-user
|
||||||
- glance-ks-user
|
- glance-ks-endpoints
|
||||||
- glance-ks-endpoints
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: identity
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: image
|
service: image
|
||||||
endpoint: internal
|
storage_init:
|
||||||
tests:
|
services: null
|
||||||
services:
|
tests:
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: identity
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: image
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
|
service: image
|
||||||
|
|
||||||
# Names of secrets used by bootstrap and environmental checks
|
# Names of secrets used by bootstrap and environmental checks
|
||||||
secrets:
|
secrets:
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.daemonset_metricd }}
|
{{- if .Values.manifests.daemonset_metricd }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.metricd }}
|
{{- $dependencies := .Values.dependencies.static.metricd }}
|
||||||
|
|
||||||
{{- $mounts_gnocchi_metricd := .Values.pod.mounts.gnocchi_metricd.gnocchi_metricd }}
|
{{- $mounts_gnocchi_metricd := .Values.pod.mounts.gnocchi_metricd.gnocchi_metricd }}
|
||||||
{{- $mounts_gnocchi_metricd_init := .Values.pod.mounts.gnocchi_metricd.init_container }}
|
{{- $mounts_gnocchi_metricd_init := .Values.pod.mounts.gnocchi_metricd.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.daemonset_statsd }}
|
{{- if .Values.manifests.daemonset_statsd }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.statsd }}
|
{{- $dependencies := .Values.dependencies.static.statsd }}
|
||||||
|
|
||||||
{{- $mounts_gnocchi_statsd := .Values.pod.mounts.gnocchi_statsd.gnocchi_statsd }}
|
{{- $mounts_gnocchi_statsd := .Values.pod.mounts.gnocchi_statsd.gnocchi_statsd }}
|
||||||
{{- $mounts_gnocchi_statsd_init := .Values.pod.mounts.gnocchi_statsd.init_container }}
|
{{- $mounts_gnocchi_statsd_init := .Values.pod.mounts.gnocchi_statsd.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.api }}
|
{{- $dependencies := .Values.dependencies.static.api }}
|
||||||
|
|
||||||
{{- $mounts_gnocchi_api := .Values.pod.mounts.gnocchi_api.gnocchi_api }}
|
{{- $mounts_gnocchi_api := .Values.pod.mounts.gnocchi_api.gnocchi_api }}
|
||||||
{{- $mounts_gnocchi_api_init := .Values.pod.mounts.gnocchi_api.init_container }}
|
{{- $mounts_gnocchi_api_init := .Values.pod.mounts.gnocchi_api.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_clean }}
|
{{- if .Values.manifests.job_clean }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.clean }}
|
{{- $dependencies := .Values.dependencies.static.clean }}
|
||||||
|
|
||||||
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_db_init_indexer }}
|
{{- if .Values.manifests.job_db_init_indexer }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.db_init_postgresql }}
|
{{- $dependencies := .Values.dependencies.static.db_init_postgresql }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "gnocchi-db-init-indexer" }}
|
{{- $serviceAccountName := "gnocchi-db-init-indexer" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_db_sync }}
|
{{- if .Values.manifests.job_db_sync }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.db_sync }}
|
{{- $dependencies := .Values.dependencies.static.db_sync }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "gnocchi-db-sync" }}
|
{{- $serviceAccountName := "gnocchi-db-sync" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_storage_init }}
|
{{- if .Values.manifests.job_storage_init }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.storage_init }}
|
{{- $dependencies := .Values.dependencies.static.storage_init }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "gnocchi-storage-init" }}
|
{{- $serviceAccountName := "gnocchi-storage-init" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.pod_gnocchi_test }}
|
{{- if .Values.manifests.pod_gnocchi_test }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.tests }}
|
{{- $dependencies := .Values.dependencies.static.tests }}
|
||||||
|
|
||||||
{{- $mounts_gnocchi_tests := .Values.pod.mounts.gnocchi_tests.gnocchi_tests }}
|
{{- $mounts_gnocchi_tests := .Values.pod.mounts.gnocchi_tests.gnocchi_tests }}
|
||||||
{{- $mounts_gnocchi_tests_init := .Values.pod.mounts.gnocchi_tests.init_container }}
|
{{- $mounts_gnocchi_tests_init := .Values.pod.mounts.gnocchi_tests.init_container }}
|
||||||
|
|||||||
@ -53,88 +53,89 @@ network:
|
|||||||
port: 8125
|
port: 8125
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
clean:
|
static:
|
||||||
services:
|
api:
|
||||||
storage_init:
|
jobs:
|
||||||
services:
|
- gnocchi-storage-init
|
||||||
db_init:
|
- gnocchi-db-sync
|
||||||
services:
|
- gnocchi-ks-endpoints
|
||||||
- service: oslo_db
|
- gnocchi-ks-service
|
||||||
endpoint: internal
|
- gnocchi-ks-user
|
||||||
db_init_postgresql:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
services:
|
service: identity
|
||||||
- service: oslo_db_postgresql
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: oslo_db
|
||||||
db_sync:
|
clean:
|
||||||
jobs:
|
services: null
|
||||||
- gnocchi-storage-init
|
db_init:
|
||||||
- gnocchi-db-init
|
services:
|
||||||
- gnocchi-db-init-indexer
|
- endpoint: internal
|
||||||
services:
|
service: oslo_db
|
||||||
- service: oslo_db_postgresql
|
db_init_postgresql:
|
||||||
endpoint: internal
|
jobs: null
|
||||||
ks_user:
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: oslo_db_postgresql
|
||||||
endpoint: internal
|
db_sync:
|
||||||
ks_service:
|
jobs:
|
||||||
services:
|
- gnocchi-storage-init
|
||||||
- service: identity
|
- gnocchi-db-init
|
||||||
endpoint: internal
|
- gnocchi-db-init-indexer
|
||||||
ks_endpoints:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- gnocchi-ks-service
|
service: oslo_db_postgresql
|
||||||
services:
|
ks_endpoints:
|
||||||
- service: identity
|
jobs:
|
||||||
endpoint: internal
|
- gnocchi-ks-service
|
||||||
api:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- gnocchi-storage-init
|
service: identity
|
||||||
- gnocchi-db-sync
|
ks_service:
|
||||||
- gnocchi-ks-endpoints
|
services:
|
||||||
- gnocchi-ks-service
|
- endpoint: internal
|
||||||
- gnocchi-ks-user
|
service: identity
|
||||||
services:
|
ks_user:
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: identity
|
||||||
endpoint: internal
|
metricd:
|
||||||
statsd:
|
jobs:
|
||||||
jobs:
|
- gnocchi-storage-init
|
||||||
- gnocchi-storage-init
|
- gnocchi-db-sync
|
||||||
- gnocchi-db-sync
|
- gnocchi-ks-user
|
||||||
- gnocchi-ks-user
|
- gnocchi-ks-service
|
||||||
- gnocchi-ks-service
|
- gnocchi-ks-endpoints
|
||||||
- gnocchi-ks-endpoints
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db_postgresql
|
service: oslo_db_postgresql
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: metric
|
service: metric
|
||||||
endpoint: internal
|
statsd:
|
||||||
metricd:
|
jobs:
|
||||||
jobs:
|
- gnocchi-storage-init
|
||||||
- gnocchi-storage-init
|
- gnocchi-db-sync
|
||||||
- gnocchi-db-sync
|
- gnocchi-ks-user
|
||||||
- gnocchi-ks-user
|
- gnocchi-ks-service
|
||||||
- gnocchi-ks-service
|
- gnocchi-ks-endpoints
|
||||||
- gnocchi-ks-endpoints
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db_postgresql
|
service: oslo_db_postgresql
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: metric
|
service: metric
|
||||||
endpoint: internal
|
storage_init:
|
||||||
tests:
|
services: null
|
||||||
jobs:
|
tests:
|
||||||
- gnocchi-storage-init
|
jobs:
|
||||||
- gnocchi-db-sync
|
- gnocchi-storage-init
|
||||||
services:
|
- gnocchi-db-sync
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: oslo_db_postgresql
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: metric
|
service: oslo_db_postgresql
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
|
service: metric
|
||||||
|
|
||||||
pod:
|
pod:
|
||||||
user:
|
user:
|
||||||
|
|||||||
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.cron_job_engine_cleaner }}
|
{{- if .Values.manifests.cron_job_engine_cleaner }}
|
||||||
{{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }}
|
{{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }}
|
||||||
{{- $envAll := . }}
|
{{- $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 := .Values.pod.mounts.heat_engine_cleaner.heat_engine_cleaner }}
|
||||||
{{- $mounts_heat_engine_cleaner_init := .Values.pod.mounts.heat_engine_cleaner.init_container }}
|
{{- $mounts_heat_engine_cleaner_init := .Values.pod.mounts.heat_engine_cleaner.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.api }}
|
{{- $dependencies := .Values.dependencies.static.api }}
|
||||||
|
|
||||||
{{- $mounts_heat_api := .Values.pod.mounts.heat_api.heat_api }}
|
{{- $mounts_heat_api := .Values.pod.mounts.heat_api.heat_api }}
|
||||||
{{- $mounts_heat_api_init := .Values.pod.mounts.heat_api.init_container }}
|
{{- $mounts_heat_api_init := .Values.pod.mounts.heat_api.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_cfn }}
|
{{- if .Values.manifests.deployment_cfn }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.cfn }}
|
{{- $dependencies := .Values.dependencies.static.cfn }}
|
||||||
|
|
||||||
{{- $mounts_heat_cfn := .Values.pod.mounts.heat_cfn.heat_cfn }}
|
{{- $mounts_heat_cfn := .Values.pod.mounts.heat_cfn.heat_cfn }}
|
||||||
{{- $mounts_heat_cfn_init := .Values.pod.mounts.heat_cfn.init_container }}
|
{{- $mounts_heat_cfn_init := .Values.pod.mounts.heat_cfn.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_cloudwatch }}
|
{{- if .Values.manifests.deployment_cloudwatch }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.cloudwatch }}
|
{{- $dependencies := .Values.dependencies.static.cloudwatch }}
|
||||||
|
|
||||||
{{- $mounts_heat_cloudwatch := .Values.pod.mounts.heat_cloudwatch.heat_cloudwatch }}
|
{{- $mounts_heat_cloudwatch := .Values.pod.mounts.heat_cloudwatch.heat_cloudwatch }}
|
||||||
{{- $mounts_heat_cloudwatch_init := .Values.pod.mounts.heat_cloudwatch.init_container }}
|
{{- $mounts_heat_cloudwatch_init := .Values.pod.mounts.heat_cloudwatch.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if or ( .Values.manifests.deployment_engine ) ( .Values.manifests.statefulset_engine ) }}
|
{{- if or ( .Values.manifests.deployment_engine ) ( .Values.manifests.statefulset_engine ) }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.engine }}
|
{{- $dependencies := .Values.dependencies.static.engine }}
|
||||||
|
|
||||||
{{- $mounts_heat_engine := .Values.pod.mounts.heat_engine.heat_engine }}
|
{{- $mounts_heat_engine := .Values.pod.mounts.heat_engine.heat_engine }}
|
||||||
{{- $mounts_heat_engine_init := .Values.pod.mounts.heat_engine.init_container }}
|
{{- $mounts_heat_engine_init := .Values.pod.mounts.heat_engine.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_db_drop }}
|
{{- if .Values.manifests.job_db_drop }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.db_drop }}
|
{{- $dependencies := .Values.dependencies.static.db_drop }}
|
||||||
|
|
||||||
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
{{- $randStringSuffix := randAlphaNum 5 | lower }}
|
||||||
|
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_ks_user_domain }}
|
{{- if .Values.manifests.job_ks_user_domain }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.ks_user }}
|
{{- $dependencies := .Values.dependencies.static.ks_user }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "heat-ks-user-domain" }}
|
{{- $serviceAccountName := "heat-ks-user-domain" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -15,7 +15,7 @@ limitations under the License.
|
|||||||
*/}}
|
*/}}
|
||||||
|
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.trusts }}
|
{{- $dependencies := .Values.dependencies.static.trusts }}
|
||||||
|
|
||||||
{{- $mounts_heat_trusts := .Values.pod.mounts.heat_trusts.heat_trusts }}
|
{{- $mounts_heat_trusts := .Values.pod.mounts.heat_trusts.heat_trusts }}
|
||||||
{{- $mounts_heat_trusts_init := .Values.pod.mounts.heat_trusts.init_container }}
|
{{- $mounts_heat_trusts_init := .Values.pod.mounts.heat_trusts.init_container }}
|
||||||
|
|||||||
193
heat/values.yaml
193
heat/values.yaml
@ -276,102 +276,103 @@ bootstrap:
|
|||||||
openstack token issue
|
openstack token issue
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
db_init:
|
static:
|
||||||
services:
|
api:
|
||||||
- service: oslo_db
|
jobs:
|
||||||
endpoint: internal
|
- heat-db-sync
|
||||||
db_sync:
|
- heat-ks-user
|
||||||
jobs:
|
- heat-trustee-ks-user
|
||||||
- heat-db-init
|
- heat-domain-ks-user
|
||||||
services:
|
- heat-ks-endpoints
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
db_drop:
|
service: oslo_db
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: identity
|
||||||
endpoint: internal
|
cfn:
|
||||||
ks_user:
|
jobs:
|
||||||
services:
|
- heat-db-sync
|
||||||
- service: identity
|
- heat-ks-user
|
||||||
endpoint: internal
|
- heat-trustee-ks-user
|
||||||
ks_service:
|
- heat-domain-ks-user
|
||||||
services:
|
- heat-ks-endpoints
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
ks_endpoints:
|
service: oslo_db
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- heat-ks-service
|
service: identity
|
||||||
services:
|
cloudwatch:
|
||||||
- service: identity
|
jobs:
|
||||||
endpoint: internal
|
- heat-db-sync
|
||||||
trusts:
|
- heat-ks-user
|
||||||
jobs:
|
- heat-trustee-ks-user
|
||||||
- heat-ks-user
|
- heat-domain-ks-user
|
||||||
- heat-trustee-ks-user
|
- heat-ks-endpoints
|
||||||
- heat-domain-ks-user
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: oslo_db
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
api:
|
service: identity
|
||||||
jobs:
|
db_drop:
|
||||||
- heat-db-sync
|
services:
|
||||||
- heat-ks-user
|
- endpoint: internal
|
||||||
- heat-trustee-ks-user
|
service: oslo_db
|
||||||
- heat-domain-ks-user
|
db_init:
|
||||||
- heat-ks-endpoints
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: oslo_db
|
||||||
endpoint: internal
|
db_sync:
|
||||||
- service: identity
|
jobs:
|
||||||
endpoint: internal
|
- heat-db-init
|
||||||
cfn:
|
services:
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- heat-db-sync
|
service: oslo_db
|
||||||
- heat-ks-user
|
engine:
|
||||||
- heat-trustee-ks-user
|
jobs:
|
||||||
- heat-domain-ks-user
|
- heat-db-sync
|
||||||
- heat-ks-endpoints
|
- heat-ks-user
|
||||||
services:
|
- heat-trustee-ks-user
|
||||||
- service: oslo_db
|
- heat-domain-ks-user
|
||||||
endpoint: internal
|
- heat-ks-endpoints
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
cloudwatch:
|
service: oslo_db
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- heat-db-sync
|
service: identity
|
||||||
- heat-ks-user
|
engine_cleaner:
|
||||||
- heat-trustee-ks-user
|
jobs:
|
||||||
- heat-domain-ks-user
|
- heat-db-sync
|
||||||
- heat-ks-endpoints
|
- heat-ks-user
|
||||||
services:
|
- heat-trustee-ks-user
|
||||||
- service: oslo_db
|
- heat-domain-ks-user
|
||||||
endpoint: internal
|
- heat-ks-endpoints
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
engine:
|
service: oslo_db
|
||||||
jobs:
|
- endpoint: internal
|
||||||
- heat-db-sync
|
service: identity
|
||||||
- heat-ks-user
|
ks_endpoints:
|
||||||
- heat-trustee-ks-user
|
jobs:
|
||||||
- heat-domain-ks-user
|
- heat-ks-service
|
||||||
- heat-ks-endpoints
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: identity
|
||||||
endpoint: internal
|
ks_service:
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
engine_cleaner:
|
service: identity
|
||||||
jobs:
|
ks_user:
|
||||||
- heat-db-sync
|
services:
|
||||||
- heat-ks-user
|
- endpoint: internal
|
||||||
- heat-trustee-ks-user
|
service: identity
|
||||||
- heat-domain-ks-user
|
trusts:
|
||||||
- heat-ks-endpoints
|
jobs:
|
||||||
services:
|
- heat-ks-user
|
||||||
- service: oslo_db
|
- heat-trustee-ks-user
|
||||||
endpoint: internal
|
- heat-domain-ks-user
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
|
service: identity
|
||||||
|
|
||||||
# Names of secrets used by bootstrap and environmental checks
|
# Names of secrets used by bootstrap and environmental checks
|
||||||
secrets:
|
secrets:
|
||||||
|
|||||||
@ -23,7 +23,7 @@ limitations under the License.
|
|||||||
{{- $envAll := index . "envAll" -}}
|
{{- $envAll := index . "envAll" -}}
|
||||||
{{- $serviceName := index . "serviceName" -}}
|
{{- $serviceName := index . "serviceName" -}}
|
||||||
{{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}}
|
{{- $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 -}}
|
{{- $podVolMounts := index . "podVolMounts" | default false -}}
|
||||||
{{- $podVols := index . "podVols" | default false -}}
|
{{- $podVols := index . "podVols" | default false -}}
|
||||||
{{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}}
|
{{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}}
|
||||||
|
|||||||
@ -28,7 +28,7 @@ limitations under the License.
|
|||||||
{{- $envAll := index . "envAll" -}}
|
{{- $envAll := index . "envAll" -}}
|
||||||
{{- $serviceName := index . "serviceName" -}}
|
{{- $serviceName := index . "serviceName" -}}
|
||||||
{{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}}
|
{{- $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" ) -}}
|
{{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}}
|
||||||
{{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}}
|
{{- $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" ) -}}
|
{{- $dbToInit := index . "dbToInit" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}}
|
||||||
|
|||||||
@ -23,7 +23,7 @@ limitations under the License.
|
|||||||
{{- $envAll := index . "envAll" -}}
|
{{- $envAll := index . "envAll" -}}
|
||||||
{{- $serviceName := index . "serviceName" -}}
|
{{- $serviceName := index . "serviceName" -}}
|
||||||
{{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}}
|
{{- $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" ) -}}
|
{{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}}
|
||||||
{{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}}
|
{{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}}
|
||||||
{{- $podVolMounts := index . "podVolMounts" | default false -}}
|
{{- $podVolMounts := index . "podVolMounts" | default false -}}
|
||||||
|
|||||||
@ -24,7 +24,7 @@ limitations under the License.
|
|||||||
{{- $serviceName := index . "serviceName" -}}
|
{{- $serviceName := index . "serviceName" -}}
|
||||||
{{- $serviceTypes := index . "serviceTypes" -}}
|
{{- $serviceTypes := index . "serviceTypes" -}}
|
||||||
{{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}}
|
{{- $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" ) -}}
|
{{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}}
|
||||||
{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
|
{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
|
||||||
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@ limitations under the License.
|
|||||||
{{- $serviceName := index . "serviceName" -}}
|
{{- $serviceName := index . "serviceName" -}}
|
||||||
{{- $serviceTypes := index . "serviceTypes" -}}
|
{{- $serviceTypes := index . "serviceTypes" -}}
|
||||||
{{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}}
|
{{- $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" ) -}}
|
{{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}}
|
||||||
{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
|
{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
|
||||||
|
|
||||||
|
|||||||
@ -23,7 +23,7 @@ limitations under the License.
|
|||||||
{{- $envAll := index . "envAll" -}}
|
{{- $envAll := index . "envAll" -}}
|
||||||
{{- $serviceName := index . "serviceName" -}}
|
{{- $serviceName := index . "serviceName" -}}
|
||||||
{{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}}
|
{{- $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" ) -}}
|
{{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}}
|
||||||
{{- $serviceUser := index . "serviceUser" | default $serviceName -}}
|
{{- $serviceUser := index . "serviceUser" | default $serviceName -}}
|
||||||
{{- $serviceUserPretty := $serviceUser | replace "_" "-" -}}
|
{{- $serviceUserPretty := $serviceUser | replace "_" "-" -}}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment }}
|
{{- if .Values.manifests.deployment }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.dashboard }}
|
{{- $dependencies := .Values.dependencies.static.dashboard }}
|
||||||
|
|
||||||
{{- $mounts_horizon := .Values.pod.mounts.horizon.horizon }}
|
{{- $mounts_horizon := .Values.pod.mounts.horizon.horizon }}
|
||||||
{{- $mounts_horizon_init := .Values.pod.mounts.horizon.init_container }}
|
{{- $mounts_horizon_init := .Values.pod.mounts.horizon.init_container }}
|
||||||
|
|||||||
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.job_db_drop }}
|
{{- if .Values.manifests.job_db_drop }}
|
||||||
|
|
||||||
{{- $envAll := . }}
|
{{- $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 := .Values.pod.mounts.horizon_db_init.horizon_db_init }}
|
||||||
{{- $mounts_horizon_db_init_init := .Values.pod.mounts.horizon_db_init.init_container }}
|
{{- $mounts_horizon_db_init_init := .Values.pod.mounts.horizon_db_init.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_db_sync }}
|
{{- if .Values.manifests.job_db_sync }}
|
||||||
{{- $envAll := . }}
|
{{- $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 := .Values.pod.mounts.horizon_db_sync.horizon_db_sync }}
|
||||||
{{- $mounts_horizon_db_sync_init := .Values.pod.mounts.horizon_db_sync.init_container }}
|
{{- $mounts_horizon_db_sync_init := .Values.pod.mounts.horizon_db_sync.init_container }}
|
||||||
|
|||||||
@ -1129,36 +1129,37 @@ conf:
|
|||||||
os_compute_api:os-server-external-events:discoverable: "@"
|
os_compute_api:os-server-external-events:discoverable: "@"
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
dashboard:
|
static:
|
||||||
jobs:
|
dashboard:
|
||||||
- horizon-db-sync
|
jobs:
|
||||||
services:
|
- horizon-db-sync
|
||||||
- service: oslo_cache
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: oslo_cache
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
db_init:
|
service: oslo_db
|
||||||
services:
|
db_drop:
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
db_sync:
|
service: oslo_db
|
||||||
jobs:
|
db_init:
|
||||||
- horizon-db-init
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: oslo_db
|
service: oslo_db
|
||||||
endpoint: internal
|
db_sync:
|
||||||
db_drop:
|
jobs:
|
||||||
services:
|
- horizon-db-init
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
|
service: oslo_db
|
||||||
|
|
||||||
pod:
|
pod:
|
||||||
affinity:
|
affinity:
|
||||||
anti:
|
anti:
|
||||||
type:
|
type:
|
||||||
default: preferredDuringSchedulingIgnoredDuringExecution
|
default: preferredDuringSchedulingIgnoredDuringExecution
|
||||||
topologyKey:
|
topologyKey:
|
||||||
default: kubernetes.io/hostname
|
default: kubernetes.io/hostname
|
||||||
mounts:
|
mounts:
|
||||||
horizon_db_init:
|
horizon_db_init:
|
||||||
init_container: null
|
init_container: null
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_error }}
|
{{- if .Values.manifests.deployment_error }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.error_pages }}
|
{{- $dependencies := .Values.dependencies.static.error_pages }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ingress-error-pages"}}
|
{{- $serviceAccountName := "ingress-error-pages"}}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_ingress }}
|
{{- if .Values.manifests.deployment_ingress }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.ingress }}
|
{{- $dependencies := .Values.dependencies.static.ingress }}
|
||||||
|
|
||||||
{{- if empty .Values.conf.controller.INGRESS_CLASS -}}
|
{{- if empty .Values.conf.controller.INGRESS_CLASS -}}
|
||||||
{{- if eq .Values.deployment.mode "cluster" }}
|
{{- if eq .Values.deployment.mode "cluster" }}
|
||||||
|
|||||||
@ -95,10 +95,11 @@ network:
|
|||||||
external_policy_local: false
|
external_policy_local: false
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
error_pages:
|
static:
|
||||||
jobs: null
|
error_pages:
|
||||||
ingress:
|
jobs: null
|
||||||
jobs: null
|
ingress:
|
||||||
|
jobs: null
|
||||||
|
|
||||||
monitoring:
|
monitoring:
|
||||||
prometheus:
|
prometheus:
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.api }}
|
{{- $dependencies := .Values.dependencies.static.api }}
|
||||||
|
|
||||||
{{- $mounts_ironic_api := .Values.pod.mounts.ironic_api.ironic_api }}
|
{{- $mounts_ironic_api := .Values.pod.mounts.ironic_api.ironic_api }}
|
||||||
{{- $mounts_ironic_api_init := .Values.pod.mounts.ironic_api.init_container }}
|
{{- $mounts_ironic_api_init := .Values.pod.mounts.ironic_api.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_manage_cleaning_network }}
|
{{- if .Values.manifests.job_manage_cleaning_network }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.manage_cleaning_network }}
|
{{- $dependencies := .Values.dependencies.static.manage_cleaning_network }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ironic-manage-cleaning-network" }}
|
{{- $serviceAccountName := "ironic-manage-cleaning-network" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.statefulset_conductor }}
|
{{- if .Values.manifests.statefulset_conductor }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.conductor }}
|
{{- $dependencies := .Values.dependencies.static.conductor }}
|
||||||
|
|
||||||
{{- $mounts_ironic_conductor := .Values.pod.mounts.ironic_conductor.ironic_conductor }}
|
{{- $mounts_ironic_conductor := .Values.pod.mounts.ironic_conductor.ironic_conductor }}
|
||||||
{{- $mounts_ironic_conductor_init := .Values.pod.mounts.ironic_conductor.init_container }}
|
{{- $mounts_ironic_conductor_init := .Values.pod.mounts.ironic_conductor.init_container }}
|
||||||
|
|||||||
@ -148,70 +148,71 @@ bootstrap:
|
|||||||
)
|
)
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
manage_cleaning_network:
|
static:
|
||||||
services:
|
api:
|
||||||
- service: network
|
jobs:
|
||||||
endpoint: internal
|
- ironic-db-sync
|
||||||
db_init:
|
- ironic-ks-user
|
||||||
services:
|
- ironic-ks-endpoints
|
||||||
- service: oslo_db
|
- ironic-manage-cleaning-network
|
||||||
endpoint: internal
|
services:
|
||||||
db_sync:
|
- endpoint: internal
|
||||||
jobs:
|
service: oslo_db
|
||||||
- ironic-db-init
|
- endpoint: internal
|
||||||
services:
|
service: identity
|
||||||
- service: oslo_db
|
bootstrap:
|
||||||
endpoint: internal
|
jobs:
|
||||||
ks_user:
|
- ironic-db-sync
|
||||||
services:
|
- ironic-ks-user
|
||||||
- service: identity
|
- ironic-ks-endpoints
|
||||||
endpoint: internal
|
services:
|
||||||
ks_service:
|
- endpoint: internal
|
||||||
services:
|
service: identity
|
||||||
- service: identity
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: image
|
||||||
ks_endpoints:
|
- endpoint: internal
|
||||||
jobs:
|
service: baremetal
|
||||||
- ironic-ks-service
|
conductor:
|
||||||
services:
|
jobs:
|
||||||
- service: identity
|
- ironic-db-sync
|
||||||
endpoint: internal
|
- ironic-ks-user
|
||||||
bootstrap:
|
- ironic-ks-endpoints
|
||||||
jobs:
|
- ironic-manage-cleaning-network
|
||||||
- ironic-db-sync
|
services:
|
||||||
- ironic-ks-user
|
- endpoint: internal
|
||||||
- ironic-ks-endpoints
|
service: oslo_db
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: identity
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: image
|
service: baremetal
|
||||||
endpoint: internal
|
db_init:
|
||||||
- service: baremetal
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
api:
|
service: oslo_db
|
||||||
jobs:
|
db_sync:
|
||||||
- ironic-db-sync
|
jobs:
|
||||||
- ironic-ks-user
|
- ironic-db-init
|
||||||
- ironic-ks-endpoints
|
services:
|
||||||
- ironic-manage-cleaning-network
|
- endpoint: internal
|
||||||
services:
|
service: oslo_db
|
||||||
- service: oslo_db
|
ks_endpoints:
|
||||||
endpoint: internal
|
jobs:
|
||||||
- service: identity
|
- ironic-ks-service
|
||||||
endpoint: internal
|
services:
|
||||||
conductor:
|
- endpoint: internal
|
||||||
jobs:
|
service: identity
|
||||||
- ironic-db-sync
|
ks_service:
|
||||||
- ironic-ks-user
|
services:
|
||||||
- ironic-ks-endpoints
|
- endpoint: internal
|
||||||
- ironic-manage-cleaning-network
|
service: identity
|
||||||
services:
|
ks_user:
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
- service: identity
|
service: identity
|
||||||
endpoint: internal
|
manage_cleaning_network:
|
||||||
- service: baremetal
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
|
service: network
|
||||||
|
|
||||||
# Names of secrets used by bootstrap and environmental checks
|
# Names of secrets used by bootstrap and environmental checks
|
||||||
secrets:
|
secrets:
|
||||||
|
|||||||
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.cron_credential_rotate }}
|
{{- if .Values.manifests.cron_credential_rotate }}
|
||||||
{{- if .Capabilities.APIVersions.Has "batch/v2alpha1"}}
|
{{- if .Capabilities.APIVersions.Has "batch/v2alpha1"}}
|
||||||
{{- $envAll := . }}
|
{{- $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 := .Values.pod.mounts.keystone_credential_rotate.keystone_credential_rotate }}
|
||||||
{{- $mounts_keystone_credential_rotate_init := .Values.pod.mounts.keystone_credential_rotate.init_container }}
|
{{- $mounts_keystone_credential_rotate_init := .Values.pod.mounts.keystone_credential_rotate.init_container }}
|
||||||
|
|||||||
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.cron_fernet_rotate }}
|
{{- if .Values.manifests.cron_fernet_rotate }}
|
||||||
{{- if and (eq .Values.conf.keystone.token.provider "fernet") (.Capabilities.APIVersions.Has "batch/v2alpha1") }}
|
{{- if and (eq .Values.conf.keystone.token.provider "fernet") (.Capabilities.APIVersions.Has "batch/v2alpha1") }}
|
||||||
{{- $envAll := . }}
|
{{- $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 := .Values.pod.mounts.keystone_fernet_rotate.keystone_fernet_rotate }}
|
||||||
{{- $mounts_keystone_fernet_rotate_init := .Values.pod.mounts.keystone_fernet_rotate.init_container }}
|
{{- $mounts_keystone_fernet_rotate_init := .Values.pod.mounts.keystone_fernet_rotate.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.deployment_api }}
|
{{- if .Values.manifests.deployment_api }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.api }}
|
{{- $dependencies := .Values.dependencies.static.api }}
|
||||||
|
|
||||||
{{- $mounts_keystone_api := .Values.pod.mounts.keystone_api.keystone_api }}
|
{{- $mounts_keystone_api := .Values.pod.mounts.keystone_api.keystone_api }}
|
||||||
{{- $mounts_keystone_api_init := .Values.pod.mounts.keystone_api.init_container }}
|
{{- $mounts_keystone_api_init := .Values.pod.mounts.keystone_api.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_credential_setup }}
|
{{- if .Values.manifests.job_credential_setup }}
|
||||||
{{- $envAll := . }}
|
{{- $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 := .Values.pod.mounts.keystone_credential_setup.keystone_credential_setup }}
|
||||||
{{- $mounts_keystone_credential_setup_init := .Values.pod.mounts.keystone_credential_setup.init_container }}
|
{{- $mounts_keystone_credential_setup_init := .Values.pod.mounts.keystone_credential_setup.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_db_drop }}
|
{{- if .Values.manifests.job_db_drop }}
|
||||||
{{- $envAll := . }}
|
{{- $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 := .Values.pod.mounts.keystone_db_init.keystone_db_init }}
|
||||||
{{- $mounts_keystone_db_init_init := .Values.pod.mounts.keystone_db_init.init_container }}
|
{{- $mounts_keystone_db_init_init := .Values.pod.mounts.keystone_db_init.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.job_domain_manage }}
|
{{- if .Values.manifests.job_domain_manage }}
|
||||||
{{- $envAll := . }}
|
{{- $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 := .Values.pod.mounts.keystone_domain_manage.keystone_domain_manage }}
|
||||||
{{- $mounts_keystone_domain_manage_init := .Values.pod.mounts.keystone_domain_manage.init_container }}
|
{{- $mounts_keystone_domain_manage_init := .Values.pod.mounts.keystone_domain_manage.init_container }}
|
||||||
|
|||||||
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.job_fernet_setup }}
|
{{- if .Values.manifests.job_fernet_setup }}
|
||||||
{{- if eq .Values.conf.keystone.token.provider "fernet" }}
|
{{- if eq .Values.conf.keystone.token.provider "fernet" }}
|
||||||
{{- $envAll := . }}
|
{{- $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 := .Values.pod.mounts.keystone_fernet_setup.keystone_fernet_setup }}
|
||||||
{{- $mounts_keystone_fernet_setup_init := .Values.pod.mounts.keystone_fernet_setup.init_container }}
|
{{- $mounts_keystone_fernet_setup_init := .Values.pod.mounts.keystone_fernet_setup.init_container }}
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.pod_rally_test }}
|
{{- if .Values.manifests.pod_rally_test }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.tests }}
|
{{- $dependencies := .Values.dependencies.static.tests }}
|
||||||
|
|
||||||
{{- $mounts_tests := .Values.pod.mounts.keystone_tests.keystone_tests }}
|
{{- $mounts_tests := .Values.pod.mounts.keystone_tests.keystone_tests }}
|
||||||
{{- $mounts_tests_init := .Values.pod.mounts.keystone_tests.init_container }}
|
{{- $mounts_tests_init := .Values.pod.mounts.keystone_tests.init_container }}
|
||||||
|
|||||||
@ -74,56 +74,55 @@ network:
|
|||||||
port: 30357
|
port: 30357
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
api:
|
static:
|
||||||
jobs:
|
api:
|
||||||
- keystone-db-sync
|
jobs:
|
||||||
- keystone-credential-setup
|
- keystone-db-sync
|
||||||
# Comment line below when not running fernet tokens.
|
- keystone-credential-setup
|
||||||
- keystone-fernet-setup
|
- keystone-fernet-setup
|
||||||
services:
|
services:
|
||||||
- service: oslo_cache
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: oslo_cache
|
||||||
- service: oslo_db
|
- endpoint: internal
|
||||||
endpoint: internal
|
service: oslo_db
|
||||||
db_init:
|
bootstrap:
|
||||||
services:
|
jobs:
|
||||||
- service: oslo_db
|
- keystone-domain-manage
|
||||||
endpoint: internal
|
services:
|
||||||
db_sync:
|
- endpoint: internal
|
||||||
jobs:
|
service: identity
|
||||||
- keystone-db-init
|
credential_rotate:
|
||||||
- keystone-credential-setup
|
jobs:
|
||||||
# Comment line below when not running fernet tokens.
|
- keystone-credential-setup
|
||||||
- keystone-fernet-setup
|
credential_setup: null
|
||||||
services:
|
db_drop:
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
db_drop:
|
service: oslo_db
|
||||||
services:
|
db_init:
|
||||||
- service: oslo_db
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
fernet_setup:
|
service: oslo_db
|
||||||
fernet_rotate:
|
db_sync:
|
||||||
jobs:
|
jobs:
|
||||||
- keystone-fernet-setup
|
- keystone-db-init
|
||||||
credential_setup:
|
- keystone-credential-setup
|
||||||
credential_rotate:
|
- keystone-fernet-setup
|
||||||
jobs:
|
services:
|
||||||
- keystone-credential-setup
|
- endpoint: internal
|
||||||
tests:
|
service: oslo_db
|
||||||
services:
|
domain_manage:
|
||||||
- service: identity
|
services:
|
||||||
endpoint: internal
|
- endpoint: internal
|
||||||
bootstrap:
|
service: identity
|
||||||
services:
|
fernet_rotate:
|
||||||
- service: identity
|
jobs:
|
||||||
endpoint: internal
|
- keystone-fernet-setup
|
||||||
jobs:
|
fernet_setup: null
|
||||||
- keystone-domain-manage
|
tests:
|
||||||
domain_manage:
|
services:
|
||||||
services:
|
- endpoint: internal
|
||||||
- service: identity
|
service: identity
|
||||||
endpoint: internal
|
|
||||||
|
|
||||||
pod:
|
pod:
|
||||||
affinity:
|
affinity:
|
||||||
|
|||||||
@ -16,7 +16,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.statefulset }}
|
{{- if .Values.manifests.statefulset }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.ldap }}
|
{{- $dependencies := .Values.dependencies.static.ldap }}
|
||||||
|
|
||||||
{{- $serviceAccountName := "ldap" }}
|
{{- $serviceAccountName := "ldap" }}
|
||||||
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|||||||
@ -41,8 +41,9 @@ images:
|
|||||||
pull_policy: IfNotPresent
|
pull_policy: IfNotPresent
|
||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
ldap:
|
static:
|
||||||
jobs: null
|
ldap:
|
||||||
|
jobs: null
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
pvc:
|
pvc:
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user