From b311f861931adbc32da5fbab2e8034dbcc89b453 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Sun, 18 Feb 2018 23:35:57 -0600 Subject: [PATCH] Node Labels: update nodelabels to allow targeting of pods to nodes This PS updates the node labels to allow pods to be targeted to nodes on a per type basis. Change-Id: I45d5383d04fcd1d98740a18d86c1cfc2cb8ec409 --- barbican/templates/deployment-api.yaml | 2 +- barbican/templates/job-bootstrap.yaml | 2 +- barbican/templates/job-db-drop.yaml | 2 +- barbican/values.yaml | 5 +- .../cron-job-cinder-volume-usage-audit.yaml | 2 +- cinder/templates/deployment-api.yaml | 2 +- cinder/templates/deployment-backup.yaml | 2 +- cinder/templates/deployment-scheduler.yaml | 2 +- cinder/templates/deployment-volume.yaml | 2 +- cinder/templates/job-storage-init.yaml | 2 +- cinder/values.yaml | 14 +- congress/templates/deployment-api.yaml | 2 +- congress/templates/deployment-datasource.yaml | 2 +- .../templates/deployment-policy-engine.yaml | 2 +- congress/values.yaml | 11 +- etcd/templates/deployment.yaml | 2 +- etcd/values.yaml | 5 +- glance/templates/deployment-api.yaml | 2 +- glance/templates/deployment-registry.yaml | 2 +- glance/values.yaml | 8 +- gnocchi/templates/daemonset-metricd.yaml | 2 +- gnocchi/templates/daemonset-statsd.yaml | 2 +- gnocchi/templates/deployment-api.yaml | 2 +- gnocchi/values.yaml | 11 +- heat/templates/deployment-api.yaml | 2 +- heat/templates/deployment-cfn.yaml | 2 +- heat/templates/deployment-cloudwatch.yaml | 2 +- heat/templates/deployment-engine.yaml | 2 +- heat/values.yaml | 14 +- horizon/templates/deployment.yaml | 2 +- horizon/templates/job-db-drop.yaml | 2 +- horizon/templates/job-db-sync.yaml | 2 +- horizon/values.yaml | 5 +- ingress/templates/deployment-error.yaml | 2 +- ingress/templates/deployment-ingress.yaml | 2 +- ingress/values.yaml | 8 +- ironic/templates/deployment-api.yaml | 2 +- ironic/templates/job-bootstrap.yaml | 2 +- ironic/templates/job-ks-endpoints.yaml | 2 +- ironic/templates/job-ks-service.yaml | 2 +- ironic/templates/job-ks-user.yaml | 2 +- .../job-manage-cleaning-network.yaml | 2 +- ironic/templates/statefulset-conductor.yaml | 2 +- ironic/values.yaml | 8 +- .../templates/cron-job-credential-rotate.yaml | 2 +- .../templates/cron-job-fernet-rotate.yaml | 2 +- keystone/templates/deployment-api.yaml | 2 +- keystone/templates/job-bootstrap.yaml | 2 +- keystone/templates/job-credential-setup.yaml | 2 +- keystone/templates/job-db-drop.yaml | 2 +- keystone/templates/job-domain-manage.yaml | 2 +- keystone/templates/job-fernet-setup.yaml | 2 +- keystone/values.yaml | 5 +- ldap/templates/statefulset.yaml | 2 +- ldap/values.yaml | 5 +- magnum/templates/deployment-api.yaml | 2 +- magnum/templates/statefulset-conductor.yaml | 2 +- magnum/values.yaml | 8 +- memcached/templates/deployment.yaml | 2 +- memcached/values.yaml | 5 +- mistral/templates/deployment-api.yaml | 2 +- mistral/templates/deployment-executor.yaml | 2 +- mistral/templates/statefulset-engine.yaml | 2 +- .../templates/statefulset-event-engine.yaml | 2 +- mistral/values.yaml | 14 +- mongodb/templates/statefulset.yaml | 2 +- mongodb/values.yaml | 5 +- openvswitch/values.yaml | 4 +- postgresql/templates/statefulset.yaml | 2 +- postgresql/values.yaml | 5 +- rally/values.yaml | 2 - senlin/templates/deployment-api.yaml | 2 +- senlin/templates/statefulset-engine.yaml | 2 +- senlin/values.yaml | 8 +- .../multinode/armada-cluster-ingress.yaml | 8 +- .../armada/multinode/armada-lma.yaml | 8 +- .../armada/multinode/armada-osh.yaml | 184 +++++++++++++----- 77 files changed, 312 insertions(+), 146 deletions(-) diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index 8afd34a94e..8e3d8cc89d 100644 --- a/barbican/templates/deployment-api.yaml +++ b/barbican/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "barbican" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_barbican_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/barbican/templates/job-bootstrap.yaml b/barbican/templates/job-bootstrap.yaml index 7bfef649b7..537ba80d72 100644 --- a/barbican/templates/job-bootstrap.yaml +++ b/barbican/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_barbican_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/barbican/templates/job-db-drop.yaml b/barbican/templates/job-db-drop.yaml index 92d4a43d08..21fbdfe627 100644 --- a/barbican/templates/job-db-drop.yaml +++ b/barbican/templates/job-db-drop.yaml @@ -39,7 +39,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/barbican/values.yaml b/barbican/values.yaml index a2ff323fa0..fb793ba324 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -11,11 +11,12 @@ # limitations under the License. labels: + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled - node_selector_key: openstack-control-plane - node_selector_value: enabled release_group: null diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml index 4c6c57db40..1b8b828687 100644 --- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml +++ b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml @@ -44,7 +44,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_cinder_volume_usage_audit_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} containers: diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index 5e69dd9f43..9b0a7b2976 100644 --- a/cinder/templates/deployment-api.yaml +++ b/cinder/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "cinder" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_cinder_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml index e0bc1d8169..13de7fb04d 100644 --- a/cinder/templates/deployment-backup.yaml +++ b/cinder/templates/deployment-backup.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "cinder" "backup" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.backup.node_selector_key }}: {{ .Values.labels.backup.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_cinder_backup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }} diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index 3486811f91..b8d0844c50 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/cinder/templates/deployment-scheduler.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "cinder" "scheduler" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.scheduler.node_selector_key }}: {{ .Values.labels.scheduler.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_cinder_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }} diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index fe198f007e..ed213766dd 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/cinder/templates/deployment-volume.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "cinder" "volume" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.volume.node_selector_key }}: {{ .Values.labels.volume.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_cinder_volume_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if include "cinder.is_ceph_volume_configured" $envAll }} diff --git a/cinder/templates/job-storage-init.yaml b/cinder/templates/job-storage-init.yaml index b5dc7de1ae..a72b24098d 100644 --- a/cinder/templates/job-storage-init.yaml +++ b/cinder/templates/job-storage-init.yaml @@ -62,7 +62,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if include "cinder.is_ceph_volume_configured" $envAll }} diff --git a/cinder/values.yaml b/cinder/values.yaml index a9869835a3..0128827635 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -20,11 +20,21 @@ storage: ceph labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + backup: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled + scheduler: + node_selector_key: openstack-control-plane + node_selector_value: enabled + volume: + node_selector_key: openstack-control-plane + node_selector_value: enabled release_group: null diff --git a/congress/templates/deployment-api.yaml b/congress/templates/deployment-api.yaml index bd0c6e09c5..e04532a2e3 100644 --- a/congress/templates/deployment-api.yaml +++ b/congress/templates/deployment-api.yaml @@ -39,7 +39,7 @@ spec: initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} containers: - name: congress-api image: {{ .Values.images.tags.congress_api }} diff --git a/congress/templates/deployment-datasource.yaml b/congress/templates/deployment-datasource.yaml index a453795a41..f903e61ca1 100644 --- a/congress/templates/deployment-datasource.yaml +++ b/congress/templates/deployment-datasource.yaml @@ -39,7 +39,7 @@ spec: initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.datasource.node_selector_key }}: {{ .Values.labels.datasource.node_selector_value }} containers: - name: congress-datasource image: {{ .Values.images.tags.congress_datasource }} diff --git a/congress/templates/deployment-policy-engine.yaml b/congress/templates/deployment-policy-engine.yaml index 6a4542f5fe..7a76ac853b 100644 --- a/congress/templates/deployment-policy-engine.yaml +++ b/congress/templates/deployment-policy-engine.yaml @@ -39,7 +39,7 @@ spec: initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.policy_engine.node_selector_key }}: {{ .Values.labels.policy_engine.node_selector_value }} containers: - name: congress-policy-engine image: {{ .Values.images.tags.congress_policy_engine }} diff --git a/congress/values.yaml b/congress/values.yaml index 15e02a8c55..7ad70f96f0 100644 --- a/congress/values.yaml +++ b/congress/values.yaml @@ -15,11 +15,18 @@ # Default values for congress. labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + datasource: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled + policy_engine: + node_selector_key: openstack-control-plane + node_selector_value: enabled release_group: null diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml index cd2510afa1..f1ae96ca3a 100644 --- a/etcd/templates/deployment.yaml +++ b/etcd/templates/deployment.yaml @@ -34,7 +34,7 @@ spec: affinity: {{ tuple $envAll "etcd" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/etcd/values.yaml b/etcd/values.yaml index b7b0da1eb6..c447033448 100644 --- a/etcd/values.yaml +++ b/etcd/values.yaml @@ -24,8 +24,9 @@ images: pull_policy: IfNotPresent labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled network: host: etcd diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index 01fc2277c7..187a616b89 100644 --- a/glance/templates/deployment-api.yaml +++ b/glance/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "glance" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "600" }} initContainers: {{ tuple $envAll $dependencies $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index a38cbf427d..16bb146d4a 100644 --- a/glance/templates/deployment-registry.yaml +++ b/glance/templates/deployment-registry.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.registry.node_selector_key }}: {{ .Values.labels.registry.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.registry.timeout | default "600" }} initContainers: {{ tuple $envAll $dependencies $mounts_glance_registry_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/glance/values.yaml b/glance/values.yaml index ab5a6b99bc..2c5d24840c 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -21,11 +21,15 @@ storage: radosgw labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled + registry: + node_selector_key: openstack-control-plane + node_selector_value: enabled release_group: null diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml index a71d206430..6e884294da 100644 --- a/gnocchi/templates/daemonset-metricd.yaml +++ b/gnocchi/templates/daemonset-metricd.yaml @@ -40,7 +40,7 @@ spec: spec: serviceAccountName: {{ $serviceAccountName }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.metricd.node_selector_key }}: {{ .Values.labels.metricd.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_gnocchi_metricd_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement diff --git a/gnocchi/templates/daemonset-statsd.yaml b/gnocchi/templates/daemonset-statsd.yaml index 167ffcd3ce..03b2016a44 100644 --- a/gnocchi/templates/daemonset-statsd.yaml +++ b/gnocchi/templates/daemonset-statsd.yaml @@ -39,7 +39,7 @@ spec: spec: serviceAccountName: {{ $serviceAccountName }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.statsd.node_selector_key }}: {{ .Values.labels.statsd.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_gnocchi_statsd_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml index b20fcc786d..e288097d05 100644 --- a/gnocchi/templates/deployment-api.yaml +++ b/gnocchi/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "gnocchi" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_gnocchi_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index 3612176cfc..41734327ff 100644 --- a/gnocchi/values.yaml +++ b/gnocchi/values.yaml @@ -3,11 +3,18 @@ # Declare variables to be passed into your templates. labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled + metricd: + node_selector_key: openstack-control-plane + node_selector_value: enabled + statsd: + node_selector_key: openstack-control-plane + node_selector_value: enabled images: tags: diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index bd85e718ea..d61fb12edb 100644 --- a/heat/templates/deployment-api.yaml +++ b/heat/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "heat" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_heat_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index 4f358c70df..77886777ee 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/heat/templates/deployment-cfn.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "heat" "cfn" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.cfn.node_selector_key }}: {{ .Values.labels.cfn.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.cfn.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_heat_cfn_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index 4060a2bc1c..c42b9b927c 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/heat/templates/deployment-cloudwatch.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "heat" "cloudwatch" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.cloudwatch.node_selector_key }}: {{ .Values.labels.cloudwatch.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.cloudwatch.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_heat_cloudwatch_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/heat/templates/deployment-engine.yaml b/heat/templates/deployment-engine.yaml index 3768434fbb..ccc6a831f5 100644 --- a/heat/templates/deployment-engine.yaml +++ b/heat/templates/deployment-engine.yaml @@ -51,7 +51,7 @@ spec: affinity: {{- tuple $envAll "heat" "engine" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.engine.node_selector_key }}: {{ .Values.labels.engine.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.engine.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_heat_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/heat/values.yaml b/heat/values.yaml index 93a3afdbe7..d58d2bf576 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -20,8 +20,18 @@ release_group: null labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + cfn: + node_selector_key: openstack-control-plane + node_selector_value: enabled + cloudwatch: + node_selector_key: openstack-control-plane + node_selector_value: enabled + engine: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index 17777d23ef..fbe63ca80e 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "horizon" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.dashboard.node_selector_key }}: {{ .Values.labels.dashboard.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.horizon.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_horizon_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/horizon/templates/job-db-drop.yaml b/horizon/templates/job-db-drop.yaml index 4ac13a464f..c602834123 100644 --- a/horizon/templates/job-db-drop.yaml +++ b/horizon/templates/job-db-drop.yaml @@ -43,7 +43,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/horizon/templates/job-db-sync.yaml b/horizon/templates/job-db-sync.yaml index 403cbcd06b..bfeb5312c4 100644 --- a/horizon/templates/job-db-sync.yaml +++ b/horizon/templates/job-db-sync.yaml @@ -37,7 +37,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_horizon_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/horizon/values.yaml b/horizon/values.yaml index 1943635e92..f9cd3dfc14 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -29,8 +29,9 @@ images: release_group: null labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + dashboard: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml index c29e7f3f2c..a08781ba07 100644 --- a/ingress/templates/deployment-error.yaml +++ b/ingress/templates/deployment-error.yaml @@ -37,7 +37,7 @@ spec: affinity: {{ tuple $envAll "ingress" "error-pages" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.error_server.node_selector_key }}: {{ .Values.labels.error_server.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.error_pages.timeout | default "60" }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index b72d43ea18..9286cc9cd6 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -173,7 +173,7 @@ spec: {{ tuple $envAll "ingress" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} {{- end }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} {{- if .Values.network.host_namespace }} hostNetwork: true {{- end }} diff --git a/ingress/values.yaml b/ingress/values.yaml index b427440ed2..5b14b958c5 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -73,8 +73,12 @@ pod: cpu: "2000m" labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + error_server: + node_selector_key: openstack-control-plane + node_selector_value: enabled network: host_namespace: false diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml index 46a4cadc0d..32486060d4 100644 --- a/ironic/templates/deployment-api.yaml +++ b/ironic/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "ironic" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_ironic_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/ironic/templates/job-bootstrap.yaml b/ironic/templates/job-bootstrap.yaml index c1846813de..e7b932fd9b 100644 --- a/ironic/templates/job-bootstrap.yaml +++ b/ironic/templates/job-bootstrap.yaml @@ -37,7 +37,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_ironic_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ironic/templates/job-ks-endpoints.yaml b/ironic/templates/job-ks-endpoints.yaml index ff7c314635..135be427e0 100644 --- a/ironic/templates/job-ks-endpoints.yaml +++ b/ironic/templates/job-ks-endpoints.yaml @@ -34,7 +34,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ironic/templates/job-ks-service.yaml b/ironic/templates/job-ks-service.yaml index 91974b21ef..9592935ed1 100644 --- a/ironic/templates/job-ks-service.yaml +++ b/ironic/templates/job-ks-service.yaml @@ -34,7 +34,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ironic/templates/job-ks-user.yaml b/ironic/templates/job-ks-user.yaml index 168249998b..ebc3825a3f 100644 --- a/ironic/templates/job-ks-user.yaml +++ b/ironic/templates/job-ks-user.yaml @@ -34,7 +34,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ironic/templates/job-manage-cleaning-network.yaml b/ironic/templates/job-manage-cleaning-network.yaml index b741fc6c78..794465087b 100644 --- a/ironic/templates/job-manage-cleaning-network.yaml +++ b/ironic/templates/job-manage-cleaning-network.yaml @@ -34,7 +34,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml index 45e662be2b..82c80cb007 100644 --- a/ironic/templates/statefulset-conductor.yaml +++ b/ironic/templates/statefulset-conductor.yaml @@ -40,7 +40,7 @@ spec: affinity: {{ tuple $envAll "ironic" "conductor" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.conductor.node_selector_key }}: {{ .Values.labels.conductor.node_selector_value }} securityContext: runAsUser: 0 hostNetwork: True diff --git a/ironic/values.yaml b/ironic/values.yaml index ccfd595951..22a418d437 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -18,8 +18,12 @@ # name: value labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + conductor: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml index 3f694f45fc..6ad3f7f5ca 100644 --- a/keystone/templates/cron-job-credential-rotate.yaml +++ b/keystone/templates/cron-job-credential-rotate.yaml @@ -74,7 +74,7 @@ spec: {{ tuple $envAll $dependencies $mounts_keystone_credential_rotate_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: - name: keystone-credential-rotate image: {{ .Values.images.tags.keystone_credential_rotate }} diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml index d555b55fff..d56709c85e 100644 --- a/keystone/templates/cron-job-fernet-rotate.yaml +++ b/keystone/templates/cron-job-fernet-rotate.yaml @@ -74,7 +74,7 @@ spec: {{ tuple $envAll $dependencies $mounts_keystone_fernet_rotate_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: - name: keystone-fernet-rotate image: {{ .Values.images.tags.keystone_fernet_rotate }} diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml index d868924909..54c6f7727a 100644 --- a/keystone/templates/deployment-api.yaml +++ b/keystone/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "keystone" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_keystone_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/keystone/templates/job-bootstrap.yaml b/keystone/templates/job-bootstrap.yaml index 852b47dd1d..b60bd1d218 100644 --- a/keystone/templates/job-bootstrap.yaml +++ b/keystone/templates/job-bootstrap.yaml @@ -38,7 +38,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_keystone_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml index 42c376f55b..c8664e5682 100644 --- a/keystone/templates/job-credential-setup.yaml +++ b/keystone/templates/job-credential-setup.yaml @@ -67,7 +67,7 @@ spec: {{ tuple $envAll $dependencies $mounts_keystone_credential_setup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: - name: keystone-credential-setup image: {{ .Values.images.tags.keystone_credential_setup }} diff --git a/keystone/templates/job-db-drop.yaml b/keystone/templates/job-db-drop.yaml index 94a4839e1b..5678f057c6 100644 --- a/keystone/templates/job-db-drop.yaml +++ b/keystone/templates/job-db-drop.yaml @@ -42,7 +42,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/keystone/templates/job-domain-manage.yaml b/keystone/templates/job-domain-manage.yaml index e868a3a5d6..86274170d2 100644 --- a/keystone/templates/job-domain-manage.yaml +++ b/keystone/templates/job-domain-manage.yaml @@ -37,7 +37,7 @@ spec: serviceAccountName: {{ $serviceAccountName }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_keystone_domain_manage_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: keystone-domain-manage-init diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml index f2182c2c22..1f860b6c4d 100644 --- a/keystone/templates/job-fernet-setup.yaml +++ b/keystone/templates/job-fernet-setup.yaml @@ -68,7 +68,7 @@ spec: {{ tuple $envAll $dependencies $mounts_keystone_fernet_setup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} restartPolicy: OnFailure nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: - name: keystone-fernet-setup image: {{ .Values.images.tags.keystone_fernet_setup }} diff --git a/keystone/values.yaml b/keystone/values.yaml index 95ea8e90d8..eddd429add 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -18,8 +18,9 @@ # name: value labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/ldap/templates/statefulset.yaml b/ldap/templates/statefulset.yaml index 46f25d0a5b..efe052bfab 100644 --- a/ldap/templates/statefulset.yaml +++ b/ldap/templates/statefulset.yaml @@ -37,7 +37,7 @@ spec: affinity: {{ tuple $envAll "ldap" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ldap/values.yaml b/ldap/values.yaml index be9393b359..431cfa8419 100644 --- a/ldap/values.yaml +++ b/ldap/values.yaml @@ -54,8 +54,9 @@ storage: config_path: /data/openstack-helm/config labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled endpoints: cluster_domain_suffix: cluster.local diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index 418f47e207..63c4edb294 100644 --- a/magnum/templates/deployment-api.yaml +++ b/magnum/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "magnum" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_magnum_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml index ec748d2105..62589c59fc 100644 --- a/magnum/templates/statefulset-conductor.yaml +++ b/magnum/templates/statefulset-conductor.yaml @@ -40,7 +40,7 @@ spec: affinity: {{ tuple $envAll "magnum" "conductor" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.conductor.node_selector_key }}: {{ .Values.labels.conductor.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_magnum_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/magnum/values.yaml b/magnum/values.yaml index 6b0eca6814..cc5c0b2903 100644 --- a/magnum/values.yaml +++ b/magnum/values.yaml @@ -20,8 +20,12 @@ release_group: null labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + conductor: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index cae92406de..48a3ccbaba 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -39,7 +39,7 @@ spec: affinity: {{ tuple $envAll "memcached" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 9 }} containers: diff --git a/memcached/values.yaml b/memcached/values.yaml index e13f99facc..00bc84be20 100644 --- a/memcached/values.yaml +++ b/memcached/values.yaml @@ -47,8 +47,9 @@ images: memcached: 'docker.io/memcached:1.5.5' labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled manifests: configmap_bin: true diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index bf6c222866..5c2a696454 100644 --- a/mistral/templates/deployment-api.yaml +++ b/mistral/templates/deployment-api.yaml @@ -42,7 +42,7 @@ spec: affinity: {{ tuple $envAll "mistral" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_mistral_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index 3340728350..2b1447c484 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/mistral/templates/deployment-executor.yaml @@ -42,7 +42,7 @@ spec: affinity: {{ tuple $envAll "mistral" "executor" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.executor.node_selector_key }}: {{ .Values.labels.executor.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_mistral_executor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index 7907dc1e79..261df7e001 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/mistral/templates/statefulset-engine.yaml @@ -40,7 +40,7 @@ spec: affinity: {{ tuple $envAll "mistral" "engine" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.engine.node_selector_key }}: {{ .Values.labels.engine.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_mistral_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index 7934502f57..07180b8097 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/mistral/templates/statefulset-event-engine.yaml @@ -40,7 +40,7 @@ spec: affinity: {{ tuple $envAll "mistral" "event-engine" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.event_engine.node_selector_key }}: {{ .Values.labels.event_engine.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_mistral_event_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/mistral/values.yaml b/mistral/values.yaml index 2bcd7de10d..c6ae5ef26c 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -18,8 +18,18 @@ # name: value labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + engine: + node_selector_key: openstack-control-plane + node_selector_value: enabled + event_engine: + node_selector_key: openstack-control-plane + node_selector_value: enabled + executor: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/mongodb/templates/statefulset.yaml b/mongodb/templates/statefulset.yaml index 0759202578..43b889e083 100644 --- a/mongodb/templates/statefulset.yaml +++ b/mongodb/templates/statefulset.yaml @@ -37,7 +37,7 @@ spec: affinity: {{ tuple $envAll "mongodb" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/mongodb/values.yaml b/mongodb/values.yaml index 21e6615670..3f3b46a2fd 100644 --- a/mongodb/values.yaml +++ b/mongodb/values.yaml @@ -53,8 +53,9 @@ storage: host_path: /var/lib/openstack-helm/mongodb labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled endpoints: cluster_domain_suffix: cluster.local diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml index f32b38fea2..a5af914010 100644 --- a/openvswitch/values.yaml +++ b/openvswitch/values.yaml @@ -28,8 +28,8 @@ images: labels: ovs: - node_selector_key: openvswitch - node_selector_value: enabled + node_selector_key: openvswitch + node_selector_value: enabled network: external_bridge: br-ex diff --git a/postgresql/templates/statefulset.yaml b/postgresql/templates/statefulset.yaml index 341be96e32..cbe7bc7036 100644 --- a/postgresql/templates/statefulset.yaml +++ b/postgresql/templates/statefulset.yaml @@ -36,7 +36,7 @@ spec: affinity: {{ tuple $envAll "postgresql" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} initContainers: {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/postgresql/values.yaml b/postgresql/values.yaml index 148ed54918..ef44020037 100644 --- a/postgresql/values.yaml +++ b/postgresql/values.yaml @@ -56,8 +56,9 @@ storage: subpath: pgdata labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled dependencies: postgresql: diff --git a/rally/values.yaml b/rally/values.yaml index d03688bbae..3e3efe8d81 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -13,8 +13,6 @@ # limitations under the License. labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml index 93f66333d4..516c325a04 100644 --- a/senlin/templates/deployment-api.yaml +++ b/senlin/templates/deployment-api.yaml @@ -43,7 +43,7 @@ spec: affinity: {{ tuple $envAll "senlin" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_senlin_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} diff --git a/senlin/templates/statefulset-engine.yaml b/senlin/templates/statefulset-engine.yaml index 7bdbe21a14..e3c02655b5 100644 --- a/senlin/templates/statefulset-engine.yaml +++ b/senlin/templates/statefulset-engine.yaml @@ -40,7 +40,7 @@ spec: affinity: {{ tuple $envAll "senlin" "engine" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: - {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }} + {{ .Values.labels.engine.node_selector_key }}: {{ .Values.labels.engine.node_selector_value }} initContainers: {{ tuple $envAll $dependencies $mounts_senlin_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/senlin/values.yaml b/senlin/values.yaml index a9f0098bff..33f475e75f 100644 --- a/senlin/values.yaml +++ b/senlin/values.yaml @@ -18,8 +18,12 @@ # name: value labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + engine: + node_selector_key: openstack-control-plane + node_selector_value: enabled job: node_selector_key: openstack-control-plane node_selector_value: enabled diff --git a/tools/deployment/armada/multinode/armada-cluster-ingress.yaml b/tools/deployment/armada/multinode/armada-cluster-ingress.yaml index accc3c8256..6eb60e4f11 100644 --- a/tools/deployment/armada/multinode/armada-cluster-ingress.yaml +++ b/tools/deployment/armada/multinode/armada-cluster-ingress.yaml @@ -31,8 +31,12 @@ data: no_hooks: false values: labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + error_server: + node_selector_key: openstack-control-plane + node_selector_value: enabled pod: replicas: error_page: 2 diff --git a/tools/deployment/armada/multinode/armada-lma.yaml b/tools/deployment/armada/multinode/armada-lma.yaml index 83ce0ef38f..77105cdb30 100644 --- a/tools/deployment/armada/multinode/armada-lma.yaml +++ b/tools/deployment/armada/multinode/armada-lma.yaml @@ -135,8 +135,12 @@ data: admin: password: ${DB_ADMIN_PASSWORD} labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + prometheus_mysql_exporter: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml index e747a26e7f..7b7198c5ce 100644 --- a/tools/deployment/armada/multinode/armada-osh.yaml +++ b/tools/deployment/armada/multinode/armada-osh.yaml @@ -48,8 +48,12 @@ data: no_hooks: false values: labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + error_server: + node_selector_key: openstack-control-plane + node_selector_value: enabled pod: replicas: error_page: 2 @@ -146,8 +150,12 @@ data: prometheus: enabled: true labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + prometheus_mysql_exporter: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -175,8 +183,9 @@ data: hosts: default: keystone-memcached labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -214,8 +223,12 @@ data: prometheus: enabled: true labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + prometheus_rabbitmq_exporter: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -286,8 +299,12 @@ data: username: keystone-rabbitmq password: ${KEYSTONE_RABBITMQ_PASSWORD} labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled pod: replicas: api: 2 @@ -343,6 +360,10 @@ data: namespace: ceph ceph_mon: namespace: ceph + labels: + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled bootstrap: enabled: false conf: @@ -385,8 +406,9 @@ data: hosts: default: glance-memcached labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -424,8 +446,12 @@ data: prometheus: enabled: true labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + prometheus_rabbitmq_exporter: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -498,8 +524,15 @@ data: hosts: default: glance-rabbitmq labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled + registry: + node_selector_key: openstack-control-plane + node_selector_value: enabled pod: replicas: api: 2 @@ -532,8 +565,9 @@ data: hosts: default: cinder-memcached labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -571,8 +605,12 @@ data: prometheus: enabled: true labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + prometheus_rabbitmq_exporter: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -645,8 +683,21 @@ data: hosts: default: cinder-rabbitmq labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + backup: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled + scheduler: + node_selector_key: openstack-control-plane + node_selector_value: enabled + volume: + node_selector_key: openstack-control-plane + node_selector_value: enabled pod: replicas: api: 2 @@ -681,8 +732,8 @@ data: values: labels: ovs: - node_selector_key: openvswitch - node_selector_value: enabled + node_selector_key: openvswitch + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -737,8 +788,9 @@ data: hosts: default: nova-memcached labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -776,8 +828,12 @@ data: prometheus: enabled: true labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + prometheus_rabbitmq_exporter: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -950,8 +1006,9 @@ data: hosts: default: neutron-memcached labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -989,8 +1046,12 @@ data: prometheus: enabled: true labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + prometheus_rabbitmq_exporter: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -1065,11 +1126,11 @@ data: server: 2 labels: ovs: - node_selector_key: openvswitch - node_selector_value: enabled + node_selector_key: openvswitch + node_selector_value: enabled lb: - node_selector_key: linuxbridge - node_selector_value: enabled + node_selector_key: linuxbridge + node_selector_value: enabled server: node_selector_key: openstack-control-plane node_selector_value: enabled @@ -1130,8 +1191,9 @@ data: hosts: default: heat-memcached labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -1169,8 +1231,12 @@ data: prometheus: enabled: true labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + prometheus_rabbitmq_exporter: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -1243,8 +1309,21 @@ data: hosts: default: heat-rabbitmq labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + cfn: + node_selector_key: openstack-control-plane + node_selector_value: enabled + cloudwatch: + node_selector_key: openstack-control-plane + node_selector_value: enabled + engine: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled pod: replicas: api: 2 @@ -1278,8 +1357,9 @@ data: hosts: default: barbican-memcached labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -1317,8 +1397,12 @@ data: prometheus: enabled: true labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + server: + node_selector_key: openstack-control-plane + node_selector_value: enabled + prometheus_rabbitmq_exporter: + node_selector_key: openstack-control-plane + node_selector_value: enabled source: type: local location: ${OSH_PATH} @@ -1387,8 +1471,12 @@ data: hosts: default: barbican-rabbitmq labels: - node_selector_key: openstack-control-plane - node_selector_value: enabled + api: + node_selector_key: openstack-control-plane + node_selector_value: enabled + job: + node_selector_key: openstack-control-plane + node_selector_value: enabled pod: replicas: api: 2