From a801776a41b15b1e4839155b2e0b413c132a7014 Mon Sep 17 00:00:00 2001 From: Thiago Brito Date: Tue, 22 Feb 2022 16:06:59 -0300 Subject: [PATCH] Adding tolerations to disabled charts On the previous work to add tolerations for the openstack-helm charts, we missed adding those tolerations to disabled charts like the charts for the telemetry services, ironic, gnocchi and ceph-rgw. This commit will fix it. This is a cherry-pick with minor removals from [1] and [2]and should be removed from the openstack-armada-app tree on the next osh/osh-i upversion. NOTE: Since ironic/gnocchi/ceph-rgw charts are not proven to work with stx-openstack, we will not validate those on the test plan. [1] https://review.opendev.org/c/openstack/openstack-helm-infra/+/812753 [2] https://review.opendev.org/c/openstack/openstack-helm/+/812734 TEST PLAN PASS build stx-openstack and install on SX PASS enable telemetry charts REGRESSION PLAN PASS debian build LOG: https://paste.opendev.org/show/bV3bgChLHxro3caaRC7q/ Story: 2009232 Task: 44572 Signed-off-by: Thiago Brito Change-Id: I0b35e2cb531cf54fc5a319c35e0a058603790af1 --- ...nt-toleration-for-Openstack-services.patch | 440 +++++++-- ...nt-toleration-for-Openstack-services.patch | 440 +++++++-- ...nt-toleration-for-Openstack-services.patch | 898 +++++++++++++++++- ...nt-toleration-for-Openstack-services.patch | 898 +++++++++++++++++- .../manifests/manifest.yaml | 59 ++ 5 files changed, 2533 insertions(+), 202 deletions(-) diff --git a/openstack-helm-infra/debian/deb_folder/patches/0017-Enable-taint-toleration-for-Openstack-services.patch b/openstack-helm-infra/debian/deb_folder/patches/0017-Enable-taint-toleration-for-Openstack-services.patch index 40c46c5b..4f5f7311 100644 --- a/openstack-helm-infra/debian/deb_folder/patches/0017-Enable-taint-toleration-for-Openstack-services.patch +++ b/openstack-helm-infra/debian/deb_folder/patches/0017-Enable-taint-toleration-for-Openstack-services.patch @@ -1,4 +1,4 @@ -From 2538a3cb70606bf86851201e58fd341a55d9f5f5 Mon Sep 17 00:00:00 2001 +From 1be5f40cac3ebc759e99540d6355ef98b47b51f4 Mon Sep 17 00:00:00 2001 From: Lucas Cavalcante Date: Wed, 6 Oct 2021 18:52:35 -0300 Subject: [PATCH] Enable taint toleration for Openstack services @@ -6,61 +6,330 @@ Subject: [PATCH] Enable taint toleration for Openstack services This adds taint toleration support for openstack jobs Also adds tolerations for: - - rabbitmq + - ceph-rgw + - gnocchi - ingress + - libvirt - mariadb - memcached - - libvirt - openvswitch + - rabbitmq Signed-off-by: Lucas Cavalcante Change-Id: I1c731c94e58895bd8bfc26d4300aac40a9111f12 --- - .../templates/manifests/_job-bootstrap.tpl | 4 ++ - .../manifests/_job-db-drop-mysql.tpl | 4 ++ - .../manifests/_job-db-init-mysql.tpl | 4 ++ - .../templates/manifests/_job-db-sync.tpl | 4 ++ - .../templates/manifests/_job-ks-endpoints.tpl | 4 ++ - .../templates/manifests/_job-ks-service.tpl | 4 ++ - .../templates/manifests/_job-ks-user.yaml.tpl | 4 ++ - .../manifests/_job-rabbit-init.yaml.tpl | 4 ++ - .../manifests/_job-s3-bucket.yaml.tpl | 4 ++ - .../templates/manifests/_job-s3-user.yaml.tpl | 4 ++ - .../manifests/_job_image_repo_sync.tpl | 4 ++ - ingress/templates/deployment-error.yaml | 6 +++ - ingress/templates/deployment-ingress.yaml | 3 ++ - ingress/templates/job-image-repo-sync.yaml | 3 ++ - ingress/values.yaml | 7 +++ - libvirt/templates/daemonset-libvirt.yaml | 3 ++ - libvirt/templates/job-image-repo-sync.yaml | 3 ++ - libvirt/values.yaml | 7 +++ - .../templates/cron-job-backup-mariadb.yaml | 3 ++ - mariadb/templates/deployment-error.yaml | 3 ++ - mariadb/templates/deployment-ingress.yaml | 3 ++ - mariadb/templates/job-image-repo-sync.yaml | 3 ++ - mariadb/templates/job-ks-user.yaml | 3 ++ - mariadb/templates/pod-test.yaml | 3 ++ - mariadb/templates/statefulset.yaml | 3 ++ - mariadb/values.yaml | 7 +++ - memcached/templates/deployment.yaml | 3 ++ - memcached/templates/job-image-repo-sync.yaml | 3 ++ - memcached/values.yaml | 7 +++ - openvswitch/templates/daemonset-ovs-db.yaml | 3 ++ - .../templates/daemonset-ovs-vswitchd.yaml | 3 ++ - .../templates/job-image-repo-sync.yaml | 3 ++ - openvswitch/values.yaml | 7 +++ - rabbitmq/templates/job-cluster-wait.yaml | 3 ++ - rabbitmq/templates/job-image-repo-sync.yaml | 3 ++ - rabbitmq/templates/pod-test.yaml | 3 ++ - rabbitmq/templates/statefulset.yaml | 3 ++ - rabbitmq/values.yaml | 7 +++ - 41 files changed, 245 insertions(+) - create mode 100644 releasenotes/notes/helm-toolkit.yaml.orig - create mode 100644 releasenotes/notes/libvirt.yaml.orig - create mode 100644 releasenotes/notes/mariadb.yaml.orig + ceph-rgw/values.yaml | 3 +++ + gnocchi/templates/cron-job-resources-cleaner.yaml | 3 +++ + gnocchi/templates/daemonset-metricd.yaml | 3 +++ + gnocchi/templates/daemonset-statsd.yaml | 3 +++ + gnocchi/templates/deployment-api.yaml | 3 +++ + gnocchi/templates/job-bootstrap.yaml | 3 +++ + gnocchi/templates/job-clean.yaml | 3 +++ + gnocchi/templates/job-db-drop.yaml | 3 +++ + gnocchi/templates/job-db-init-indexer.yaml | 3 +++ + gnocchi/templates/job-db-init.yaml | 3 +++ + gnocchi/templates/job-db-sync.yaml | 3 +++ + gnocchi/templates/job-image-repo-sync.yaml | 3 +++ + gnocchi/templates/job-ks-endpoints.yaml | 7 +++++-- + gnocchi/templates/job-ks-service.yaml | 3 +++ + gnocchi/templates/job-ks-user.yaml | 3 +++ + gnocchi/templates/job-storage-init.yaml | 3 +++ + gnocchi/templates/pod-gnocchi-test.yaml | 3 +++ + gnocchi/values.yaml | 7 +++++++ + helm-toolkit/templates/manifests/_job-bootstrap.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-db-init-mysql.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-db-sync.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-ks-endpoints.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-ks-service.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job_image_repo_sync.tpl | 4 ++++ + ingress/templates/deployment-error.yaml | 3 +++ + ingress/templates/deployment-ingress.yaml | 3 +++ + ingress/templates/job-image-repo-sync.yaml | 3 +++ + ingress/values.yaml | 7 +++++++ + libvirt/templates/daemonset-libvirt.yaml | 3 +++ + libvirt/templates/job-image-repo-sync.yaml | 3 +++ + libvirt/values.yaml | 7 +++++++ + mariadb/templates/cron-job-backup-mariadb.yaml | 3 +++ + mariadb/templates/deployment-error.yaml | 3 +++ + mariadb/templates/deployment-ingress.yaml | 3 +++ + mariadb/templates/job-image-repo-sync.yaml | 3 +++ + mariadb/templates/job-ks-user.yaml | 3 +++ + mariadb/templates/pod-test.yaml | 3 +++ + mariadb/templates/statefulset.yaml | 3 +++ + mariadb/values.yaml | 7 +++++++ + memcached/templates/deployment.yaml | 3 +++ + memcached/templates/job-image-repo-sync.yaml | 3 +++ + memcached/values.yaml | 7 +++++++ + openvswitch/templates/daemonset-ovs-db.yaml | 3 +++ + openvswitch/templates/daemonset-ovs-vswitchd.yaml | 3 +++ + openvswitch/templates/job-image-repo-sync.yaml | 3 +++ + openvswitch/values.yaml | 7 +++++++ + rabbitmq/templates/job-cluster-wait.yaml | 3 +++ + rabbitmq/templates/job-image-repo-sync.yaml | 3 +++ + rabbitmq/templates/pod-test.yaml | 3 +++ + rabbitmq/templates/statefulset.yaml | 3 +++ + rabbitmq/values.yaml | 7 +++++++ + 56 files changed, 209 insertions(+), 2 deletions(-) +diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml +index a5147856..d3f01e90 100644 +--- a/ceph-rgw/values.yaml ++++ b/ceph-rgw/values.yaml +@@ -233,6 +233,9 @@ pod: + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 60 ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + + network_policy: + rgw: +diff --git a/gnocchi/templates/cron-job-resources-cleaner.yaml b/gnocchi/templates/cron-job-resources-cleaner.yaml +index 115fc4ff..db4e4848 100644 +--- a/gnocchi/templates/cron-job-resources-cleaner.yaml ++++ b/gnocchi/templates/cron-job-resources-cleaner.yaml +@@ -48,6 +48,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + initContainers: + {{ tuple $envAll "resources_cleaner" $mounts_gnocchi_resources_cleaner_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} + containers: +diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml +index 40daa26a..cc5c0cd0 100644 +--- a/gnocchi/templates/daemonset-metricd.yaml ++++ b/gnocchi/templates/daemonset-metricd.yaml +@@ -44,6 +44,9 @@ spec: + serviceAccountName: {{ $serviceAccountName }} + nodeSelector: + {{ .Values.labels.metricd.node_selector_key }}: {{ .Values.labels.metricd.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "metricd" $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 68f8f080..4dfc304e 100644 +--- a/gnocchi/templates/daemonset-statsd.yaml ++++ b/gnocchi/templates/daemonset-statsd.yaml +@@ -43,6 +43,9 @@ spec: + serviceAccountName: {{ $serviceAccountName }} + nodeSelector: + {{ .Values.labels.statsd.node_selector_key }}: {{ .Values.labels.statsd.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "statsd" $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 b41f0743..0cc687fa 100644 +--- a/gnocchi/templates/deployment-api.yaml ++++ b/gnocchi/templates/deployment-api.yaml +@@ -47,6 +47,9 @@ spec: + {{ tuple $envAll "gnocchi" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} + initContainers: + {{ tuple $envAll "api" $mounts_gnocchi_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +diff --git a/gnocchi/templates/job-bootstrap.yaml b/gnocchi/templates/job-bootstrap.yaml +index 5f3cfae5..d2dbc51e 100644 +--- a/gnocchi/templates/job-bootstrap.yaml ++++ b/gnocchi/templates/job-bootstrap.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "gnocchi" "keystoneUser" .Values.bootstrap.ks_user -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- end }} +diff --git a/gnocchi/templates/job-clean.yaml b/gnocchi/templates/job-clean.yaml +index 3e294bf1..ce816cb3 100644 +--- a/gnocchi/templates/job-clean.yaml ++++ b/gnocchi/templates/job-clean.yaml +@@ -63,6 +63,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "clean" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/gnocchi/templates/job-db-drop.yaml b/gnocchi/templates/job-db-drop.yaml +index 056a95f2..5f9be1ef 100644 +--- a/gnocchi/templates/job-db-drop.yaml ++++ b/gnocchi/templates/job-db-drop.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_drop }} + {{- $dbDropJob := dict "envAll" . "serviceName" "gnocchi" -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/gnocchi/templates/job-db-init-indexer.yaml b/gnocchi/templates/job-db-init-indexer.yaml +index ab078043..d0932840 100644 +--- a/gnocchi/templates/job-db-init-indexer.yaml ++++ b/gnocchi/templates/job-db-init-indexer.yaml +@@ -34,6 +34,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "db_init_postgresql" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/gnocchi/templates/job-db-init.yaml b/gnocchi/templates/job-db-init.yaml +index dace5342..99ac8e21 100644 +--- a/gnocchi/templates/job-db-init.yaml ++++ b/gnocchi/templates/job-db-init.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_init }} + {{- $dbInitJob := dict "envAll" . "serviceName" "gnocchi" -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/gnocchi/templates/job-db-sync.yaml b/gnocchi/templates/job-db-sync.yaml +index 60391847..45a11110 100644 +--- a/gnocchi/templates/job-db-sync.yaml ++++ b/gnocchi/templates/job-db-sync.yaml +@@ -34,6 +34,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "db_sync" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + - name: ceph-keyring-placement +diff --git a/gnocchi/templates/job-image-repo-sync.yaml b/gnocchi/templates/job-image-repo-sync.yaml +index 4ace9b9f..f4c4d018 100644 +--- a/gnocchi/templates/job-image-repo-sync.yaml ++++ b/gnocchi/templates/job-image-repo-sync.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "gnocchi" -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/gnocchi/templates/job-ks-endpoints.yaml b/gnocchi/templates/job-ks-endpoints.yaml +index 2f5c0555..47809e94 100644 +--- a/gnocchi/templates/job-ks-endpoints.yaml ++++ b/gnocchi/templates/job-ks-endpoints.yaml +@@ -13,6 +13,9 @@ limitations under the License. + */}} + + {{- if .Values.manifests.job_ks_endpoints }} +-{{- $ksServiceJob := dict "envAll" . "serviceName" "gnocchi" "serviceTypes" ( tuple "metric" ) -}} +-{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} ++{{- $ksEndpointsJob := dict "envAll" . "serviceName" "gnocchi" "serviceTypes" ( tuple "metric" ) -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} ++{{- end -}} ++{{ $ksEndpointsJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/gnocchi/templates/job-ks-service.yaml b/gnocchi/templates/job-ks-service.yaml +index 24c2935e..76070d6e 100644 +--- a/gnocchi/templates/job-ks-service.yaml ++++ b/gnocchi/templates/job-ks-service.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "gnocchi" "serviceTypes" ( tuple "metric" ) -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/gnocchi/templates/job-ks-user.yaml b/gnocchi/templates/job-ks-user.yaml +index 371f6b35..1dd7e5a0 100644 +--- a/gnocchi/templates/job-ks-user.yaml ++++ b/gnocchi/templates/job-ks-user.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "gnocchi" -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/gnocchi/templates/job-storage-init.yaml b/gnocchi/templates/job-storage-init.yaml +index e2736a5e..e4114e22 100644 +--- a/gnocchi/templates/job-storage-init.yaml ++++ b/gnocchi/templates/job-storage-init.yaml +@@ -62,6 +62,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + - name: ceph-keyring-placement +diff --git a/gnocchi/templates/pod-gnocchi-test.yaml b/gnocchi/templates/pod-gnocchi-test.yaml +index 9ceda014..8defdca1 100644 +--- a/gnocchi/templates/pod-gnocchi-test.yaml ++++ b/gnocchi/templates/pod-gnocchi-test.yaml +@@ -32,6 +32,9 @@ metadata: + spec: + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 2 }} ++{{ end }} + serviceAccountName: {{ $serviceAccountName }} + restartPolicy: Never + initContainers: +diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml +index 4ed1ba66..74cf0163 100644 +--- a/gnocchi/values.yaml ++++ b/gnocchi/values.yaml +@@ -207,6 +207,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ gnocchi: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + gnocchi_api: + init_container: null diff --git a/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/helm-toolkit/templates/manifests/_job-bootstrap.tpl -index 65020e5d..b385199a 100644 +index 3cc07cc6..5d98c8b7 100644 --- a/helm-toolkit/templates/manifests/_job-bootstrap.tpl +++ b/helm-toolkit/templates/manifests/_job-bootstrap.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -71,7 +340,7 @@ index 65020e5d..b385199a 100644 {{- $podVolMounts := index . "podVolMounts" | default false -}} {{- $podVols := index . "podVols" | default false -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} -@@ -72,6 +73,9 @@ spec: +@@ -67,6 +68,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -82,7 +351,7 @@ index 65020e5d..b385199a 100644 {{ tuple $envAll "bootstrap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl -index 6edbdb3a..934a2435 100644 +index 91fd5ad7..62ed1191 100644 --- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl +++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl @@ -28,6 +28,7 @@ limitations under the License. @@ -93,7 +362,7 @@ index 6edbdb3a..934a2435 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} {{- $dbToDrop := index . "dbToDrop" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}} -@@ -73,6 +74,9 @@ spec: +@@ -68,6 +69,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -104,7 +373,7 @@ index 6edbdb3a..934a2435 100644 {{ tuple $envAll "db_drop" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl -index bfed1968..c164ad0a 100644 +index b3348f57..745e8dab 100644 --- a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl +++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl @@ -28,6 +28,7 @@ limitations under the License. @@ -115,7 +384,7 @@ index bfed1968..c164ad0a 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} {{- $dbToInit := index . "dbToInit" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}} -@@ -73,6 +74,9 @@ spec: +@@ -68,6 +69,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -126,7 +395,7 @@ index bfed1968..c164ad0a 100644 {{ tuple $envAll "db_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-db-sync.tpl b/helm-toolkit/templates/manifests/_job-db-sync.tpl -index 71ff924b..659238a4 100644 +index 03763430..24d2496d 100644 --- a/helm-toolkit/templates/manifests/_job-db-sync.tpl +++ b/helm-toolkit/templates/manifests/_job-db-sync.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -137,7 +406,7 @@ index 71ff924b..659238a4 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} {{- $podVolMounts := index . "podVolMounts" | default false -}} -@@ -70,6 +71,9 @@ spec: +@@ -65,6 +66,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -148,7 +417,7 @@ index 71ff924b..659238a4 100644 {{ tuple $envAll "db_sync" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl -index e06aeb65..a06d0906 100644 +index 2d130e13..3a7df7ff 100644 --- a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl @@ -24,6 +24,7 @@ limitations under the License. @@ -159,18 +428,18 @@ index e06aeb65..a06d0906 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $secretBin := index . "secretBin" -}} {{- $tlsSecret := index . "tlsSecret" | default "" -}} -@@ -71,6 +72,9 @@ spec: - spec: - serviceAccountName: {{ $serviceAccountName }} +@@ -68,6 +69,9 @@ spec: restartPolicy: {{ $restartPolicy }} + nodeSelector: + {{ toYaml $nodeSelector | indent 8 }} +{{- if $tolerationsEnabled }} +{{ tuple $envAll $serviceName | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} +{{- end}} - nodeSelector: - {{ toYaml $nodeSelector | indent 8 }} initContainers: + {{ tuple $envAll "ks_endpoints" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: diff --git a/helm-toolkit/templates/manifests/_job-ks-service.tpl b/helm-toolkit/templates/manifests/_job-ks-service.tpl -index 93e64e1d..f5f195ca 100644 +index 8347b580..a109e3cc 100644 --- a/helm-toolkit/templates/manifests/_job-ks-service.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-service.tpl @@ -24,6 +24,7 @@ limitations under the License. @@ -181,7 +450,7 @@ index 93e64e1d..f5f195ca 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $secretBin := index . "secretBin" -}} {{- $tlsSecret := index . "tlsSecret" | default "" -}} -@@ -73,6 +74,9 @@ spec: +@@ -68,6 +69,9 @@ spec: restartPolicy: {{ $restartPolicy }} nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -192,7 +461,7 @@ index 93e64e1d..f5f195ca 100644 {{ tuple $envAll "ks_service" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl -index 39007de8..f6bbc148 100644 +index 80960f47..905eb71a 100644 --- a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl @@ -45,6 +45,7 @@ limitations under the License. @@ -203,7 +472,7 @@ index 39007de8..f6bbc148 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $serviceUser := index . "serviceUser" | default $serviceName -}} {{- $secretBin := index . "secretBin" -}} -@@ -96,6 +97,9 @@ spec: +@@ -68,6 +69,9 @@ spec: restartPolicy: {{ $restartPolicy }} nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -214,7 +483,7 @@ index 39007de8..f6bbc148 100644 {{ tuple $envAll "ks_user" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl -index aae71ac5..59e0da0f 100644 +index 7ecacced..69820642 100644 --- a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl @@ -18,6 +18,7 @@ limitations under the License. @@ -225,7 +494,7 @@ index aae71ac5..59e0da0f 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $serviceUser := index . "serviceUser" | default $serviceName -}} {{- $secretBin := index . "secretBin" -}} -@@ -63,6 +64,9 @@ spec: +@@ -58,6 +59,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -236,7 +505,7 @@ index aae71ac5..59e0da0f 100644 {{ tuple $envAll "rabbit_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl -index 42bb8548..240c29ca 100644 +index 9dc28597..29cb9937 100644 --- a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -247,7 +516,7 @@ index 42bb8548..240c29ca 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapCeph := index . "configMapCeph" | default (printf "ceph-etc" ) -}} {{- $secretBin := index . "secretBin" -}} -@@ -68,6 +69,9 @@ spec: +@@ -63,6 +64,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -258,7 +527,7 @@ index 42bb8548..240c29ca 100644 {{ tuple $envAll "s3_bucket" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl -index 36fe3582..440e9590 100644 +index 3dd407ea..50d9af59 100644 --- a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -269,7 +538,7 @@ index 36fe3582..440e9590 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapCeph := index . "configMapCeph" | default (printf "ceph-etc" ) -}} {{- $secretBin := index . "secretBin" -}} -@@ -66,6 +67,9 @@ spec: +@@ -61,6 +62,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -280,7 +549,7 @@ index 36fe3582..440e9590 100644 {{ tuple $envAll "s3_user" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement diff --git a/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl b/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl -index c1609195..6bcd8694 100644 +index 6fed825f..0906df4c 100644 --- a/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl +++ b/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -291,7 +560,7 @@ index c1609195..6bcd8694 100644 {{- $podVolMounts := index . "podVolMounts" | default false -}} {{- $podVols := index . "podVols" | default false -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} -@@ -65,6 +66,9 @@ spec: +@@ -60,6 +61,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -302,16 +571,11 @@ index c1609195..6bcd8694 100644 {{ tuple $envAll "image_repo_sync" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml -index 417e63d4..0d417f98 100644 +index 417e63d4..ccd6c3b3 100644 --- a/ingress/templates/deployment-error.yaml +++ b/ingress/templates/deployment-error.yaml -@@ -47,8 +47,14 @@ spec: - serviceAccountName: {{ $serviceAccountName }} - affinity: +@@ -49,6 +49,9 @@ spec: {{ tuple $envAll "ingress" "error-pages" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} -+{{ if $envAll.Values.pod.tolerations.ingress.enabled }} -+{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} -+{{ end }} nodeSelector: {{ .Values.labels.error_server.node_selector_key }}: {{ .Values.labels.error_server.node_selector_value | quote }} +{{ if $envAll.Values.pod.tolerations.ingress.enabled }} @@ -339,7 +603,7 @@ index c4841467..2132f9a3 100644 --- a/ingress/templates/job-image-repo-sync.yaml +++ b/ingress/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "ingress" -}} +{{- if .Values.pod.tolerations.ingress.enabled -}} @@ -384,7 +648,7 @@ index d359d1aa..91d52820 100644 --- a/libvirt/templates/job-image-repo-sync.yaml +++ b/libvirt/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "libvirt" -}} +{{- if .Values.pod.tolerations.libvirt.enabled -}} @@ -457,7 +721,7 @@ index 3c2b5d21..2121a397 100644 --- a/mariadb/templates/job-image-repo-sync.yaml +++ b/mariadb/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "mariadb" -}} +{{- if .Values.pod.tolerations.mariadb.enabled -}} @@ -525,7 +789,7 @@ index b86bf925..c355d42a 100644 server: 3 ingress: 2 diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml -index 1b4e2027..221bfdbe 100644 +index fc827495..0aa5f8ee 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -50,6 +50,9 @@ spec: @@ -543,7 +807,7 @@ index e2438d7e..ae519ff0 100644 --- a/memcached/templates/job-image-repo-sync.yaml +++ b/memcached/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "memcached" -}} +{{- if .Values.pod.tolerations.memcached.enabled -}} @@ -552,10 +816,10 @@ index e2438d7e..ae519ff0 100644 {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} {{- end }} diff --git a/memcached/values.yaml b/memcached/values.yaml -index 7ad6d29e..9cf3d3a2 100644 +index 889f8cb3..f03a6901 100644 --- a/memcached/values.yaml +++ b/memcached/values.yaml -@@ -169,6 +169,13 @@ pod: +@@ -142,6 +142,13 @@ pod: default: preferredDuringSchedulingIgnoredDuringExecution weight: default: 10 @@ -602,7 +866,7 @@ index 4d1058ed..765061c3 100644 --- a/openvswitch/templates/job-image-repo-sync.yaml +++ b/openvswitch/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "openvswitch" -}} +{{- if .Values.pod.tolerations.openvswitch.enabled -}} @@ -616,7 +880,7 @@ index de6169a1..c953a899 100644 +++ b/openvswitch/values.yaml @@ -37,6 +37,13 @@ labels: node_selector_value: enabled - + pod: + tolerations: + openvswitch: @@ -647,7 +911,7 @@ index 4875ed44..8fd379f9 100644 --- a/rabbitmq/templates/job-image-repo-sync.yaml +++ b/rabbitmq/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "rabbitmq" -}} +{{- if .Values.pod.tolerations.rabbitmq.enabled -}} diff --git a/openstack-helm-infra/files/0017-Enable-taint-toleration-for-Openstack-services.patch b/openstack-helm-infra/files/0017-Enable-taint-toleration-for-Openstack-services.patch index 40c46c5b..4f5f7311 100644 --- a/openstack-helm-infra/files/0017-Enable-taint-toleration-for-Openstack-services.patch +++ b/openstack-helm-infra/files/0017-Enable-taint-toleration-for-Openstack-services.patch @@ -1,4 +1,4 @@ -From 2538a3cb70606bf86851201e58fd341a55d9f5f5 Mon Sep 17 00:00:00 2001 +From 1be5f40cac3ebc759e99540d6355ef98b47b51f4 Mon Sep 17 00:00:00 2001 From: Lucas Cavalcante Date: Wed, 6 Oct 2021 18:52:35 -0300 Subject: [PATCH] Enable taint toleration for Openstack services @@ -6,61 +6,330 @@ Subject: [PATCH] Enable taint toleration for Openstack services This adds taint toleration support for openstack jobs Also adds tolerations for: - - rabbitmq + - ceph-rgw + - gnocchi - ingress + - libvirt - mariadb - memcached - - libvirt - openvswitch + - rabbitmq Signed-off-by: Lucas Cavalcante Change-Id: I1c731c94e58895bd8bfc26d4300aac40a9111f12 --- - .../templates/manifests/_job-bootstrap.tpl | 4 ++ - .../manifests/_job-db-drop-mysql.tpl | 4 ++ - .../manifests/_job-db-init-mysql.tpl | 4 ++ - .../templates/manifests/_job-db-sync.tpl | 4 ++ - .../templates/manifests/_job-ks-endpoints.tpl | 4 ++ - .../templates/manifests/_job-ks-service.tpl | 4 ++ - .../templates/manifests/_job-ks-user.yaml.tpl | 4 ++ - .../manifests/_job-rabbit-init.yaml.tpl | 4 ++ - .../manifests/_job-s3-bucket.yaml.tpl | 4 ++ - .../templates/manifests/_job-s3-user.yaml.tpl | 4 ++ - .../manifests/_job_image_repo_sync.tpl | 4 ++ - ingress/templates/deployment-error.yaml | 6 +++ - ingress/templates/deployment-ingress.yaml | 3 ++ - ingress/templates/job-image-repo-sync.yaml | 3 ++ - ingress/values.yaml | 7 +++ - libvirt/templates/daemonset-libvirt.yaml | 3 ++ - libvirt/templates/job-image-repo-sync.yaml | 3 ++ - libvirt/values.yaml | 7 +++ - .../templates/cron-job-backup-mariadb.yaml | 3 ++ - mariadb/templates/deployment-error.yaml | 3 ++ - mariadb/templates/deployment-ingress.yaml | 3 ++ - mariadb/templates/job-image-repo-sync.yaml | 3 ++ - mariadb/templates/job-ks-user.yaml | 3 ++ - mariadb/templates/pod-test.yaml | 3 ++ - mariadb/templates/statefulset.yaml | 3 ++ - mariadb/values.yaml | 7 +++ - memcached/templates/deployment.yaml | 3 ++ - memcached/templates/job-image-repo-sync.yaml | 3 ++ - memcached/values.yaml | 7 +++ - openvswitch/templates/daemonset-ovs-db.yaml | 3 ++ - .../templates/daemonset-ovs-vswitchd.yaml | 3 ++ - .../templates/job-image-repo-sync.yaml | 3 ++ - openvswitch/values.yaml | 7 +++ - rabbitmq/templates/job-cluster-wait.yaml | 3 ++ - rabbitmq/templates/job-image-repo-sync.yaml | 3 ++ - rabbitmq/templates/pod-test.yaml | 3 ++ - rabbitmq/templates/statefulset.yaml | 3 ++ - rabbitmq/values.yaml | 7 +++ - 41 files changed, 245 insertions(+) - create mode 100644 releasenotes/notes/helm-toolkit.yaml.orig - create mode 100644 releasenotes/notes/libvirt.yaml.orig - create mode 100644 releasenotes/notes/mariadb.yaml.orig + ceph-rgw/values.yaml | 3 +++ + gnocchi/templates/cron-job-resources-cleaner.yaml | 3 +++ + gnocchi/templates/daemonset-metricd.yaml | 3 +++ + gnocchi/templates/daemonset-statsd.yaml | 3 +++ + gnocchi/templates/deployment-api.yaml | 3 +++ + gnocchi/templates/job-bootstrap.yaml | 3 +++ + gnocchi/templates/job-clean.yaml | 3 +++ + gnocchi/templates/job-db-drop.yaml | 3 +++ + gnocchi/templates/job-db-init-indexer.yaml | 3 +++ + gnocchi/templates/job-db-init.yaml | 3 +++ + gnocchi/templates/job-db-sync.yaml | 3 +++ + gnocchi/templates/job-image-repo-sync.yaml | 3 +++ + gnocchi/templates/job-ks-endpoints.yaml | 7 +++++-- + gnocchi/templates/job-ks-service.yaml | 3 +++ + gnocchi/templates/job-ks-user.yaml | 3 +++ + gnocchi/templates/job-storage-init.yaml | 3 +++ + gnocchi/templates/pod-gnocchi-test.yaml | 3 +++ + gnocchi/values.yaml | 7 +++++++ + helm-toolkit/templates/manifests/_job-bootstrap.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-db-init-mysql.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-db-sync.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-ks-endpoints.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-ks-service.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl | 4 ++++ + helm-toolkit/templates/manifests/_job_image_repo_sync.tpl | 4 ++++ + ingress/templates/deployment-error.yaml | 3 +++ + ingress/templates/deployment-ingress.yaml | 3 +++ + ingress/templates/job-image-repo-sync.yaml | 3 +++ + ingress/values.yaml | 7 +++++++ + libvirt/templates/daemonset-libvirt.yaml | 3 +++ + libvirt/templates/job-image-repo-sync.yaml | 3 +++ + libvirt/values.yaml | 7 +++++++ + mariadb/templates/cron-job-backup-mariadb.yaml | 3 +++ + mariadb/templates/deployment-error.yaml | 3 +++ + mariadb/templates/deployment-ingress.yaml | 3 +++ + mariadb/templates/job-image-repo-sync.yaml | 3 +++ + mariadb/templates/job-ks-user.yaml | 3 +++ + mariadb/templates/pod-test.yaml | 3 +++ + mariadb/templates/statefulset.yaml | 3 +++ + mariadb/values.yaml | 7 +++++++ + memcached/templates/deployment.yaml | 3 +++ + memcached/templates/job-image-repo-sync.yaml | 3 +++ + memcached/values.yaml | 7 +++++++ + openvswitch/templates/daemonset-ovs-db.yaml | 3 +++ + openvswitch/templates/daemonset-ovs-vswitchd.yaml | 3 +++ + openvswitch/templates/job-image-repo-sync.yaml | 3 +++ + openvswitch/values.yaml | 7 +++++++ + rabbitmq/templates/job-cluster-wait.yaml | 3 +++ + rabbitmq/templates/job-image-repo-sync.yaml | 3 +++ + rabbitmq/templates/pod-test.yaml | 3 +++ + rabbitmq/templates/statefulset.yaml | 3 +++ + rabbitmq/values.yaml | 7 +++++++ + 56 files changed, 209 insertions(+), 2 deletions(-) +diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml +index a5147856..d3f01e90 100644 +--- a/ceph-rgw/values.yaml ++++ b/ceph-rgw/values.yaml +@@ -233,6 +233,9 @@ pod: + key: node.kubernetes.io/unreachable + operator: Exists + tolerationSeconds: 60 ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + + network_policy: + rgw: +diff --git a/gnocchi/templates/cron-job-resources-cleaner.yaml b/gnocchi/templates/cron-job-resources-cleaner.yaml +index 115fc4ff..db4e4848 100644 +--- a/gnocchi/templates/cron-job-resources-cleaner.yaml ++++ b/gnocchi/templates/cron-job-resources-cleaner.yaml +@@ -48,6 +48,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + initContainers: + {{ tuple $envAll "resources_cleaner" $mounts_gnocchi_resources_cleaner_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} + containers: +diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml +index 40daa26a..cc5c0cd0 100644 +--- a/gnocchi/templates/daemonset-metricd.yaml ++++ b/gnocchi/templates/daemonset-metricd.yaml +@@ -44,6 +44,9 @@ spec: + serviceAccountName: {{ $serviceAccountName }} + nodeSelector: + {{ .Values.labels.metricd.node_selector_key }}: {{ .Values.labels.metricd.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "metricd" $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 68f8f080..4dfc304e 100644 +--- a/gnocchi/templates/daemonset-statsd.yaml ++++ b/gnocchi/templates/daemonset-statsd.yaml +@@ -43,6 +43,9 @@ spec: + serviceAccountName: {{ $serviceAccountName }} + nodeSelector: + {{ .Values.labels.statsd.node_selector_key }}: {{ .Values.labels.statsd.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "statsd" $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 b41f0743..0cc687fa 100644 +--- a/gnocchi/templates/deployment-api.yaml ++++ b/gnocchi/templates/deployment-api.yaml +@@ -47,6 +47,9 @@ spec: + {{ tuple $envAll "gnocchi" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} + initContainers: + {{ tuple $envAll "api" $mounts_gnocchi_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +diff --git a/gnocchi/templates/job-bootstrap.yaml b/gnocchi/templates/job-bootstrap.yaml +index 5f3cfae5..d2dbc51e 100644 +--- a/gnocchi/templates/job-bootstrap.yaml ++++ b/gnocchi/templates/job-bootstrap.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "gnocchi" "keystoneUser" .Values.bootstrap.ks_user -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- end }} +diff --git a/gnocchi/templates/job-clean.yaml b/gnocchi/templates/job-clean.yaml +index 3e294bf1..ce816cb3 100644 +--- a/gnocchi/templates/job-clean.yaml ++++ b/gnocchi/templates/job-clean.yaml +@@ -63,6 +63,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "clean" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/gnocchi/templates/job-db-drop.yaml b/gnocchi/templates/job-db-drop.yaml +index 056a95f2..5f9be1ef 100644 +--- a/gnocchi/templates/job-db-drop.yaml ++++ b/gnocchi/templates/job-db-drop.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_drop }} + {{- $dbDropJob := dict "envAll" . "serviceName" "gnocchi" -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/gnocchi/templates/job-db-init-indexer.yaml b/gnocchi/templates/job-db-init-indexer.yaml +index ab078043..d0932840 100644 +--- a/gnocchi/templates/job-db-init-indexer.yaml ++++ b/gnocchi/templates/job-db-init-indexer.yaml +@@ -34,6 +34,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "db_init_postgresql" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/gnocchi/templates/job-db-init.yaml b/gnocchi/templates/job-db-init.yaml +index dace5342..99ac8e21 100644 +--- a/gnocchi/templates/job-db-init.yaml ++++ b/gnocchi/templates/job-db-init.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_init }} + {{- $dbInitJob := dict "envAll" . "serviceName" "gnocchi" -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/gnocchi/templates/job-db-sync.yaml b/gnocchi/templates/job-db-sync.yaml +index 60391847..45a11110 100644 +--- a/gnocchi/templates/job-db-sync.yaml ++++ b/gnocchi/templates/job-db-sync.yaml +@@ -34,6 +34,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "db_sync" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + - name: ceph-keyring-placement +diff --git a/gnocchi/templates/job-image-repo-sync.yaml b/gnocchi/templates/job-image-repo-sync.yaml +index 4ace9b9f..f4c4d018 100644 +--- a/gnocchi/templates/job-image-repo-sync.yaml ++++ b/gnocchi/templates/job-image-repo-sync.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "gnocchi" -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/gnocchi/templates/job-ks-endpoints.yaml b/gnocchi/templates/job-ks-endpoints.yaml +index 2f5c0555..47809e94 100644 +--- a/gnocchi/templates/job-ks-endpoints.yaml ++++ b/gnocchi/templates/job-ks-endpoints.yaml +@@ -13,6 +13,9 @@ limitations under the License. + */}} + + {{- if .Values.manifests.job_ks_endpoints }} +-{{- $ksServiceJob := dict "envAll" . "serviceName" "gnocchi" "serviceTypes" ( tuple "metric" ) -}} +-{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} ++{{- $ksEndpointsJob := dict "envAll" . "serviceName" "gnocchi" "serviceTypes" ( tuple "metric" ) -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} ++{{- end -}} ++{{ $ksEndpointsJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/gnocchi/templates/job-ks-service.yaml b/gnocchi/templates/job-ks-service.yaml +index 24c2935e..76070d6e 100644 +--- a/gnocchi/templates/job-ks-service.yaml ++++ b/gnocchi/templates/job-ks-service.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "gnocchi" "serviceTypes" ( tuple "metric" ) -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/gnocchi/templates/job-ks-user.yaml b/gnocchi/templates/job-ks-user.yaml +index 371f6b35..1dd7e5a0 100644 +--- a/gnocchi/templates/job-ks-user.yaml ++++ b/gnocchi/templates/job-ks-user.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "gnocchi" -}} ++{{- if .Values.pod.tolerations.gnocchi.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/gnocchi/templates/job-storage-init.yaml b/gnocchi/templates/job-storage-init.yaml +index e2736a5e..e4114e22 100644 +--- a/gnocchi/templates/job-storage-init.yaml ++++ b/gnocchi/templates/job-storage-init.yaml +@@ -62,6 +62,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + - name: ceph-keyring-placement +diff --git a/gnocchi/templates/pod-gnocchi-test.yaml b/gnocchi/templates/pod-gnocchi-test.yaml +index 9ceda014..8defdca1 100644 +--- a/gnocchi/templates/pod-gnocchi-test.yaml ++++ b/gnocchi/templates/pod-gnocchi-test.yaml +@@ -32,6 +32,9 @@ metadata: + spec: + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.gnocchi.enabled }} ++{{ tuple $envAll "gnocchi" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 2 }} ++{{ end }} + serviceAccountName: {{ $serviceAccountName }} + restartPolicy: Never + initContainers: +diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml +index 4ed1ba66..74cf0163 100644 +--- a/gnocchi/values.yaml ++++ b/gnocchi/values.yaml +@@ -207,6 +207,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ gnocchi: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + gnocchi_api: + init_container: null diff --git a/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/helm-toolkit/templates/manifests/_job-bootstrap.tpl -index 65020e5d..b385199a 100644 +index 3cc07cc6..5d98c8b7 100644 --- a/helm-toolkit/templates/manifests/_job-bootstrap.tpl +++ b/helm-toolkit/templates/manifests/_job-bootstrap.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -71,7 +340,7 @@ index 65020e5d..b385199a 100644 {{- $podVolMounts := index . "podVolMounts" | default false -}} {{- $podVols := index . "podVols" | default false -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} -@@ -72,6 +73,9 @@ spec: +@@ -67,6 +68,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -82,7 +351,7 @@ index 65020e5d..b385199a 100644 {{ tuple $envAll "bootstrap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl -index 6edbdb3a..934a2435 100644 +index 91fd5ad7..62ed1191 100644 --- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl +++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl @@ -28,6 +28,7 @@ limitations under the License. @@ -93,7 +362,7 @@ index 6edbdb3a..934a2435 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} {{- $dbToDrop := index . "dbToDrop" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}} -@@ -73,6 +74,9 @@ spec: +@@ -68,6 +69,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -104,7 +373,7 @@ index 6edbdb3a..934a2435 100644 {{ tuple $envAll "db_drop" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl -index bfed1968..c164ad0a 100644 +index b3348f57..745e8dab 100644 --- a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl +++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl @@ -28,6 +28,7 @@ limitations under the License. @@ -115,7 +384,7 @@ index bfed1968..c164ad0a 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} {{- $dbToInit := index . "dbToInit" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}} -@@ -73,6 +74,9 @@ spec: +@@ -68,6 +69,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -126,7 +395,7 @@ index bfed1968..c164ad0a 100644 {{ tuple $envAll "db_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-db-sync.tpl b/helm-toolkit/templates/manifests/_job-db-sync.tpl -index 71ff924b..659238a4 100644 +index 03763430..24d2496d 100644 --- a/helm-toolkit/templates/manifests/_job-db-sync.tpl +++ b/helm-toolkit/templates/manifests/_job-db-sync.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -137,7 +406,7 @@ index 71ff924b..659238a4 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} {{- $podVolMounts := index . "podVolMounts" | default false -}} -@@ -70,6 +71,9 @@ spec: +@@ -65,6 +66,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -148,7 +417,7 @@ index 71ff924b..659238a4 100644 {{ tuple $envAll "db_sync" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl -index e06aeb65..a06d0906 100644 +index 2d130e13..3a7df7ff 100644 --- a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl @@ -24,6 +24,7 @@ limitations under the License. @@ -159,18 +428,18 @@ index e06aeb65..a06d0906 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $secretBin := index . "secretBin" -}} {{- $tlsSecret := index . "tlsSecret" | default "" -}} -@@ -71,6 +72,9 @@ spec: - spec: - serviceAccountName: {{ $serviceAccountName }} +@@ -68,6 +69,9 @@ spec: restartPolicy: {{ $restartPolicy }} + nodeSelector: + {{ toYaml $nodeSelector | indent 8 }} +{{- if $tolerationsEnabled }} +{{ tuple $envAll $serviceName | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} +{{- end}} - nodeSelector: - {{ toYaml $nodeSelector | indent 8 }} initContainers: + {{ tuple $envAll "ks_endpoints" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: diff --git a/helm-toolkit/templates/manifests/_job-ks-service.tpl b/helm-toolkit/templates/manifests/_job-ks-service.tpl -index 93e64e1d..f5f195ca 100644 +index 8347b580..a109e3cc 100644 --- a/helm-toolkit/templates/manifests/_job-ks-service.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-service.tpl @@ -24,6 +24,7 @@ limitations under the License. @@ -181,7 +450,7 @@ index 93e64e1d..f5f195ca 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $secretBin := index . "secretBin" -}} {{- $tlsSecret := index . "tlsSecret" | default "" -}} -@@ -73,6 +74,9 @@ spec: +@@ -68,6 +69,9 @@ spec: restartPolicy: {{ $restartPolicy }} nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -192,7 +461,7 @@ index 93e64e1d..f5f195ca 100644 {{ tuple $envAll "ks_service" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl -index 39007de8..f6bbc148 100644 +index 80960f47..905eb71a 100644 --- a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl @@ -45,6 +45,7 @@ limitations under the License. @@ -203,7 +472,7 @@ index 39007de8..f6bbc148 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $serviceUser := index . "serviceUser" | default $serviceName -}} {{- $secretBin := index . "secretBin" -}} -@@ -96,6 +97,9 @@ spec: +@@ -68,6 +69,9 @@ spec: restartPolicy: {{ $restartPolicy }} nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -214,7 +483,7 @@ index 39007de8..f6bbc148 100644 {{ tuple $envAll "ks_user" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl -index aae71ac5..59e0da0f 100644 +index 7ecacced..69820642 100644 --- a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl @@ -18,6 +18,7 @@ limitations under the License. @@ -225,7 +494,7 @@ index aae71ac5..59e0da0f 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $serviceUser := index . "serviceUser" | default $serviceName -}} {{- $secretBin := index . "secretBin" -}} -@@ -63,6 +64,9 @@ spec: +@@ -58,6 +59,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -236,7 +505,7 @@ index aae71ac5..59e0da0f 100644 {{ tuple $envAll "rabbit_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl -index 42bb8548..240c29ca 100644 +index 9dc28597..29cb9937 100644 --- a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -247,7 +516,7 @@ index 42bb8548..240c29ca 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapCeph := index . "configMapCeph" | default (printf "ceph-etc" ) -}} {{- $secretBin := index . "secretBin" -}} -@@ -68,6 +69,9 @@ spec: +@@ -63,6 +64,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -258,7 +527,7 @@ index 42bb8548..240c29ca 100644 {{ tuple $envAll "s3_bucket" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl -index 36fe3582..440e9590 100644 +index 3dd407ea..50d9af59 100644 --- a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -269,7 +538,7 @@ index 36fe3582..440e9590 100644 {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapCeph := index . "configMapCeph" | default (printf "ceph-etc" ) -}} {{- $secretBin := index . "secretBin" -}} -@@ -66,6 +67,9 @@ spec: +@@ -61,6 +62,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -280,7 +549,7 @@ index 36fe3582..440e9590 100644 {{ tuple $envAll "s3_user" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - name: ceph-keyring-placement diff --git a/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl b/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl -index c1609195..6bcd8694 100644 +index 6fed825f..0906df4c 100644 --- a/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl +++ b/helm-toolkit/templates/manifests/_job_image_repo_sync.tpl @@ -23,6 +23,7 @@ limitations under the License. @@ -291,7 +560,7 @@ index c1609195..6bcd8694 100644 {{- $podVolMounts := index . "podVolMounts" | default false -}} {{- $podVols := index . "podVols" | default false -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} -@@ -65,6 +66,9 @@ spec: +@@ -60,6 +61,9 @@ spec: restartPolicy: OnFailure nodeSelector: {{ toYaml $nodeSelector | indent 8 }} @@ -302,16 +571,11 @@ index c1609195..6bcd8694 100644 {{ tuple $envAll "image_repo_sync" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml -index 417e63d4..0d417f98 100644 +index 417e63d4..ccd6c3b3 100644 --- a/ingress/templates/deployment-error.yaml +++ b/ingress/templates/deployment-error.yaml -@@ -47,8 +47,14 @@ spec: - serviceAccountName: {{ $serviceAccountName }} - affinity: +@@ -49,6 +49,9 @@ spec: {{ tuple $envAll "ingress" "error-pages" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} -+{{ if $envAll.Values.pod.tolerations.ingress.enabled }} -+{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} -+{{ end }} nodeSelector: {{ .Values.labels.error_server.node_selector_key }}: {{ .Values.labels.error_server.node_selector_value | quote }} +{{ if $envAll.Values.pod.tolerations.ingress.enabled }} @@ -339,7 +603,7 @@ index c4841467..2132f9a3 100644 --- a/ingress/templates/job-image-repo-sync.yaml +++ b/ingress/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "ingress" -}} +{{- if .Values.pod.tolerations.ingress.enabled -}} @@ -384,7 +648,7 @@ index d359d1aa..91d52820 100644 --- a/libvirt/templates/job-image-repo-sync.yaml +++ b/libvirt/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "libvirt" -}} +{{- if .Values.pod.tolerations.libvirt.enabled -}} @@ -457,7 +721,7 @@ index 3c2b5d21..2121a397 100644 --- a/mariadb/templates/job-image-repo-sync.yaml +++ b/mariadb/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "mariadb" -}} +{{- if .Values.pod.tolerations.mariadb.enabled -}} @@ -525,7 +789,7 @@ index b86bf925..c355d42a 100644 server: 3 ingress: 2 diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml -index 1b4e2027..221bfdbe 100644 +index fc827495..0aa5f8ee 100644 --- a/memcached/templates/deployment.yaml +++ b/memcached/templates/deployment.yaml @@ -50,6 +50,9 @@ spec: @@ -543,7 +807,7 @@ index e2438d7e..ae519ff0 100644 --- a/memcached/templates/job-image-repo-sync.yaml +++ b/memcached/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "memcached" -}} +{{- if .Values.pod.tolerations.memcached.enabled -}} @@ -552,10 +816,10 @@ index e2438d7e..ae519ff0 100644 {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} {{- end }} diff --git a/memcached/values.yaml b/memcached/values.yaml -index 7ad6d29e..9cf3d3a2 100644 +index 889f8cb3..f03a6901 100644 --- a/memcached/values.yaml +++ b/memcached/values.yaml -@@ -169,6 +169,13 @@ pod: +@@ -142,6 +142,13 @@ pod: default: preferredDuringSchedulingIgnoredDuringExecution weight: default: 10 @@ -602,7 +866,7 @@ index 4d1058ed..765061c3 100644 --- a/openvswitch/templates/job-image-repo-sync.yaml +++ b/openvswitch/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "openvswitch" -}} +{{- if .Values.pod.tolerations.openvswitch.enabled -}} @@ -616,7 +880,7 @@ index de6169a1..c953a899 100644 +++ b/openvswitch/values.yaml @@ -37,6 +37,13 @@ labels: node_selector_value: enabled - + pod: + tolerations: + openvswitch: @@ -647,7 +911,7 @@ index 4875ed44..8fd379f9 100644 --- a/rabbitmq/templates/job-image-repo-sync.yaml +++ b/rabbitmq/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "rabbitmq" -}} +{{- if .Values.pod.tolerations.rabbitmq.enabled -}} diff --git a/openstack-helm/debian/deb_folder/patches/0010-Enable-taint-toleration-for-Openstack-services.patch b/openstack-helm/debian/deb_folder/patches/0010-Enable-taint-toleration-for-Openstack-services.patch index 42cf38b5..2a95def2 100644 --- a/openstack-helm/debian/deb_folder/patches/0010-Enable-taint-toleration-for-Openstack-services.patch +++ b/openstack-helm/debian/deb_folder/patches/0010-Enable-taint-toleration-for-Openstack-services.patch @@ -1,4 +1,4 @@ -From afa951333e70f1771683d4c51edba1a9c4eeed8a Mon Sep 17 00:00:00 2001 +From 768dd45d75528f81d23ed5adc303eb760e69d9aa Mon Sep 17 00:00:00 2001 From: Lucas Cavalcante Date: Wed, 6 Oct 2021 14:49:17 -0300 Subject: [PATCH] Enable taint toleration for Openstack services @@ -12,6 +12,52 @@ Task: 43531 Change-Id: I8f63c285cb53090cd7eb0b663bb94fc892dc1a3f Depends-On: I1c731c94e58895bd8bfc26d4300aac40a9111f12 --- + aodh/templates/cron-job-alarms-cleaner.yaml | 3 +++ + aodh/templates/deployment-api.yaml | 3 +++ + aodh/templates/deployment-evaluator.yaml | 3 +++ + aodh/templates/deployment-listener.yaml | 3 +++ + aodh/templates/deployment-notifier.yaml | 3 +++ + aodh/templates/job-bootstrap.yaml | 3 +++ + aodh/templates/job-db-drop.yaml | 3 +++ + aodh/templates/job-db-init.yaml | 3 +++ + aodh/templates/job-db-sync.yaml | 3 +++ + aodh/templates/job-image-repo-sync.yaml | 3 +++ + aodh/templates/job-ks-endpoints.yaml | 3 +++ + aodh/templates/job-ks-service.yaml | 3 +++ + aodh/templates/job-ks-user.yaml | 3 +++ + aodh/templates/job-rabbit-init.yaml | 3 +++ + aodh/templates/pod-aodh-test.yaml | 3 +++ + aodh/values.yaml | 7 +++++++ + barbican/templates/deployment-api.yaml | 3 +++ + barbican/templates/job-bootstrap.yaml | 3 +++ + barbican/templates/job-db-drop.yaml | 3 +++ + barbican/templates/job-db-init.yaml | 3 +++ + barbican/templates/job-db-sync.yaml | 3 +++ + barbican/templates/job-image-repo-sync.yaml | 3 +++ + barbican/templates/job-ks-endpoints.yaml | 3 +++ + barbican/templates/job-ks-service.yaml | 3 +++ + barbican/templates/job-ks-user.yaml | 3 +++ + barbican/templates/job-rabbit-init.yaml | 3 +++ + barbican/templates/pod-test.yaml | 3 +++ + barbican/values.yaml | 7 +++++++ + ceilometer/templates/daemonset-compute.yaml | 3 +++ + ceilometer/templates/daemonset-ipmi.yaml | 3 +++ + ceilometer/templates/deployment-api.yaml | 3 +++ + ceilometer/templates/deployment-central.yaml | 3 +++ + ceilometer/templates/deployment-collector.yaml | 3 +++ + ceilometer/templates/deployment-notification.yaml | 3 +++ + ceilometer/templates/job-bootstrap.yaml | 3 +++ + ceilometer/templates/job-db-drop.yaml | 3 +++ + ceilometer/templates/job-db-init-mongodb.yaml | 3 +++ + ceilometer/templates/job-db-init.yaml | 3 +++ + ceilometer/templates/job-db-sync.yaml | 3 +++ + ceilometer/templates/job-image-repo-sync.yaml | 3 +++ + ceilometer/templates/job-ks-endpoints.yaml | 7 +++++-- + ceilometer/templates/job-ks-service.yaml | 3 +++ + ceilometer/templates/job-ks-user.yaml | 3 +++ + ceilometer/templates/job-rabbit-init.yaml | 3 +++ + ceilometer/templates/pod-rally-test.yaml | 3 +++ + ceilometer/values.yaml | 7 +++++++ cinder/templates/cron-job-cinder-volume-usage-audit.yaml | 3 +++ cinder/templates/deployment-api.yaml | 3 +++ cinder/templates/deployment-backup.yaml | 3 +++ @@ -75,6 +121,19 @@ Depends-On: I1c731c94e58895bd8bfc26d4300aac40a9111f12 horizon/templates/job-image-repo-sync.yaml | 3 +++ horizon/templates/pod-helm-tests.yaml | 3 +++ horizon/values.yaml | 7 +++++++ + ironic/templates/deployment-api.yaml | 3 +++ + ironic/templates/job-bootstrap.yaml | 3 +++ + ironic/templates/job-db-drop.yaml | 3 +++ + ironic/templates/job-db-init.yaml | 3 +++ + ironic/templates/job-db-sync.yaml | 3 +++ + ironic/templates/job-image-repo-sync.yaml | 3 +++ + ironic/templates/job-ks-endpoints.yaml | 7 +++++-- + ironic/templates/job-ks-service.yaml | 3 +++ + ironic/templates/job-ks-user.yaml | 3 +++ + ironic/templates/job-manage-cleaning-network.yaml | 3 +++ + ironic/templates/job-rabbit-init.yaml | 3 +++ + ironic/templates/statefulset-conductor.yaml | 3 +++ + ironic/values.yaml | 7 +++++++ keystone/templates/cron-job-credential-rotate.yaml | 3 +++ keystone/templates/cron-job-fernet-rotate.yaml | 3 +++ keystone/templates/deployment-api.yaml | 3 +++ @@ -148,8 +207,640 @@ Depends-On: I1c731c94e58895bd8bfc26d4300aac40a9111f12 placement/templates/job-ks-service.yaml | 3 +++ placement/templates/job-ks-user.yaml | 3 +++ placement/values.yaml | 7 +++++++ - 138 files changed, 440 insertions(+) + 195 files changed, 637 insertions(+), 4 deletions(-) +diff --git a/aodh/templates/cron-job-alarms-cleaner.yaml b/aodh/templates/cron-job-alarms-cleaner.yaml +index ae39e7a1..a9b2f62f 100644 +--- a/aodh/templates/cron-job-alarms-cleaner.yaml ++++ b/aodh/templates/cron-job-alarms-cleaner.yaml +@@ -48,6 +48,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + initContainers: + {{ tuple $envAll "alarms_cleaner" $mounts_aodh_alarms_cleaner_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} + containers: +diff --git a/aodh/templates/deployment-api.yaml b/aodh/templates/deployment-api.yaml +index c4ae5efd..8ddeb980 100644 +--- a/aodh/templates/deployment-api.yaml ++++ b/aodh/templates/deployment-api.yaml +@@ -52,6 +52,9 @@ spec: + {{ tuple $envAll "aodh" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} + initContainers: + {{ tuple $envAll "api" $mounts_aodh_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +diff --git a/aodh/templates/deployment-evaluator.yaml b/aodh/templates/deployment-evaluator.yaml +index b44aae2e..4dd9b46b 100644 +--- a/aodh/templates/deployment-evaluator.yaml ++++ b/aodh/templates/deployment-evaluator.yaml +@@ -52,6 +52,9 @@ spec: + {{ tuple $envAll "aodh" "evaluator" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.evaluator.node_selector_key }}: {{ .Values.labels.evaluator.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "evaluator" $mounts_aodh_evaluator_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/aodh/templates/deployment-listener.yaml b/aodh/templates/deployment-listener.yaml +index db137f6a..9d765087 100644 +--- a/aodh/templates/deployment-listener.yaml ++++ b/aodh/templates/deployment-listener.yaml +@@ -52,6 +52,9 @@ spec: + {{ tuple $envAll "aodh" "listener" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.listener.node_selector_key }}: {{ .Values.labels.listener.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "listener" $mounts_aodh_listener_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/aodh/templates/deployment-notifier.yaml b/aodh/templates/deployment-notifier.yaml +index 7ee8d866..37930a5c 100644 +--- a/aodh/templates/deployment-notifier.yaml ++++ b/aodh/templates/deployment-notifier.yaml +@@ -52,6 +52,9 @@ spec: + {{ tuple $envAll "aodh" "notifier" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.notifier.node_selector_key }}: {{ .Values.labels.notifier.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "notifier" $mounts_aodh_notifier_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/aodh/templates/job-bootstrap.yaml b/aodh/templates/job-bootstrap.yaml +index e6b6f7a7..9ec2874c 100644 +--- a/aodh/templates/job-bootstrap.yaml ++++ b/aodh/templates/job-bootstrap.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "aodh" "keystoneUser" .Values.bootstrap.ks_user -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- end }} +diff --git a/aodh/templates/job-db-drop.yaml b/aodh/templates/job-db-drop.yaml +index 5f5129a3..2cb1b1f7 100644 +--- a/aodh/templates/job-db-drop.yaml ++++ b/aodh/templates/job-db-drop.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_drop }} + {{- $dbDropJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/aodh/templates/job-db-init.yaml b/aodh/templates/job-db-init.yaml +index 8d0fddeb..4119c0e4 100644 +--- a/aodh/templates/job-db-init.yaml ++++ b/aodh/templates/job-db-init.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_init }} + {{- $dbInitJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/aodh/templates/job-db-sync.yaml b/aodh/templates/job-db-sync.yaml +index 11f14fa3..25b3c063 100644 +--- a/aodh/templates/job-db-sync.yaml ++++ b/aodh/templates/job-db-sync.yaml +@@ -17,5 +17,8 @@ limitations under the License. + {{- if .Values.manifests.job_db_sync }} + {{- $dbSyncJob := dict "envAll" . "serviceName" "aodh" -}} + {{- $dbSyncJob := dict "envAll" . "serviceName" "aodh" "podVolMounts" .Values.pod.mounts.aodh_db_sync.aodh_db_sync.volumeMounts "podVols" .Values.pod.mounts.aodh_db_sync.aodh_db_sync.volumes -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }} + {{- end }} +diff --git a/aodh/templates/job-image-repo-sync.yaml b/aodh/templates/job-image-repo-sync.yaml +index ebab594f..f3190039 100644 +--- a/aodh/templates/job-image-repo-sync.yaml ++++ b/aodh/templates/job-image-repo-sync.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/aodh/templates/job-ks-endpoints.yaml b/aodh/templates/job-ks-endpoints.yaml +index 61819c83..f77c0b13 100644 +--- a/aodh/templates/job-ks-endpoints.yaml ++++ b/aodh/templates/job-ks-endpoints.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_endpoints }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "aodh" "serviceTypes" ( tuple "alarming" ) -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/aodh/templates/job-ks-service.yaml b/aodh/templates/job-ks-service.yaml +index 2c14e1a4..1679c7e9 100644 +--- a/aodh/templates/job-ks-service.yaml ++++ b/aodh/templates/job-ks-service.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "aodh" "serviceTypes" ( tuple "alarming" ) -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/aodh/templates/job-ks-user.yaml b/aodh/templates/job-ks-user.yaml +index d529fa3f..1bb2327d 100644 +--- a/aodh/templates/job-ks-user.yaml ++++ b/aodh/templates/job-ks-user.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/aodh/templates/job-rabbit-init.yaml b/aodh/templates/job-rabbit-init.yaml +index 866cbbd4..fc4a42bf 100644 +--- a/aodh/templates/job-rabbit-init.yaml ++++ b/aodh/templates/job-rabbit-init.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_rabbit_init }} + {{- $rmqUserJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} + {{- end }} +diff --git a/aodh/templates/pod-aodh-test.yaml b/aodh/templates/pod-aodh-test.yaml +index 6e627b83..4a4d5b5a 100644 +--- a/aodh/templates/pod-aodh-test.yaml ++++ b/aodh/templates/pod-aodh-test.yaml +@@ -36,6 +36,9 @@ spec: + restartPolicy: Never + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 2 }} ++{{ end }} + serviceAccountName: {{ $serviceAccountName }} + initContainers: + {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} +diff --git a/aodh/values.yaml b/aodh/values.yaml +index 6ed0434c..c584d10f 100644 +--- a/aodh/values.yaml ++++ b/aodh/values.yaml +@@ -98,6 +98,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ aodh: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + aodh_api: + init_container: null +diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml +index 4a3a6ea0..2386d359 100644 +--- a/barbican/templates/deployment-api.yaml ++++ b/barbican/templates/deployment-api.yaml +@@ -51,6 +51,9 @@ spec: + {{ tuple $envAll "barbican" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.barbican.enabled }} ++{{ tuple $envAll "barbican" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "api" $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 a98148ed..ced8bc3e 100644 +--- a/barbican/templates/job-bootstrap.yaml ++++ b/barbican/templates/job-bootstrap.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "5" + + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "barbican" "keystoneUser" .Values.bootstrap.ks_user "logConfigFile" .Values.conf.barbican.DEFAULT.log_config_append "jobAnnotations" (include "metadata.annotations.job.bootstrap" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- end }} +diff --git a/barbican/templates/job-db-drop.yaml b/barbican/templates/job-db-drop.yaml +index 82fa3f45..b6f0a6fa 100644 +--- a/barbican/templates/job-db-drop.yaml ++++ b/barbican/templates/job-db-drop.yaml +@@ -19,5 +19,8 @@ limitations under the License. + {{- if .Values.manifests.certificates -}} + {{- $_ := set $dbToDrop "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} + {{- end -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/barbican/templates/job-db-init.yaml b/barbican/templates/job-db-init.yaml +index 7e9fab03..1d1f3a50 100644 +--- a/barbican/templates/job-db-init.yaml ++++ b/barbican/templates/job-db-init.yaml +@@ -26,5 +26,8 @@ helm.sh/hook-weight: "-5" + {{- if .Values.manifests.certificates -}} + {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} + {{- end -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/barbican/templates/job-db-sync.yaml b/barbican/templates/job-db-sync.yaml +index 8ec6e85b..587be68a 100644 +--- a/barbican/templates/job-db-sync.yaml ++++ b/barbican/templates/job-db-sync.yaml +@@ -28,5 +28,8 @@ helm.sh/hook-weight: "-4" + {{- if .Values.manifests.certificates -}} + {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} + {{- end -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }} + {{- end }} +diff --git a/barbican/templates/job-image-repo-sync.yaml b/barbican/templates/job-image-repo-sync.yaml +index 0181de3a..5faccb13 100644 +--- a/barbican/templates/job-image-repo-sync.yaml ++++ b/barbican/templates/job-image-repo-sync.yaml +@@ -20,5 +20,8 @@ helm.sh/hook: post-install,post-upgrade + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "barbican" "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/barbican/templates/job-ks-endpoints.yaml b/barbican/templates/job-ks-endpoints.yaml +index e8ec4c5a..023f58e1 100644 +--- a/barbican/templates/job-ks-endpoints.yaml ++++ b/barbican/templates/job-ks-endpoints.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "-2" + + {{- if .Values.manifests.job_ks_endpoints }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "barbican" "serviceTypes" ( tuple "key-manager" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/barbican/templates/job-ks-service.yaml b/barbican/templates/job-ks-service.yaml +index a86c1bcb..c0e06830 100644 +--- a/barbican/templates/job-ks-service.yaml ++++ b/barbican/templates/job-ks-service.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "-3" + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "barbican" "serviceTypes" ( tuple "key-manager" ) "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/barbican/templates/job-ks-user.yaml b/barbican/templates/job-ks-user.yaml +index ab5ac9a8..e16e0338 100644 +--- a/barbican/templates/job-ks-user.yaml ++++ b/barbican/templates/job-ks-user.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "-1" + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "barbican" "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/barbican/templates/job-rabbit-init.yaml b/barbican/templates/job-rabbit-init.yaml +index 702bcaea..75bb5fc1 100644 +--- a/barbican/templates/job-rabbit-init.yaml ++++ b/barbican/templates/job-rabbit-init.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "-4" + + {{- if .Values.manifests.job_rabbit_init }} + {{- $rmqUserJob := dict "envAll" . "serviceName" "barbican" "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} + {{- end }} +diff --git a/barbican/templates/pod-test.yaml b/barbican/templates/pod-test.yaml +index c44a95e5..14a2270f 100644 +--- a/barbican/templates/pod-test.yaml ++++ b/barbican/templates/pod-test.yaml +@@ -37,6 +37,9 @@ spec: + {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }} + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.barbican.enabled }} ++{{ tuple $envAll "barbican" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 2 }} ++{{ end }} + restartPolicy: Never + initContainers: + {{ tuple $envAll "tests" $mounts_barbican_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} +diff --git a/barbican/values.yaml b/barbican/values.yaml +index 8d567eda..9e9f65a2 100644 +--- a/barbican/values.yaml ++++ b/barbican/values.yaml +@@ -78,6 +78,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ barbican: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + barbican_api: + init_container: null +diff --git a/ceilometer/templates/daemonset-compute.yaml b/ceilometer/templates/daemonset-compute.yaml +index d7047381..b96b7e76 100644 +--- a/ceilometer/templates/daemonset-compute.yaml ++++ b/ceilometer/templates/daemonset-compute.yaml +@@ -51,6 +51,9 @@ spec: + dnsPolicy: ClusterFirstWithHostNet + nodeSelector: + {{ .Values.labels.compute.node_selector_key }}: {{ .Values.labels.compute.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "compute" $mounts_ceilometer_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/daemonset-ipmi.yaml b/ceilometer/templates/daemonset-ipmi.yaml +index 58f0e40b..374ff645 100644 +--- a/ceilometer/templates/daemonset-ipmi.yaml ++++ b/ceilometer/templates/daemonset-ipmi.yaml +@@ -51,6 +51,9 @@ spec: + dnsPolicy: ClusterFirstWithHostNet + nodeSelector: + {{ .Values.labels.ipmi.node_selector_key }}: {{ .Values.labels.ipmi.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "ipmi" $mounts_ceilometer_ipmi_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/deployment-api.yaml b/ceilometer/templates/deployment-api.yaml +index 1cc3a2fc..ab88748f 100644 +--- a/ceilometer/templates/deployment-api.yaml ++++ b/ceilometer/templates/deployment-api.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ceilometer" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} + initContainers: + {{ tuple $envAll "api" $mounts_ceilometer_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml +index 12efc64e..e2c34d1b 100644 +--- a/ceilometer/templates/deployment-central.yaml ++++ b/ceilometer/templates/deployment-central.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ceilometer" "central" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.central.node_selector_key }}: {{ .Values.labels.central.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "central" $mounts_ceilometer_central_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/deployment-collector.yaml b/ceilometer/templates/deployment-collector.yaml +index a5b31172..0fb1f604 100644 +--- a/ceilometer/templates/deployment-collector.yaml ++++ b/ceilometer/templates/deployment-collector.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ceilometer" "collector" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.collector.node_selector_key }}: {{ .Values.labels.collector.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "collector" $mounts_ceilometer_collector_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml +index 1f65ad21..0803f905 100644 +--- a/ceilometer/templates/deployment-notification.yaml ++++ b/ceilometer/templates/deployment-notification.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ceilometer" "notification" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.notification.node_selector_key }}: {{ .Values.labels.notification.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "notification" $mounts_ceilometer_notification_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/job-bootstrap.yaml b/ceilometer/templates/job-bootstrap.yaml +index 8572a797..cc72fb44 100644 +--- a/ceilometer/templates/job-bootstrap.yaml ++++ b/ceilometer/templates/job-bootstrap.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "ceilometer" "keystoneUser" .Values.bootstrap.ks_user -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- end }} +diff --git a/ceilometer/templates/job-db-drop.yaml b/ceilometer/templates/job-db-drop.yaml +index 6e819b61..981792e1 100644 +--- a/ceilometer/templates/job-db-drop.yaml ++++ b/ceilometer/templates/job-db-drop.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_drop }} + {{- $dbDropJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/ceilometer/templates/job-db-init-mongodb.yaml b/ceilometer/templates/job-db-init-mongodb.yaml +index 60f2974a..aeed1628 100644 +--- a/ceilometer/templates/job-db-init-mongodb.yaml ++++ b/ceilometer/templates/job-db-init-mongodb.yaml +@@ -31,6 +31,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + initContainers: + {{ tuple $envAll "db_init_mongodb" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/job-db-init.yaml b/ceilometer/templates/job-db-init.yaml +index 3912f400..a578a887 100644 +--- a/ceilometer/templates/job-db-init.yaml ++++ b/ceilometer/templates/job-db-init.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_init }} + {{- $dbInitJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/ceilometer/templates/job-db-sync.yaml b/ceilometer/templates/job-db-sync.yaml +index bc5882bd..dc04c4d8 100644 +--- a/ceilometer/templates/job-db-sync.yaml ++++ b/ceilometer/templates/job-db-sync.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_sync }} + {{- $dbSyncJob := dict "envAll" . "serviceName" "ceilometer" "podVolMounts" .Values.pod.mounts.ceilometer_db_sync.ceilometer_db_sync.volumeMounts "podVols" .Values.pod.mounts.ceilometer_db_sync.ceilometer_db_sync.volumes -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }} + {{- end }} +diff --git a/ceilometer/templates/job-image-repo-sync.yaml b/ceilometer/templates/job-image-repo-sync.yaml +index a1a8a49a..9cb0112b 100644 +--- a/ceilometer/templates/job-image-repo-sync.yaml ++++ b/ceilometer/templates/job-image-repo-sync.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/ceilometer/templates/job-ks-endpoints.yaml b/ceilometer/templates/job-ks-endpoints.yaml +index 9421c2e7..fd7b3e26 100644 +--- a/ceilometer/templates/job-ks-endpoints.yaml ++++ b/ceilometer/templates/job-ks-endpoints.yaml +@@ -13,6 +13,9 @@ limitations under the License. + */}} + + {{- if .Values.manifests.job_ks_endpoints }} +-{{- $ksServiceJob := dict "envAll" . "serviceName" "ceilometer" "serviceTypes" ( tuple "metering" ) -}} +-{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} ++{{- $ksEndpointsJob := dict "envAll" . "serviceName" "ceilometer" "serviceTypes" ( tuple "metering" ) -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} ++{{- end -}} ++{{ $ksEndpointsJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/ceilometer/templates/job-ks-service.yaml b/ceilometer/templates/job-ks-service.yaml +index 38b57342..78643764 100644 +--- a/ceilometer/templates/job-ks-service.yaml ++++ b/ceilometer/templates/job-ks-service.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "ceilometer" "serviceTypes" ( tuple "metering" ) -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/ceilometer/templates/job-ks-user.yaml b/ceilometer/templates/job-ks-user.yaml +index 2f5be60e..d7da2bf1 100644 +--- a/ceilometer/templates/job-ks-user.yaml ++++ b/ceilometer/templates/job-ks-user.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/ceilometer/templates/job-rabbit-init.yaml b/ceilometer/templates/job-rabbit-init.yaml +index 71661784..0130e635 100644 +--- a/ceilometer/templates/job-rabbit-init.yaml ++++ b/ceilometer/templates/job-rabbit-init.yaml +@@ -13,5 +13,8 @@ limitations under the License. + */}} + {{- if .Values.manifests.job_rabbit_init }} + {{- $rmqUserJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} + {{- end }} +diff --git a/ceilometer/templates/pod-rally-test.yaml b/ceilometer/templates/pod-rally-test.yaml +index f2538173..1f47b5f6 100644 +--- a/ceilometer/templates/pod-rally-test.yaml ++++ b/ceilometer/templates/pod-rally-test.yaml +@@ -32,6 +32,9 @@ spec: + restartPolicy: Never + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 2 }} ++{{ end }} + serviceAccountName: {{ $serviceAccountName }} + initContainers: + {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} +diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml +index a6c1b2c8..3abd3c0b 100644 +--- a/ceilometer/values.yaml ++++ b/ceilometer/values.yaml +@@ -1921,6 +1921,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ ceilometer: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + ceilometer_tests: + init_container: null diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml index 3d13af36..4b152081 100644 --- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml @@ -919,7 +1610,7 @@ index 58f786b6..36017d63 100644 heat_api: init_container: null diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml -index 1922423f..b7c24836 100644 +index dd20a76f..20bc3951 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -51,6 +51,9 @@ spec: @@ -977,7 +1668,7 @@ index 37b14a8c..e98bbb24 100644 --- a/horizon/templates/job-image-repo-sync.yaml +++ b/horizon/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "horizon" -}} +{{- if .Values.pod.tolerations.horizon.enabled -}} @@ -1000,10 +1691,10 @@ index 76f5b353..dbcb9a3c 100644 {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} initContainers: diff --git a/horizon/values.yaml b/horizon/values.yaml -index 9b138c0c..f2bc5b9f 100644 +index a20dca46..3dc85f10 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml -@@ -1116,6 +1116,13 @@ pod: +@@ -1125,6 +1125,13 @@ pod: default: kubernetes.io/hostname weight: default: 10 @@ -1017,6 +1708,187 @@ index 9b138c0c..f2bc5b9f 100644 mounts: horizon_db_init: init_container: null +diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml +index 76f15655..606a5fe9 100644 +--- a/ironic/templates/deployment-api.yaml ++++ b/ironic/templates/deployment-api.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ironic" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ironic.enabled }} ++{{ tuple $envAll "ironic" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} + initContainers: + {{ tuple $envAll "api" $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 94221860..190d412d 100644 +--- a/ironic/templates/job-bootstrap.yaml ++++ b/ironic/templates/job-bootstrap.yaml +@@ -20,6 +20,9 @@ helm.sh/hook-weight: "5" + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.image.enabled }} + {{- if .Values.bootstrap.image.openstack.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "ironic" "keystoneUser" .Values.bootstrap.image.openstack.ks_user "logConfigFile" .Values.conf.ironic.DEFAULT.log_config_append "jobAnnotations" (include "metadata.annotations.job.bootstrap" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- else }} + {{ include "helm-toolkit.manifests.job_bootstrap" }} +diff --git a/ironic/templates/job-db-drop.yaml b/ironic/templates/job-db-drop.yaml +index 6566b5cb..1154db9e 100644 +--- a/ironic/templates/job-db-drop.yaml ++++ b/ironic/templates/job-db-drop.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_drop }} + {{- $dbDropJob := dict "envAll" . "serviceName" "ironic" -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/ironic/templates/job-db-init.yaml b/ironic/templates/job-db-init.yaml +index e2fd27d7..22c071d5 100644 +--- a/ironic/templates/job-db-init.yaml ++++ b/ironic/templates/job-db-init.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-5" + + {{- if .Values.manifests.job_db_init }} + {{- $dbInitJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/ironic/templates/job-db-sync.yaml b/ironic/templates/job-db-sync.yaml +index 00bf4df2..c397bcf2 100644 +--- a/ironic/templates/job-db-sync.yaml ++++ b/ironic/templates/job-db-sync.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-4" + + {{- if .Values.manifests.job_db_sync }} + {{- $dbSyncJob := dict "envAll" . "serviceName" "ironic" "podVolMounts" .Values.pod.mounts.ironic_db_sync.ironic_db_sync.volumeMounts "podVols" .Values.pod.mounts.ironic_db_sync.ironic_db_sync.volumes "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }} + {{- end }} +diff --git a/ironic/templates/job-image-repo-sync.yaml b/ironic/templates/job-image-repo-sync.yaml +index 8399f6dd..e83bac91 100644 +--- a/ironic/templates/job-image-repo-sync.yaml ++++ b/ironic/templates/job-image-repo-sync.yaml +@@ -18,5 +18,8 @@ helm.sh/hook: post-install,post-upgrade + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/ironic/templates/job-ks-endpoints.yaml b/ironic/templates/job-ks-endpoints.yaml +index 73b2fa63..940e13ce 100644 +--- a/ironic/templates/job-ks-endpoints.yaml ++++ b/ironic/templates/job-ks-endpoints.yaml +@@ -18,6 +18,9 @@ helm.sh/hook-weight: "-2" + {{- end }} + + {{- if .Values.manifests.job_ks_endpoints }} +-{{- $ksServiceJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} +-{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} ++{{- $ksEndpointsJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} ++{{- end -}} ++{{ $ksEndpointsJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/ironic/templates/job-ks-service.yaml b/ironic/templates/job-ks-service.yaml +index c4c64e1d..40cc9786 100644 +--- a/ironic/templates/job-ks-service.yaml ++++ b/ironic/templates/job-ks-service.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-3" + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/ironic/templates/job-ks-user.yaml b/ironic/templates/job-ks-user.yaml +index 8f277b37..a09aa9d2 100644 +--- a/ironic/templates/job-ks-user.yaml ++++ b/ironic/templates/job-ks-user.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-1" + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/ironic/templates/job-manage-cleaning-network.yaml b/ironic/templates/job-manage-cleaning-network.yaml +index 6ccb2b8a..b1904d4b 100644 +--- a/ironic/templates/job-manage-cleaning-network.yaml ++++ b/ironic/templates/job-manage-cleaning-network.yaml +@@ -36,6 +36,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ironic.enabled }} ++{{ tuple $envAll "ironic" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + initContainers: + {{ tuple $envAll "manage_cleaning_network" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ironic/templates/job-rabbit-init.yaml b/ironic/templates/job-rabbit-init.yaml +index 846cc336..8d80b7c2 100644 +--- a/ironic/templates/job-rabbit-init.yaml ++++ b/ironic/templates/job-rabbit-init.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-4" + + {{- if .Values.manifests.job_rabbit_init }} + {{- $rmqUserJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} + {{- end }} +diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml +index c427c4e9..3093a2da 100644 +--- a/ironic/templates/statefulset-conductor.yaml ++++ b/ironic/templates/statefulset-conductor.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ironic" "conductor" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.conductor.node_selector_key }}: {{ .Values.labels.conductor.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ironic.enabled }} ++{{ tuple $envAll "ironic" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + securityContext: + runAsUser: 0 + hostNetwork: True +diff --git a/ironic/values.yaml b/ironic/values.yaml +index eb29ab7d..0112a80a 100644 +--- a/ironic/values.yaml ++++ b/ironic/values.yaml +@@ -550,6 +550,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ ironic: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + ironic_api: + init_container: null diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml index fd26b230..8e9f82fc 100644 --- a/keystone/templates/cron-job-credential-rotate.yaml @@ -1046,7 +1918,7 @@ index 8f4f4f9a..96dcc74d 100644 {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml -index b9f5701f..fefbc47f 100644 +index f4154932..94e705b8 100644 --- a/keystone/templates/deployment-api.yaml +++ b/keystone/templates/deployment-api.yaml @@ -58,6 +58,9 @@ spec: @@ -1172,7 +2044,7 @@ index fd301c35..c8cfc5d0 100644 --- a/keystone/templates/job-image-repo-sync.yaml +++ b/keystone/templates/job-image-repo-sync.yaml @@ -17,5 +17,8 @@ helm.sh/hook: post-install,post-upgrade - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "keystone" "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) -}} +{{- if .Values.pod.tolerations.keystone.enabled -}} @@ -1194,10 +2066,10 @@ index 2bb258e7..02390adf 100644 {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} {{- end }} diff --git a/keystone/values.yaml b/keystone/values.yaml -index 8031bcea..de450e3a 100644 +index 301ff6fa..d0f66a7b 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml -@@ -219,6 +219,13 @@ pod: +@@ -217,6 +217,13 @@ pod: default: kubernetes.io/hostname weight: default: 10 @@ -1557,7 +2429,7 @@ index bbe3fabd..9f745ace 100644 {{ tuple $envAll "service_cleaner" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} containers: diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml -index 4c690d61..927f5ad1 100644 +index e600e587..75289c79 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -78,6 +78,9 @@ spec: @@ -1868,10 +2740,10 @@ index eabe8b6c..019596f1 100644 serviceAccountName: {{ $serviceAccountName }} initContainers: diff --git a/nova/values.yaml b/nova/values.yaml -index cdb14575..4e6ce0ac 100644 +index 72dd0d11..f8ebc9ab 100644 --- a/nova/values.yaml +++ b/nova/values.yaml -@@ -2259,6 +2259,13 @@ pod: +@@ -2261,6 +2261,13 @@ pod: default: kubernetes.io/hostname weight: default: 10 diff --git a/openstack-helm/files/0010-Enable-taint-toleration-for-Openstack-services.patch b/openstack-helm/files/0010-Enable-taint-toleration-for-Openstack-services.patch index 42cf38b5..2a95def2 100644 --- a/openstack-helm/files/0010-Enable-taint-toleration-for-Openstack-services.patch +++ b/openstack-helm/files/0010-Enable-taint-toleration-for-Openstack-services.patch @@ -1,4 +1,4 @@ -From afa951333e70f1771683d4c51edba1a9c4eeed8a Mon Sep 17 00:00:00 2001 +From 768dd45d75528f81d23ed5adc303eb760e69d9aa Mon Sep 17 00:00:00 2001 From: Lucas Cavalcante Date: Wed, 6 Oct 2021 14:49:17 -0300 Subject: [PATCH] Enable taint toleration for Openstack services @@ -12,6 +12,52 @@ Task: 43531 Change-Id: I8f63c285cb53090cd7eb0b663bb94fc892dc1a3f Depends-On: I1c731c94e58895bd8bfc26d4300aac40a9111f12 --- + aodh/templates/cron-job-alarms-cleaner.yaml | 3 +++ + aodh/templates/deployment-api.yaml | 3 +++ + aodh/templates/deployment-evaluator.yaml | 3 +++ + aodh/templates/deployment-listener.yaml | 3 +++ + aodh/templates/deployment-notifier.yaml | 3 +++ + aodh/templates/job-bootstrap.yaml | 3 +++ + aodh/templates/job-db-drop.yaml | 3 +++ + aodh/templates/job-db-init.yaml | 3 +++ + aodh/templates/job-db-sync.yaml | 3 +++ + aodh/templates/job-image-repo-sync.yaml | 3 +++ + aodh/templates/job-ks-endpoints.yaml | 3 +++ + aodh/templates/job-ks-service.yaml | 3 +++ + aodh/templates/job-ks-user.yaml | 3 +++ + aodh/templates/job-rabbit-init.yaml | 3 +++ + aodh/templates/pod-aodh-test.yaml | 3 +++ + aodh/values.yaml | 7 +++++++ + barbican/templates/deployment-api.yaml | 3 +++ + barbican/templates/job-bootstrap.yaml | 3 +++ + barbican/templates/job-db-drop.yaml | 3 +++ + barbican/templates/job-db-init.yaml | 3 +++ + barbican/templates/job-db-sync.yaml | 3 +++ + barbican/templates/job-image-repo-sync.yaml | 3 +++ + barbican/templates/job-ks-endpoints.yaml | 3 +++ + barbican/templates/job-ks-service.yaml | 3 +++ + barbican/templates/job-ks-user.yaml | 3 +++ + barbican/templates/job-rabbit-init.yaml | 3 +++ + barbican/templates/pod-test.yaml | 3 +++ + barbican/values.yaml | 7 +++++++ + ceilometer/templates/daemonset-compute.yaml | 3 +++ + ceilometer/templates/daemonset-ipmi.yaml | 3 +++ + ceilometer/templates/deployment-api.yaml | 3 +++ + ceilometer/templates/deployment-central.yaml | 3 +++ + ceilometer/templates/deployment-collector.yaml | 3 +++ + ceilometer/templates/deployment-notification.yaml | 3 +++ + ceilometer/templates/job-bootstrap.yaml | 3 +++ + ceilometer/templates/job-db-drop.yaml | 3 +++ + ceilometer/templates/job-db-init-mongodb.yaml | 3 +++ + ceilometer/templates/job-db-init.yaml | 3 +++ + ceilometer/templates/job-db-sync.yaml | 3 +++ + ceilometer/templates/job-image-repo-sync.yaml | 3 +++ + ceilometer/templates/job-ks-endpoints.yaml | 7 +++++-- + ceilometer/templates/job-ks-service.yaml | 3 +++ + ceilometer/templates/job-ks-user.yaml | 3 +++ + ceilometer/templates/job-rabbit-init.yaml | 3 +++ + ceilometer/templates/pod-rally-test.yaml | 3 +++ + ceilometer/values.yaml | 7 +++++++ cinder/templates/cron-job-cinder-volume-usage-audit.yaml | 3 +++ cinder/templates/deployment-api.yaml | 3 +++ cinder/templates/deployment-backup.yaml | 3 +++ @@ -75,6 +121,19 @@ Depends-On: I1c731c94e58895bd8bfc26d4300aac40a9111f12 horizon/templates/job-image-repo-sync.yaml | 3 +++ horizon/templates/pod-helm-tests.yaml | 3 +++ horizon/values.yaml | 7 +++++++ + ironic/templates/deployment-api.yaml | 3 +++ + ironic/templates/job-bootstrap.yaml | 3 +++ + ironic/templates/job-db-drop.yaml | 3 +++ + ironic/templates/job-db-init.yaml | 3 +++ + ironic/templates/job-db-sync.yaml | 3 +++ + ironic/templates/job-image-repo-sync.yaml | 3 +++ + ironic/templates/job-ks-endpoints.yaml | 7 +++++-- + ironic/templates/job-ks-service.yaml | 3 +++ + ironic/templates/job-ks-user.yaml | 3 +++ + ironic/templates/job-manage-cleaning-network.yaml | 3 +++ + ironic/templates/job-rabbit-init.yaml | 3 +++ + ironic/templates/statefulset-conductor.yaml | 3 +++ + ironic/values.yaml | 7 +++++++ keystone/templates/cron-job-credential-rotate.yaml | 3 +++ keystone/templates/cron-job-fernet-rotate.yaml | 3 +++ keystone/templates/deployment-api.yaml | 3 +++ @@ -148,8 +207,640 @@ Depends-On: I1c731c94e58895bd8bfc26d4300aac40a9111f12 placement/templates/job-ks-service.yaml | 3 +++ placement/templates/job-ks-user.yaml | 3 +++ placement/values.yaml | 7 +++++++ - 138 files changed, 440 insertions(+) + 195 files changed, 637 insertions(+), 4 deletions(-) +diff --git a/aodh/templates/cron-job-alarms-cleaner.yaml b/aodh/templates/cron-job-alarms-cleaner.yaml +index ae39e7a1..a9b2f62f 100644 +--- a/aodh/templates/cron-job-alarms-cleaner.yaml ++++ b/aodh/templates/cron-job-alarms-cleaner.yaml +@@ -48,6 +48,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + initContainers: + {{ tuple $envAll "alarms_cleaner" $mounts_aodh_alarms_cleaner_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} + containers: +diff --git a/aodh/templates/deployment-api.yaml b/aodh/templates/deployment-api.yaml +index c4ae5efd..8ddeb980 100644 +--- a/aodh/templates/deployment-api.yaml ++++ b/aodh/templates/deployment-api.yaml +@@ -52,6 +52,9 @@ spec: + {{ tuple $envAll "aodh" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} + initContainers: + {{ tuple $envAll "api" $mounts_aodh_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +diff --git a/aodh/templates/deployment-evaluator.yaml b/aodh/templates/deployment-evaluator.yaml +index b44aae2e..4dd9b46b 100644 +--- a/aodh/templates/deployment-evaluator.yaml ++++ b/aodh/templates/deployment-evaluator.yaml +@@ -52,6 +52,9 @@ spec: + {{ tuple $envAll "aodh" "evaluator" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.evaluator.node_selector_key }}: {{ .Values.labels.evaluator.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "evaluator" $mounts_aodh_evaluator_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/aodh/templates/deployment-listener.yaml b/aodh/templates/deployment-listener.yaml +index db137f6a..9d765087 100644 +--- a/aodh/templates/deployment-listener.yaml ++++ b/aodh/templates/deployment-listener.yaml +@@ -52,6 +52,9 @@ spec: + {{ tuple $envAll "aodh" "listener" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.listener.node_selector_key }}: {{ .Values.labels.listener.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "listener" $mounts_aodh_listener_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/aodh/templates/deployment-notifier.yaml b/aodh/templates/deployment-notifier.yaml +index 7ee8d866..37930a5c 100644 +--- a/aodh/templates/deployment-notifier.yaml ++++ b/aodh/templates/deployment-notifier.yaml +@@ -52,6 +52,9 @@ spec: + {{ tuple $envAll "aodh" "notifier" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.notifier.node_selector_key }}: {{ .Values.labels.notifier.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "notifier" $mounts_aodh_notifier_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/aodh/templates/job-bootstrap.yaml b/aodh/templates/job-bootstrap.yaml +index e6b6f7a7..9ec2874c 100644 +--- a/aodh/templates/job-bootstrap.yaml ++++ b/aodh/templates/job-bootstrap.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "aodh" "keystoneUser" .Values.bootstrap.ks_user -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- end }} +diff --git a/aodh/templates/job-db-drop.yaml b/aodh/templates/job-db-drop.yaml +index 5f5129a3..2cb1b1f7 100644 +--- a/aodh/templates/job-db-drop.yaml ++++ b/aodh/templates/job-db-drop.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_drop }} + {{- $dbDropJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/aodh/templates/job-db-init.yaml b/aodh/templates/job-db-init.yaml +index 8d0fddeb..4119c0e4 100644 +--- a/aodh/templates/job-db-init.yaml ++++ b/aodh/templates/job-db-init.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_init }} + {{- $dbInitJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/aodh/templates/job-db-sync.yaml b/aodh/templates/job-db-sync.yaml +index 11f14fa3..25b3c063 100644 +--- a/aodh/templates/job-db-sync.yaml ++++ b/aodh/templates/job-db-sync.yaml +@@ -17,5 +17,8 @@ limitations under the License. + {{- if .Values.manifests.job_db_sync }} + {{- $dbSyncJob := dict "envAll" . "serviceName" "aodh" -}} + {{- $dbSyncJob := dict "envAll" . "serviceName" "aodh" "podVolMounts" .Values.pod.mounts.aodh_db_sync.aodh_db_sync.volumeMounts "podVols" .Values.pod.mounts.aodh_db_sync.aodh_db_sync.volumes -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }} + {{- end }} +diff --git a/aodh/templates/job-image-repo-sync.yaml b/aodh/templates/job-image-repo-sync.yaml +index ebab594f..f3190039 100644 +--- a/aodh/templates/job-image-repo-sync.yaml ++++ b/aodh/templates/job-image-repo-sync.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/aodh/templates/job-ks-endpoints.yaml b/aodh/templates/job-ks-endpoints.yaml +index 61819c83..f77c0b13 100644 +--- a/aodh/templates/job-ks-endpoints.yaml ++++ b/aodh/templates/job-ks-endpoints.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_endpoints }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "aodh" "serviceTypes" ( tuple "alarming" ) -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/aodh/templates/job-ks-service.yaml b/aodh/templates/job-ks-service.yaml +index 2c14e1a4..1679c7e9 100644 +--- a/aodh/templates/job-ks-service.yaml ++++ b/aodh/templates/job-ks-service.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "aodh" "serviceTypes" ( tuple "alarming" ) -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/aodh/templates/job-ks-user.yaml b/aodh/templates/job-ks-user.yaml +index d529fa3f..1bb2327d 100644 +--- a/aodh/templates/job-ks-user.yaml ++++ b/aodh/templates/job-ks-user.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/aodh/templates/job-rabbit-init.yaml b/aodh/templates/job-rabbit-init.yaml +index 866cbbd4..fc4a42bf 100644 +--- a/aodh/templates/job-rabbit-init.yaml ++++ b/aodh/templates/job-rabbit-init.yaml +@@ -16,5 +16,8 @@ limitations under the License. + + {{- if .Values.manifests.job_rabbit_init }} + {{- $rmqUserJob := dict "envAll" . "serviceName" "aodh" -}} ++{{- if .Values.pod.tolerations.aodh.enabled -}} ++{{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} + {{- end }} +diff --git a/aodh/templates/pod-aodh-test.yaml b/aodh/templates/pod-aodh-test.yaml +index 6e627b83..4a4d5b5a 100644 +--- a/aodh/templates/pod-aodh-test.yaml ++++ b/aodh/templates/pod-aodh-test.yaml +@@ -36,6 +36,9 @@ spec: + restartPolicy: Never + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.aodh.enabled }} ++{{ tuple $envAll "aodh" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 2 }} ++{{ end }} + serviceAccountName: {{ $serviceAccountName }} + initContainers: + {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} +diff --git a/aodh/values.yaml b/aodh/values.yaml +index 6ed0434c..c584d10f 100644 +--- a/aodh/values.yaml ++++ b/aodh/values.yaml +@@ -98,6 +98,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ aodh: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + aodh_api: + init_container: null +diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml +index 4a3a6ea0..2386d359 100644 +--- a/barbican/templates/deployment-api.yaml ++++ b/barbican/templates/deployment-api.yaml +@@ -51,6 +51,9 @@ spec: + {{ tuple $envAll "barbican" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.barbican.enabled }} ++{{ tuple $envAll "barbican" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "api" $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 a98148ed..ced8bc3e 100644 +--- a/barbican/templates/job-bootstrap.yaml ++++ b/barbican/templates/job-bootstrap.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "5" + + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "barbican" "keystoneUser" .Values.bootstrap.ks_user "logConfigFile" .Values.conf.barbican.DEFAULT.log_config_append "jobAnnotations" (include "metadata.annotations.job.bootstrap" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- end }} +diff --git a/barbican/templates/job-db-drop.yaml b/barbican/templates/job-db-drop.yaml +index 82fa3f45..b6f0a6fa 100644 +--- a/barbican/templates/job-db-drop.yaml ++++ b/barbican/templates/job-db-drop.yaml +@@ -19,5 +19,8 @@ limitations under the License. + {{- if .Values.manifests.certificates -}} + {{- $_ := set $dbToDrop "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} + {{- end -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/barbican/templates/job-db-init.yaml b/barbican/templates/job-db-init.yaml +index 7e9fab03..1d1f3a50 100644 +--- a/barbican/templates/job-db-init.yaml ++++ b/barbican/templates/job-db-init.yaml +@@ -26,5 +26,8 @@ helm.sh/hook-weight: "-5" + {{- if .Values.manifests.certificates -}} + {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} + {{- end -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/barbican/templates/job-db-sync.yaml b/barbican/templates/job-db-sync.yaml +index 8ec6e85b..587be68a 100644 +--- a/barbican/templates/job-db-sync.yaml ++++ b/barbican/templates/job-db-sync.yaml +@@ -28,5 +28,8 @@ helm.sh/hook-weight: "-4" + {{- if .Values.manifests.certificates -}} + {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} + {{- end -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }} + {{- end }} +diff --git a/barbican/templates/job-image-repo-sync.yaml b/barbican/templates/job-image-repo-sync.yaml +index 0181de3a..5faccb13 100644 +--- a/barbican/templates/job-image-repo-sync.yaml ++++ b/barbican/templates/job-image-repo-sync.yaml +@@ -20,5 +20,8 @@ helm.sh/hook: post-install,post-upgrade + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "barbican" "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/barbican/templates/job-ks-endpoints.yaml b/barbican/templates/job-ks-endpoints.yaml +index e8ec4c5a..023f58e1 100644 +--- a/barbican/templates/job-ks-endpoints.yaml ++++ b/barbican/templates/job-ks-endpoints.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "-2" + + {{- if .Values.manifests.job_ks_endpoints }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "barbican" "serviceTypes" ( tuple "key-manager" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/barbican/templates/job-ks-service.yaml b/barbican/templates/job-ks-service.yaml +index a86c1bcb..c0e06830 100644 +--- a/barbican/templates/job-ks-service.yaml ++++ b/barbican/templates/job-ks-service.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "-3" + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "barbican" "serviceTypes" ( tuple "key-manager" ) "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/barbican/templates/job-ks-user.yaml b/barbican/templates/job-ks-user.yaml +index ab5ac9a8..e16e0338 100644 +--- a/barbican/templates/job-ks-user.yaml ++++ b/barbican/templates/job-ks-user.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "-1" + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "barbican" "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/barbican/templates/job-rabbit-init.yaml b/barbican/templates/job-rabbit-init.yaml +index 702bcaea..75bb5fc1 100644 +--- a/barbican/templates/job-rabbit-init.yaml ++++ b/barbican/templates/job-rabbit-init.yaml +@@ -21,5 +21,8 @@ helm.sh/hook-weight: "-4" + + {{- if .Values.manifests.job_rabbit_init }} + {{- $rmqUserJob := dict "envAll" . "serviceName" "barbican" "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.barbican.enabled -}} ++{{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} + {{- end }} +diff --git a/barbican/templates/pod-test.yaml b/barbican/templates/pod-test.yaml +index c44a95e5..14a2270f 100644 +--- a/barbican/templates/pod-test.yaml ++++ b/barbican/templates/pod-test.yaml +@@ -37,6 +37,9 @@ spec: + {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }} + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.barbican.enabled }} ++{{ tuple $envAll "barbican" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 2 }} ++{{ end }} + restartPolicy: Never + initContainers: + {{ tuple $envAll "tests" $mounts_barbican_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} +diff --git a/barbican/values.yaml b/barbican/values.yaml +index 8d567eda..9e9f65a2 100644 +--- a/barbican/values.yaml ++++ b/barbican/values.yaml +@@ -78,6 +78,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ barbican: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + barbican_api: + init_container: null +diff --git a/ceilometer/templates/daemonset-compute.yaml b/ceilometer/templates/daemonset-compute.yaml +index d7047381..b96b7e76 100644 +--- a/ceilometer/templates/daemonset-compute.yaml ++++ b/ceilometer/templates/daemonset-compute.yaml +@@ -51,6 +51,9 @@ spec: + dnsPolicy: ClusterFirstWithHostNet + nodeSelector: + {{ .Values.labels.compute.node_selector_key }}: {{ .Values.labels.compute.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "compute" $mounts_ceilometer_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/daemonset-ipmi.yaml b/ceilometer/templates/daemonset-ipmi.yaml +index 58f0e40b..374ff645 100644 +--- a/ceilometer/templates/daemonset-ipmi.yaml ++++ b/ceilometer/templates/daemonset-ipmi.yaml +@@ -51,6 +51,9 @@ spec: + dnsPolicy: ClusterFirstWithHostNet + nodeSelector: + {{ .Values.labels.ipmi.node_selector_key }}: {{ .Values.labels.ipmi.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "ipmi" $mounts_ceilometer_ipmi_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/deployment-api.yaml b/ceilometer/templates/deployment-api.yaml +index 1cc3a2fc..ab88748f 100644 +--- a/ceilometer/templates/deployment-api.yaml ++++ b/ceilometer/templates/deployment-api.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ceilometer" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} + initContainers: + {{ tuple $envAll "api" $mounts_ceilometer_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} +diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml +index 12efc64e..e2c34d1b 100644 +--- a/ceilometer/templates/deployment-central.yaml ++++ b/ceilometer/templates/deployment-central.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ceilometer" "central" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.central.node_selector_key }}: {{ .Values.labels.central.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "central" $mounts_ceilometer_central_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/deployment-collector.yaml b/ceilometer/templates/deployment-collector.yaml +index a5b31172..0fb1f604 100644 +--- a/ceilometer/templates/deployment-collector.yaml ++++ b/ceilometer/templates/deployment-collector.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ceilometer" "collector" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.collector.node_selector_key }}: {{ .Values.labels.collector.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "collector" $mounts_ceilometer_collector_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml +index 1f65ad21..0803f905 100644 +--- a/ceilometer/templates/deployment-notification.yaml ++++ b/ceilometer/templates/deployment-notification.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ceilometer" "notification" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.notification.node_selector_key }}: {{ .Values.labels.notification.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 6 }} ++{{ end }} + initContainers: + {{ tuple $envAll "notification" $mounts_ceilometer_notification_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/job-bootstrap.yaml b/ceilometer/templates/job-bootstrap.yaml +index 8572a797..cc72fb44 100644 +--- a/ceilometer/templates/job-bootstrap.yaml ++++ b/ceilometer/templates/job-bootstrap.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "ceilometer" "keystoneUser" .Values.bootstrap.ks_user -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- end }} +diff --git a/ceilometer/templates/job-db-drop.yaml b/ceilometer/templates/job-db-drop.yaml +index 6e819b61..981792e1 100644 +--- a/ceilometer/templates/job-db-drop.yaml ++++ b/ceilometer/templates/job-db-drop.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_drop }} + {{- $dbDropJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/ceilometer/templates/job-db-init-mongodb.yaml b/ceilometer/templates/job-db-init-mongodb.yaml +index 60f2974a..aeed1628 100644 +--- a/ceilometer/templates/job-db-init-mongodb.yaml ++++ b/ceilometer/templates/job-db-init-mongodb.yaml +@@ -31,6 +31,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + initContainers: + {{ tuple $envAll "db_init_mongodb" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ceilometer/templates/job-db-init.yaml b/ceilometer/templates/job-db-init.yaml +index 3912f400..a578a887 100644 +--- a/ceilometer/templates/job-db-init.yaml ++++ b/ceilometer/templates/job-db-init.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_init }} + {{- $dbInitJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/ceilometer/templates/job-db-sync.yaml b/ceilometer/templates/job-db-sync.yaml +index bc5882bd..dc04c4d8 100644 +--- a/ceilometer/templates/job-db-sync.yaml ++++ b/ceilometer/templates/job-db-sync.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_sync }} + {{- $dbSyncJob := dict "envAll" . "serviceName" "ceilometer" "podVolMounts" .Values.pod.mounts.ceilometer_db_sync.ceilometer_db_sync.volumeMounts "podVols" .Values.pod.mounts.ceilometer_db_sync.ceilometer_db_sync.volumes -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }} + {{- end }} +diff --git a/ceilometer/templates/job-image-repo-sync.yaml b/ceilometer/templates/job-image-repo-sync.yaml +index a1a8a49a..9cb0112b 100644 +--- a/ceilometer/templates/job-image-repo-sync.yaml ++++ b/ceilometer/templates/job-image-repo-sync.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/ceilometer/templates/job-ks-endpoints.yaml b/ceilometer/templates/job-ks-endpoints.yaml +index 9421c2e7..fd7b3e26 100644 +--- a/ceilometer/templates/job-ks-endpoints.yaml ++++ b/ceilometer/templates/job-ks-endpoints.yaml +@@ -13,6 +13,9 @@ limitations under the License. + */}} + + {{- if .Values.manifests.job_ks_endpoints }} +-{{- $ksServiceJob := dict "envAll" . "serviceName" "ceilometer" "serviceTypes" ( tuple "metering" ) -}} +-{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} ++{{- $ksEndpointsJob := dict "envAll" . "serviceName" "ceilometer" "serviceTypes" ( tuple "metering" ) -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} ++{{- end -}} ++{{ $ksEndpointsJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/ceilometer/templates/job-ks-service.yaml b/ceilometer/templates/job-ks-service.yaml +index 38b57342..78643764 100644 +--- a/ceilometer/templates/job-ks-service.yaml ++++ b/ceilometer/templates/job-ks-service.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "ceilometer" "serviceTypes" ( tuple "metering" ) -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/ceilometer/templates/job-ks-user.yaml b/ceilometer/templates/job-ks-user.yaml +index 2f5be60e..d7da2bf1 100644 +--- a/ceilometer/templates/job-ks-user.yaml ++++ b/ceilometer/templates/job-ks-user.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/ceilometer/templates/job-rabbit-init.yaml b/ceilometer/templates/job-rabbit-init.yaml +index 71661784..0130e635 100644 +--- a/ceilometer/templates/job-rabbit-init.yaml ++++ b/ceilometer/templates/job-rabbit-init.yaml +@@ -13,5 +13,8 @@ limitations under the License. + */}} + {{- if .Values.manifests.job_rabbit_init }} + {{- $rmqUserJob := dict "envAll" . "serviceName" "ceilometer" -}} ++{{- if .Values.pod.tolerations.ceilometer.enabled -}} ++{{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} + {{- end }} +diff --git a/ceilometer/templates/pod-rally-test.yaml b/ceilometer/templates/pod-rally-test.yaml +index f2538173..1f47b5f6 100644 +--- a/ceilometer/templates/pod-rally-test.yaml ++++ b/ceilometer/templates/pod-rally-test.yaml +@@ -32,6 +32,9 @@ spec: + restartPolicy: Never + nodeSelector: + {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ceilometer.enabled }} ++{{ tuple $envAll "ceilometer" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 2 }} ++{{ end }} + serviceAccountName: {{ $serviceAccountName }} + initContainers: + {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} +diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml +index a6c1b2c8..3abd3c0b 100644 +--- a/ceilometer/values.yaml ++++ b/ceilometer/values.yaml +@@ -1921,6 +1921,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ ceilometer: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + ceilometer_tests: + init_container: null diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml index 3d13af36..4b152081 100644 --- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml @@ -919,7 +1610,7 @@ index 58f786b6..36017d63 100644 heat_api: init_container: null diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml -index 1922423f..b7c24836 100644 +index dd20a76f..20bc3951 100644 --- a/horizon/templates/deployment.yaml +++ b/horizon/templates/deployment.yaml @@ -51,6 +51,9 @@ spec: @@ -977,7 +1668,7 @@ index 37b14a8c..e98bbb24 100644 --- a/horizon/templates/job-image-repo-sync.yaml +++ b/horizon/templates/job-image-repo-sync.yaml @@ -14,5 +14,8 @@ limitations under the License. - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "horizon" -}} +{{- if .Values.pod.tolerations.horizon.enabled -}} @@ -1000,10 +1691,10 @@ index 76f5b353..dbcb9a3c 100644 {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} initContainers: diff --git a/horizon/values.yaml b/horizon/values.yaml -index 9b138c0c..f2bc5b9f 100644 +index a20dca46..3dc85f10 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml -@@ -1116,6 +1116,13 @@ pod: +@@ -1125,6 +1125,13 @@ pod: default: kubernetes.io/hostname weight: default: 10 @@ -1017,6 +1708,187 @@ index 9b138c0c..f2bc5b9f 100644 mounts: horizon_db_init: init_container: null +diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml +index 76f15655..606a5fe9 100644 +--- a/ironic/templates/deployment-api.yaml ++++ b/ironic/templates/deployment-api.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ironic" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ironic.enabled }} ++{{ tuple $envAll "ironic" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }} + initContainers: + {{ tuple $envAll "api" $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 94221860..190d412d 100644 +--- a/ironic/templates/job-bootstrap.yaml ++++ b/ironic/templates/job-bootstrap.yaml +@@ -20,6 +20,9 @@ helm.sh/hook-weight: "5" + {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.image.enabled }} + {{- if .Values.bootstrap.image.openstack.enabled }} + {{- $bootstrapJob := dict "envAll" . "serviceName" "ironic" "keystoneUser" .Values.bootstrap.image.openstack.ks_user "logConfigFile" .Values.conf.ironic.DEFAULT.log_config_append "jobAnnotations" (include "metadata.annotations.job.bootstrap" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} + {{- else }} + {{ include "helm-toolkit.manifests.job_bootstrap" }} +diff --git a/ironic/templates/job-db-drop.yaml b/ironic/templates/job-db-drop.yaml +index 6566b5cb..1154db9e 100644 +--- a/ironic/templates/job-db-drop.yaml ++++ b/ironic/templates/job-db-drop.yaml +@@ -14,5 +14,8 @@ limitations under the License. + + {{- if .Values.manifests.job_db_drop }} + {{- $dbDropJob := dict "envAll" . "serviceName" "ironic" -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $dbDropJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbDropJob | include "helm-toolkit.manifests.job_db_drop_mysql" }} + {{- end }} +diff --git a/ironic/templates/job-db-init.yaml b/ironic/templates/job-db-init.yaml +index e2fd27d7..22c071d5 100644 +--- a/ironic/templates/job-db-init.yaml ++++ b/ironic/templates/job-db-init.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-5" + + {{- if .Values.manifests.job_db_init }} + {{- $dbInitJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $dbInitJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} + {{- end }} +diff --git a/ironic/templates/job-db-sync.yaml b/ironic/templates/job-db-sync.yaml +index 00bf4df2..c397bcf2 100644 +--- a/ironic/templates/job-db-sync.yaml ++++ b/ironic/templates/job-db-sync.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-4" + + {{- if .Values.manifests.job_db_sync }} + {{- $dbSyncJob := dict "envAll" . "serviceName" "ironic" "podVolMounts" .Values.pod.mounts.ironic_db_sync.ironic_db_sync.volumeMounts "podVols" .Values.pod.mounts.ironic_db_sync.ironic_db_sync.volumes "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }} + {{- end }} +diff --git a/ironic/templates/job-image-repo-sync.yaml b/ironic/templates/job-image-repo-sync.yaml +index 8399f6dd..e83bac91 100644 +--- a/ironic/templates/job-image-repo-sync.yaml ++++ b/ironic/templates/job-image-repo-sync.yaml +@@ -18,5 +18,8 @@ helm.sh/hook: post-install,post-upgrade + + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} + {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} + {{- end }} +diff --git a/ironic/templates/job-ks-endpoints.yaml b/ironic/templates/job-ks-endpoints.yaml +index 73b2fa63..940e13ce 100644 +--- a/ironic/templates/job-ks-endpoints.yaml ++++ b/ironic/templates/job-ks-endpoints.yaml +@@ -18,6 +18,9 @@ helm.sh/hook-weight: "-2" + {{- end }} + + {{- if .Values.manifests.job_ks_endpoints }} +-{{- $ksServiceJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} +-{{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} ++{{- $ksEndpointsJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} ++{{- end -}} ++{{ $ksEndpointsJob | include "helm-toolkit.manifests.job_ks_endpoints" }} + {{- end }} +diff --git a/ironic/templates/job-ks-service.yaml b/ironic/templates/job-ks-service.yaml +index c4c64e1d..40cc9786 100644 +--- a/ironic/templates/job-ks-service.yaml ++++ b/ironic/templates/job-ks-service.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-3" + + {{- if .Values.manifests.job_ks_service }} + {{- $ksServiceJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} + {{- end }} +diff --git a/ironic/templates/job-ks-user.yaml b/ironic/templates/job-ks-user.yaml +index 8f277b37..a09aa9d2 100644 +--- a/ironic/templates/job-ks-user.yaml ++++ b/ironic/templates/job-ks-user.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-1" + + {{- if .Values.manifests.job_ks_user }} + {{- $ksUserJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $ksUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} + {{- end }} +diff --git a/ironic/templates/job-manage-cleaning-network.yaml b/ironic/templates/job-manage-cleaning-network.yaml +index 6ccb2b8a..b1904d4b 100644 +--- a/ironic/templates/job-manage-cleaning-network.yaml ++++ b/ironic/templates/job-manage-cleaning-network.yaml +@@ -36,6 +36,9 @@ spec: + restartPolicy: OnFailure + nodeSelector: + {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ironic.enabled }} ++{{ tuple $envAll "ironic" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + initContainers: + {{ tuple $envAll "manage_cleaning_network" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} + containers: +diff --git a/ironic/templates/job-rabbit-init.yaml b/ironic/templates/job-rabbit-init.yaml +index 846cc336..8d80b7c2 100644 +--- a/ironic/templates/job-rabbit-init.yaml ++++ b/ironic/templates/job-rabbit-init.yaml +@@ -19,5 +19,8 @@ helm.sh/hook-weight: "-4" + + {{- if .Values.manifests.job_rabbit_init }} + {{- $rmqUserJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) -}} ++{{- if .Values.pod.tolerations.ironic.enabled -}} ++{{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} ++{{- end -}} + {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} + {{- end }} +diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml +index c427c4e9..3093a2da 100644 +--- a/ironic/templates/statefulset-conductor.yaml ++++ b/ironic/templates/statefulset-conductor.yaml +@@ -49,6 +49,9 @@ spec: + {{ tuple $envAll "ironic" "conductor" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.conductor.node_selector_key }}: {{ .Values.labels.conductor.node_selector_value }} ++{{ if $envAll.Values.pod.tolerations.ironic.enabled }} ++{{ tuple $envAll "ironic" | include "helm-toolkit.snippets.kubernetes_tolerations" | indent 10 }} ++{{ end }} + securityContext: + runAsUser: 0 + hostNetwork: True +diff --git a/ironic/values.yaml b/ironic/values.yaml +index eb29ab7d..0112a80a 100644 +--- a/ironic/values.yaml ++++ b/ironic/values.yaml +@@ -550,6 +550,13 @@ pod: + default: kubernetes.io/hostname + weight: + default: 10 ++ tolerations: ++ ironic: ++ enabled: false ++ tolerations: ++ - key: node-role.kubernetes.io/master ++ operator: Exists ++ effect: NoSchedule + mounts: + ironic_api: + init_container: null diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml index fd26b230..8e9f82fc 100644 --- a/keystone/templates/cron-job-credential-rotate.yaml @@ -1046,7 +1918,7 @@ index 8f4f4f9a..96dcc74d 100644 {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }} containers: diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml -index b9f5701f..fefbc47f 100644 +index f4154932..94e705b8 100644 --- a/keystone/templates/deployment-api.yaml +++ b/keystone/templates/deployment-api.yaml @@ -58,6 +58,9 @@ spec: @@ -1172,7 +2044,7 @@ index fd301c35..c8cfc5d0 100644 --- a/keystone/templates/job-image-repo-sync.yaml +++ b/keystone/templates/job-image-repo-sync.yaml @@ -17,5 +17,8 @@ helm.sh/hook: post-install,post-upgrade - + {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "keystone" "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) -}} +{{- if .Values.pod.tolerations.keystone.enabled -}} @@ -1194,10 +2066,10 @@ index 2bb258e7..02390adf 100644 {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} {{- end }} diff --git a/keystone/values.yaml b/keystone/values.yaml -index 8031bcea..de450e3a 100644 +index 301ff6fa..d0f66a7b 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml -@@ -219,6 +219,13 @@ pod: +@@ -217,6 +217,13 @@ pod: default: kubernetes.io/hostname weight: default: 10 @@ -1557,7 +2429,7 @@ index bbe3fabd..9f745ace 100644 {{ tuple $envAll "service_cleaner" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} containers: diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml -index 4c690d61..927f5ad1 100644 +index e600e587..75289c79 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -78,6 +78,9 @@ spec: @@ -1868,10 +2740,10 @@ index eabe8b6c..019596f1 100644 serviceAccountName: {{ $serviceAccountName }} initContainers: diff --git a/nova/values.yaml b/nova/values.yaml -index cdb14575..4e6ce0ac 100644 +index 72dd0d11..f8ebc9ab 100644 --- a/nova/values.yaml +++ b/nova/values.yaml -@@ -2259,6 +2259,13 @@ pod: +@@ -2261,6 +2261,13 @@ pod: default: kubernetes.io/hostname weight: default: 10 diff --git a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml index 6866507f..708fc7ee 100644 --- a/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml +++ b/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml @@ -654,6 +654,16 @@ data: anti: type: default: requiredDuringSchedulingIgnoredDuringExecution + tolerations: + barbican: + enabled: true + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + - key: openstack-compute-node + operator: Exists + effect: NoSchedule endpoints: oslo_messaging: statefulset: @@ -750,6 +760,15 @@ data: anti: type: default: requiredDuringSchedulingIgnoredDuringExecution + tolerations: + rgw: + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + - key: openstack-compute-node + operator: Exists + effect: NoSchedule source: type: tar location: http://172.17.0.1/helm_charts/starlingx/ceph-rgw-0.1.15.tgz @@ -1905,6 +1924,16 @@ data: anti: type: default: requiredDuringSchedulingIgnoredDuringExecution + tolerations: + ironic: + enabled: true + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + - key: openstack-compute-node + operator: Exists + effect: NoSchedule labels: api: node_selector_key: openstack-ironic @@ -2157,6 +2186,16 @@ data: anti: type: default: requiredDuringSchedulingIgnoredDuringExecution + tolerations: + aodh: + enabled: true + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + - key: openstack-compute-node + operator: Exists + effect: NoSchedule endpoints: oslo_messaging: statefulset: @@ -2319,6 +2358,16 @@ data: anti: type: default: requiredDuringSchedulingIgnoredDuringExecution + tolerations: + gnocchi: + enabled: true + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + - key: openstack-compute-node + operator: Exists + effect: NoSchedule dependencies: static: db_sync: @@ -2910,6 +2959,16 @@ data: anti: type: default: requiredDuringSchedulingIgnoredDuringExecution + tolerations: + ceilometer: + enabled: true + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + - key: openstack-compute-node + operator: Exists + effect: NoSchedule source: type: tar location: http://172.17.0.1/helm_charts/starlingx/ceilometer-0.2.1.tgz