From 42fd5a3bb306484ba99dd6aec4e45fc999765f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagn=C3=A9?= Date: Thu, 26 Feb 2026 14:06:29 -0500 Subject: [PATCH] Remove support for Helm 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change removes the helm3_hook value across all charts. It is no longer possible to set helm3_hook to False to support Helm 2. Change-Id: I22b38b9ae336a49dfaf93c7605ecbf6cedcfc1c1 Signed-off-by: Mathieu Gagné --- barbican/templates/job-bootstrap.yaml | 2 -- barbican/templates/job-db-init.yaml | 2 -- barbican/templates/job-db-sync.yaml | 2 -- barbican/templates/job-image-repo-sync.yaml | 2 -- barbican/templates/job-ks-endpoints.yaml | 2 -- barbican/templates/job-ks-service.yaml | 2 -- barbican/templates/job-ks-user.yaml | 2 -- barbican/templates/job-rabbit-init.yaml | 2 -- barbican/values.yaml | 4 ---- blazar/templates/job-db-init.yaml | 2 -- blazar/templates/job-db-sync.yaml | 2 -- blazar/templates/job-ks-endpoints.yaml | 2 -- blazar/templates/job-ks-service.yaml | 2 -- blazar/templates/job-ks-user.yaml | 2 -- blazar/templates/job-rabbit-init.yaml | 2 -- blazar/values.yaml | 4 ---- cinder/templates/job-backup-storage-init.yaml | 2 -- cinder/templates/job-create-internal-tenant.yaml | 2 -- cinder/templates/job-db-init.yaml | 2 -- cinder/templates/job-db-sync.yaml | 2 -- cinder/templates/job-image-repo-sync.yaml | 2 -- cinder/templates/job-ks-endpoints.yaml | 2 -- cinder/templates/job-ks-service.yaml | 2 -- cinder/templates/job-ks-user.yaml | 2 -- cinder/templates/job-rabbit-init.yaml | 2 -- cinder/templates/job-storage-init.yaml | 2 -- cinder/values.yaml | 4 ---- cloudkitty/templates/job-db-init.yaml | 4 ---- cloudkitty/templates/job-db-sync.yaml | 2 -- cloudkitty/templates/job-ks-endpoints.yaml | 2 -- cloudkitty/templates/job-ks-service.yaml | 2 -- cloudkitty/templates/job-ks-user.yaml | 2 -- cloudkitty/templates/job-rabbitmq-init.yaml | 2 -- cloudkitty/templates/job-storage-init.yaml | 2 -- cloudkitty/values.yaml | 4 ---- freezer/templates/job-db-init.yaml | 2 -- freezer/templates/job-db-sync.yaml | 2 -- freezer/templates/job-image-repo-sync.yaml | 2 -- freezer/templates/job-ks-endpoints.yaml | 2 -- freezer/templates/job-ks-service.yaml | 4 +--- freezer/templates/job-ks-user.yaml | 2 -- freezer/values.yaml | 4 ---- glance/templates/job-bootstrap.yaml | 2 -- glance/templates/job-db-init.yaml | 2 -- glance/templates/job-db-sync.yaml | 2 -- glance/templates/job-image-repo-sync.yaml | 2 -- glance/templates/job-ks-endpoints.yaml | 2 -- glance/templates/job-ks-service.yaml | 2 -- glance/templates/job-ks-user.yaml | 2 -- glance/templates/job-metadefs-load.yaml | 2 -- glance/templates/job-rabbit-init.yaml | 2 -- glance/templates/job-storage-init.yaml | 2 -- glance/values.yaml | 4 ---- heat/templates/job-bootstrap.yaml | 2 -- heat/templates/job-db-init.yaml | 2 -- heat/templates/job-db-sync.yaml | 2 -- heat/templates/job-image-repo-sync.yaml | 2 -- heat/templates/job-ks-endpoints.yaml | 2 -- heat/templates/job-ks-service.yaml | 2 -- heat/templates/job-ks-user-domain.yaml | 2 -- heat/templates/job-ks-user.yaml | 2 -- heat/templates/job-rabbit-init.yaml | 2 -- heat/templates/job-trusts.yaml | 2 -- heat/values.yaml | 4 ---- horizon/templates/job-db-init.yaml | 2 -- horizon/templates/job-db-sync.yaml | 2 -- horizon/values.yaml | 4 ---- ironic/templates/job-bootstrap.yaml | 2 -- ironic/templates/job-db-init.yaml | 2 -- ironic/templates/job-db-sync.yaml | 2 -- ironic/templates/job-image-repo-sync.yaml | 2 -- ironic/templates/job-ks-endpoints.yaml | 2 -- ironic/templates/job-ks-service.yaml | 2 -- ironic/templates/job-ks-user.yaml | 2 -- ironic/templates/job-manage-cleaning-network.yaml | 2 -- ironic/templates/job-rabbit-init.yaml | 2 -- ironic/values.yaml | 2 -- keystone/templates/job-credential-setup.yaml | 2 -- keystone/templates/job-db-init.yaml | 2 -- keystone/templates/job-db-sync.yaml | 2 -- keystone/templates/job-fernet-setup.yaml | 2 -- keystone/templates/secret-credential-keys.yaml | 2 -- keystone/templates/secret-fernet-keys.yaml | 2 -- keystone/values.yaml | 4 ---- manila/templates/job-bootstrap.yaml | 2 -- manila/templates/job-db-init.yaml | 2 -- manila/templates/job-db-sync.yaml | 2 -- manila/templates/job-image-repo-sync.yaml | 2 -- manila/templates/job-ks-endpoints.yaml | 2 -- manila/templates/job-ks-service.yaml | 2 -- manila/templates/job-ks-user.yaml | 2 -- manila/templates/job-rabbit-init.yaml | 2 -- manila/values.yaml | 4 ---- mariadb-backup/values.yaml | 4 ---- mariadb-cluster/templates/job-refresh-statefulset.yaml | 2 -- mariadb-cluster/values.yaml | 4 ---- mariadb/values.yaml | 4 ---- masakari/templates/job-db-init.yaml | 4 ---- masakari/templates/job-db-sync.yaml | 2 -- masakari/templates/job-ks-endpoints.yaml | 2 -- masakari/templates/job-ks-service.yaml | 2 -- masakari/templates/job-ks-user.yaml | 2 -- masakari/templates/job-rabbitmq-init.yaml | 2 -- masakari/values.yaml | 4 ---- neutron/templates/job-bootstrap.yaml | 2 -- neutron/templates/job-db-init.yaml | 2 -- neutron/templates/job-db-sync.yaml | 2 -- neutron/templates/job-image-repo-sync.yaml | 2 -- neutron/templates/job-ks-endpoints.yaml | 2 -- neutron/templates/job-ks-service.yaml | 2 -- neutron/templates/job-ks-user.yaml | 2 -- neutron/templates/job-rabbit-init.yaml | 2 -- neutron/values.yaml | 2 -- nova/templates/job-db-init.yaml | 2 -- nova/templates/job-db-sync.yaml | 2 -- nova/templates/job-image-repo-sync.yaml | 2 -- nova/templates/job-ks-endpoints.yaml | 2 -- nova/templates/job-ks-service.yaml | 2 -- nova/templates/job-ks-user.yaml | 2 -- nova/templates/job-nova-storage-init.yaml | 2 -- nova/templates/job-rabbit-init.yaml | 2 -- nova/values.yaml | 4 ---- octavia/templates/job-db-init.yaml | 2 -- octavia/values.yaml | 4 ---- placement/templates/job-db-init.yaml | 2 -- placement/templates/job-db-sync.yaml | 4 +--- placement/templates/job-image-repo-sync.yaml | 2 -- placement/templates/job-ks-endpoints.yaml | 2 -- placement/templates/job-ks-service.yaml | 2 -- placement/templates/job-ks-user.yaml | 2 -- placement/values.yaml | 4 ---- .../templates/exporter-job-create-user.yaml | 2 -- prometheus-mysql-exporter/values.yaml | 4 ---- rabbitmq/templates/job-cluster-wait.yaml | 2 -- rabbitmq/values.yaml | 4 ---- rally/templates/job-db-init.yaml | 2 -- rally/templates/job-image-repo-sync.yaml | 2 -- rally/templates/job-ks-endpoints.yaml | 2 -- rally/templates/job-ks-service.yaml | 2 -- rally/templates/job-ks-user.yaml | 2 -- rally/templates/job-manage-db.yaml | 2 -- rally/templates/job-run-task.yaml | 2 -- rally/values.yaml | 4 ---- releasenotes/notes/common-eb7338a63d83ad95.yaml | 6 ++++++ skyline/templates/job-db-init.yaml | 2 -- skyline/templates/job-db-sync.yaml | 2 -- skyline/templates/job-ks-user.yaml | 2 -- skyline/values.yaml | 2 -- swift/templates/job-ks-endpoints.yaml | 2 -- swift/templates/job-ks-service.yaml | 2 -- swift/templates/job-ks-user.yaml | 2 -- swift/values.yaml | 3 --- tacker/templates/job-db-init.yaml | 4 +--- tacker/templates/job-db-sync.yaml | 2 -- tacker/templates/job-ks-endpoints.yaml | 2 -- tacker/templates/job-ks-service.yaml | 2 -- tacker/templates/job-ks-user.yaml | 2 -- tacker/templates/job-rabbit-init.yaml | 2 -- tacker/values.yaml | 4 ---- tempest/templates/job-ks-user.yaml | 2 -- tempest/values.yaml | 2 -- trove/templates/job-db-init.yaml | 2 -- trove/templates/job-db-sync.yaml | 2 -- trove/templates/job-ks-endpoints.yaml | 2 -- trove/templates/job-ks-service.yaml | 2 -- trove/templates/job-ks-user.yaml | 2 -- trove/templates/job-rabbit-init.yaml | 2 -- trove/values.yaml | 2 -- zaqar/templates/job-db-init.yaml | 2 -- zaqar/templates/job-db-sync.yaml | 2 -- zaqar/templates/job-ks-endpoints.yaml | 2 -- zaqar/templates/job-ks-service.yaml | 2 -- zaqar/templates/job-ks-user.yaml | 2 -- zaqar/values.yaml | 4 ---- 174 files changed, 9 insertions(+), 398 deletions(-) create mode 100644 releasenotes/notes/common-eb7338a63d83ad95.yaml diff --git a/barbican/templates/job-bootstrap.yaml b/barbican/templates/job-bootstrap.yaml index da4392daf6..7cb0e5cfd4 100644 --- a/barbican/templates/job-bootstrap.yaml +++ b/barbican/templates/job-bootstrap.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.bootstrap" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "5" {{- end }} -{{- end }} {{- 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) -}} diff --git a/barbican/templates/job-db-init.yaml b/barbican/templates/job-db-init.yaml index 8d24ff9319..9a05ed64b5 100644 --- a/barbican/templates/job-db-init.yaml +++ b/barbican/templates/job-db-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.barbican.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/barbican/templates/job-db-sync.yaml b/barbican/templates/job-db-sync.yaml index bf964e8d0c..84a1608246 100644 --- a/barbican/templates/job-db-sync.yaml +++ b/barbican/templates/job-db-sync.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.db_sync" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-4" {{- end }} -{{- end }} {{- $podVolMounts := .Values.pod.mounts.barbican_db_sync.barbican_db_sync.volumeMounts | default list }} {{- $podVolMounts = append $podVolMounts (dict "name" "db-sync-sh" "mountPath" "/tmp/simple_crypto_kek_rewrap.py" "subPath" "simple_crypto_kek_rewrap.py" "readOnly" true) }} diff --git a/barbican/templates/job-image-repo-sync.yaml b/barbican/templates/job-image-repo-sync.yaml index 5faccb13b6..ac19639209 100644 --- a/barbican/templates/job-image-repo-sync.yaml +++ b/barbican/templates/job-image-repo-sync.yaml @@ -13,10 +13,8 @@ limitations under the License. */}} {{- define "metadata.annotations.job.repo_sync" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade {{- end }} -{{- end }} {{- 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) -}} diff --git a/barbican/templates/job-ks-endpoints.yaml b/barbican/templates/job-ks-endpoints.yaml index cd5d9bc85a..5a90997187 100644 --- a/barbican/templates/job-ks-endpoints.yaml +++ b/barbican/templates/job-ks-endpoints.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.ks_endpoints" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-2" {{- end }} -{{- end }} {{- if .Values.manifests.job_ks_endpoints }} {{- $ksServiceJob := dict "envAll" . "serviceName" "barbican" "serviceTypes" ( tuple "key-manager" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} diff --git a/barbican/templates/job-ks-service.yaml b/barbican/templates/job-ks-service.yaml index 08a93d0ba0..b1086a81a0 100644 --- a/barbican/templates/job-ks-service.yaml +++ b/barbican/templates/job-ks-service.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.ks_service" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-3" {{- end }} -{{- end }} {{- if .Values.manifests.job_ks_service }} {{- $ksServiceJob := dict "envAll" . "serviceName" "barbican" "serviceTypes" ( tuple "key-manager" ) "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}} diff --git a/barbican/templates/job-ks-user.yaml b/barbican/templates/job-ks-user.yaml index c74bf31d32..846d17b66d 100644 --- a/barbican/templates/job-ks-user.yaml +++ b/barbican/templates/job-ks-user.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.ks_user" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-1" {{- end }} -{{- end }} {{- if .Values.manifests.job_ks_user }} {{- $ksUserJob := dict "envAll" . "serviceName" "barbican" "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} diff --git a/barbican/templates/job-rabbit-init.yaml b/barbican/templates/job-rabbit-init.yaml index 0f9839e980..ba7b113d24 100644 --- a/barbican/templates/job-rabbit-init.yaml +++ b/barbican/templates/job-rabbit-init.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.rabbit_init" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-4" {{- end }} -{{- end }} {{- if .Values.manifests.job_rabbit_init }} {{- $rmqUserJob := dict "envAll" . "serviceName" "barbican" "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) -}} diff --git a/barbican/values.yaml b/barbican/values.yaml index a8fc3b8668..7d8380dd1a 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -29,10 +29,6 @@ labels: release_group: null -# NOTE(philsphicas): the pre-install hook breaks upgrade for helm2 -# Set to false to upgrade using helm2 -helm3_hook: true - images: tags: bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble diff --git a/blazar/templates/job-db-init.yaml b/blazar/templates/job-db-init.yaml index 6f165b0ed0..005b91762f 100644 --- a/blazar/templates/job-db-init.yaml +++ b/blazar/templates/job-db-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.blazar.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/blazar/templates/job-db-sync.yaml b/blazar/templates/job-db-sync.yaml index e76bb9763a..fdae252c82 100644 --- a/blazar/templates/job-db-sync.yaml +++ b/blazar/templates/job-db-sync.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.blazar.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/blazar/templates/job-ks-endpoints.yaml b/blazar/templates/job-ks-endpoints.yaml index 7e200885d5..78004bb51f 100644 --- a/blazar/templates/job-ks-endpoints.yaml +++ b/blazar/templates/job-ks-endpoints.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksEndpointsJob "tlsSecret" .Values.secrets.tls.reservation.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksEndpointsJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.blazar.enabled -}} {{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/blazar/templates/job-ks-service.yaml b/blazar/templates/job-ks-service.yaml index 9ad24019c4..27ab843ce1 100644 --- a/blazar/templates/job-ks-service.yaml +++ b/blazar/templates/job-ks-service.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-3" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.reservation.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.blazar.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/blazar/templates/job-ks-user.yaml b/blazar/templates/job-ks-user.yaml index 28281cfa2d..0aee1b699e 100644 --- a/blazar/templates/job-ks-user.yaml +++ b/blazar/templates/job-ks-user.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.reservation.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} -{{- end }} {{- if .Values.pod.tolerations.blazar.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/blazar/templates/job-rabbit-init.yaml b/blazar/templates/job-rabbit-init.yaml index e6c10d6560..e8823427e1 100644 --- a/blazar/templates/job-rabbit-init.yaml +++ b/blazar/templates/job-rabbit-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $rmqUserJob "tlsSecret" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.blazar.enabled -}} {{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/blazar/values.yaml b/blazar/values.yaml index d214f9379f..2b74e8204f 100644 --- a/blazar/values.yaml +++ b/blazar/values.yaml @@ -769,10 +769,6 @@ bootstrap: script: | openstack token issue -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - manifests: certificates: false configmap_bin: true diff --git a/cinder/templates/job-backup-storage-init.yaml b/cinder/templates/job-backup-storage-init.yaml index 62db734bc3..cb38852544 100644 --- a/cinder/templates/job-backup-storage-init.yaml +++ b/cinder/templates/job-backup-storage-init.yaml @@ -53,10 +53,8 @@ metadata: labels: {{ tuple $envAll "cinder" "backup-storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: -{{- if .Values.helm3_hook }} "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation -{{- end }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: diff --git a/cinder/templates/job-create-internal-tenant.yaml b/cinder/templates/job-create-internal-tenant.yaml index e31f9647a0..60a4370493 100644 --- a/cinder/templates/job-create-internal-tenant.yaml +++ b/cinder/templates/job-create-internal-tenant.yaml @@ -29,10 +29,8 @@ kind: Job metadata: name: {{ printf "%s-%s" $serviceUserPretty "create-internal-tenant" | quote }} annotations: -{{- if .Values.helm3_hook }} "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation -{{- end }} {{- tuple "cinder-create-internal-tenant" $envAll | include "helm-toolkit.snippets.custom_job_annotations" | nindent 4 }} labels: {{ tuple $envAll "cinder" "create-internal-tenant" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml index c7e450ad24..9a4ce36917 100644 --- a/cinder/templates/job-db-init.yaml +++ b/cinder/templates/job-db-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.cinder.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml index 1bab87b0e7..9b136f3a1e 100644 --- a/cinder/templates/job-db-sync.yaml +++ b/cinder/templates/job-db-sync.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.cinder.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/cinder/templates/job-image-repo-sync.yaml b/cinder/templates/job-image-repo-sync.yaml index 2d1f1f7146..37eb5f5603 100644 --- a/cinder/templates/job-image-repo-sync.yaml +++ b/cinder/templates/job-image-repo-sync.yaml @@ -18,9 +18,7 @@ helm.sh/hook: post-install,post-upgrade {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "cinder" -}} -{{- if .Values.helm3_hook }} {{- $_ := $imageRepoSyncJob "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.cinder.enabled -}} {{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/cinder/templates/job-ks-endpoints.yaml b/cinder/templates/job-ks-endpoints.yaml index 99d5360ef3..9466849f82 100644 --- a/cinder/templates/job-ks-endpoints.yaml +++ b/cinder/templates/job-ks-endpoints.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.volumev3.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.cinder.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml index a22ba7e495..f05ff6f3dc 100644 --- a/cinder/templates/job-ks-service.yaml +++ b/cinder/templates/job-ks-service.yaml @@ -35,9 +35,7 @@ helm.sh/hook-weight: "-3" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.volumev3.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.cinder.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml index b8f5954ea5..d1817bf596 100644 --- a/cinder/templates/job-ks-user.yaml +++ b/cinder/templates/job-ks-user.yaml @@ -29,9 +29,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.volumev3.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.cinder.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/cinder/templates/job-rabbit-init.yaml b/cinder/templates/job-rabbit-init.yaml index 43d23922a9..c3924255be 100644 --- a/cinder/templates/job-rabbit-init.yaml +++ b/cinder/templates/job-rabbit-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $rmqUserJob "tlsSecret" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.cinder.enabled -}} {{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/cinder/templates/job-storage-init.yaml b/cinder/templates/job-storage-init.yaml index 350b013ac4..f8eb7d06ce 100755 --- a/cinder/templates/job-storage-init.yaml +++ b/cinder/templates/job-storage-init.yaml @@ -55,10 +55,8 @@ metadata: labels: {{ tuple $envAll "cinder" "storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: -{{- if .Values.helm3_hook }} "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation -{{- end }} spec: template: metadata: diff --git a/cinder/values.yaml b/cinder/values.yaml index b03f246675..695e99ead1 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -1505,10 +1505,6 @@ network_policy: egress: - {} -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - tls: identity: false oslo_messaging: false diff --git a/cloudkitty/templates/job-db-init.yaml b/cloudkitty/templates/job-db-init.yaml index 398731250c..af647ed117 100644 --- a/cloudkitty/templates/job-db-init.yaml +++ b/cloudkitty/templates/job-db-init.yaml @@ -13,16 +13,12 @@ limitations under the License. */}} {{- define "metadata.annotations.job.db_init" }} -{{- if .Values.helm3_hook -}} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-5" -{{- end -}} {{- end }} {{- if .Values.manifests.job_db_init }} {{- $dbInitJob := dict "envAll" . "serviceName" "cloudkitty" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml ) }} -{{- end }} {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} {{- end }} diff --git a/cloudkitty/templates/job-db-sync.yaml b/cloudkitty/templates/job-db-sync.yaml index cafde02b08..fbc0173350 100644 --- a/cloudkitty/templates/job-db-sync.yaml +++ b/cloudkitty/templates/job-db-sync.yaml @@ -23,9 +23,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.cloudkitty.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/cloudkitty/templates/job-ks-endpoints.yaml b/cloudkitty/templates/job-ks-endpoints.yaml index e03a42fb55..85cf331389 100644 --- a/cloudkitty/templates/job-ks-endpoints.yaml +++ b/cloudkitty/templates/job-ks-endpoints.yaml @@ -19,8 +19,6 @@ helm.sh/hook-weight: "-2" {{- if .Values.manifests.job_ks_endpoints }} {{- $ksServiceJob := dict "envAll" . "serviceName" "cloudkitty" "serviceTypes" ( tuple "rating" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml ) }} -{{- end }} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} {{- end }} diff --git a/cloudkitty/templates/job-ks-service.yaml b/cloudkitty/templates/job-ks-service.yaml index d75606649c..7e2c3d21f8 100644 --- a/cloudkitty/templates/job-ks-service.yaml +++ b/cloudkitty/templates/job-ks-service.yaml @@ -19,8 +19,6 @@ helm.sh/hook-weight: "-3" {{- if .Values.manifests.job_ks_service }} {{- $ksServiceJob := dict "envAll" . "serviceName" "cloudkitty" "serviceTypes" ( tuple "rating" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml ) }} -{{- end }} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} {{- end }} diff --git a/cloudkitty/templates/job-ks-user.yaml b/cloudkitty/templates/job-ks-user.yaml index 4a912a83cb..24be0fb8cf 100644 --- a/cloudkitty/templates/job-ks-user.yaml +++ b/cloudkitty/templates/job-ks-user.yaml @@ -19,8 +19,6 @@ helm.sh/hook-weight: "-1" {{- if .Values.manifests.job_ks_user }} {{- $ksUserJob := dict "envAll" . "serviceName" "cloudkitty" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml ) }} -{{- end }} {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} {{- end }} diff --git a/cloudkitty/templates/job-rabbitmq-init.yaml b/cloudkitty/templates/job-rabbitmq-init.yaml index b1323f6ec4..5f43fd83da 100644 --- a/cloudkitty/templates/job-rabbitmq-init.yaml +++ b/cloudkitty/templates/job-rabbitmq-init.yaml @@ -19,8 +19,6 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.job_rabbit_init }} {{- $rmqUserJob := dict "envAll" . "serviceName" "cloudkitty" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} {{- end }} diff --git a/cloudkitty/templates/job-storage-init.yaml b/cloudkitty/templates/job-storage-init.yaml index f9984842c6..4abd3c03bc 100644 --- a/cloudkitty/templates/job-storage-init.yaml +++ b/cloudkitty/templates/job-storage-init.yaml @@ -24,10 +24,8 @@ metadata: name: cloudkitty-storage-init annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} -{{- if .Values.helm3_hook }} "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "-4" -{{- end }} spec: template: metadata: diff --git a/cloudkitty/values.yaml b/cloudkitty/values.yaml index f49628264f..862add0ff7 100644 --- a/cloudkitty/values.yaml +++ b/cloudkitty/values.yaml @@ -740,10 +740,6 @@ conf: - volume_type unit: GiB -# Note(xuxant): Hooks will break the upgrade for helm2 -# Set to false if using helm2. -helm3_hook: true - network: api: ingress: diff --git a/freezer/templates/job-db-init.yaml b/freezer/templates/job-db-init.yaml index 26b5067b48..01fddb2b57 100644 --- a/freezer/templates/job-db-init.yaml +++ b/freezer/templates/job-db-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.freezer.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/freezer/templates/job-db-sync.yaml b/freezer/templates/job-db-sync.yaml index 3c061f838c..9a4b8bc9b6 100644 --- a/freezer/templates/job-db-sync.yaml +++ b/freezer/templates/job-db-sync.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.freezer.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/freezer/templates/job-image-repo-sync.yaml b/freezer/templates/job-image-repo-sync.yaml index 5f9859c3e8..02ed5daba9 100644 --- a/freezer/templates/job-image-repo-sync.yaml +++ b/freezer/templates/job-image-repo-sync.yaml @@ -13,10 +13,8 @@ limitations under the License. */}} {{- define "metadata.annotations.job.repo_sync" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade {{- end }} -{{- end }} {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "freezer" "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) -}} diff --git a/freezer/templates/job-ks-endpoints.yaml b/freezer/templates/job-ks-endpoints.yaml index e58ada40f6..213b48f008 100644 --- a/freezer/templates/job-ks-endpoints.yaml +++ b/freezer/templates/job-ks-endpoints.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksEndpointsJob "tlsSecret" .Values.secrets.tls.backup.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksEndpointsJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.freezer.enabled -}} {{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/freezer/templates/job-ks-service.yaml b/freezer/templates/job-ks-service.yaml index c82215ca93..2a25c09fea 100644 --- a/freezer/templates/job-ks-service.yaml +++ b/freezer/templates/job-ks-service.yaml @@ -22,11 +22,9 @@ helm.sh/hook-weight: "-3" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.backup.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.freezer.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/freezer/templates/job-ks-user.yaml b/freezer/templates/job-ks-user.yaml index e03c43084e..ca1ec9ea6c 100644 --- a/freezer/templates/job-ks-user.yaml +++ b/freezer/templates/job-ks-user.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.backup.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} -{{- end }} {{- if .Values.pod.tolerations.freezer.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/freezer/values.yaml b/freezer/values.yaml index f470269cc8..25ef4f780a 100644 --- a/freezer/values.yaml +++ b/freezer/values.yaml @@ -500,10 +500,6 @@ tls: identity: false oslo_db: false -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - manifests: certificates: false configmap_bin: true diff --git a/glance/templates/job-bootstrap.yaml b/glance/templates/job-bootstrap.yaml index c1af58dcca..6cd4f2c855 100644 --- a/glance/templates/job-bootstrap.yaml +++ b/glance/templates/job-bootstrap.yaml @@ -33,9 +33,7 @@ volumes: {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $bootstrapJob "tlsSecret" .Values.secrets.tls.image.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $bootstrapJob "jobAnnotations" (include "metadata.annotations.job.bootstrap" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.glance.enabled -}} {{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/glance/templates/job-db-init.yaml b/glance/templates/job-db-init.yaml index 6f797814d6..02c31a0951 100644 --- a/glance/templates/job-db-init.yaml +++ b/glance/templates/job-db-init.yaml @@ -24,9 +24,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.glance.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/glance/templates/job-db-sync.yaml b/glance/templates/job-db-sync.yaml index 552787deb0..643b7870d4 100644 --- a/glance/templates/job-db-sync.yaml +++ b/glance/templates/job-db-sync.yaml @@ -23,9 +23,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.glance.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/glance/templates/job-image-repo-sync.yaml b/glance/templates/job-image-repo-sync.yaml index dc9d322613..850b6719c8 100644 --- a/glance/templates/job-image-repo-sync.yaml +++ b/glance/templates/job-image-repo-sync.yaml @@ -18,9 +18,7 @@ helm.sh/hook: post-install,post-upgrade {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "glance" -}} -{{- if .Values.helm3_hook }} {{- $_ := $imageRepoSyncJob "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.glance.enabled -}} {{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/glance/templates/job-ks-endpoints.yaml b/glance/templates/job-ks-endpoints.yaml index fe761a38ca..9f611b74d7 100644 --- a/glance/templates/job-ks-endpoints.yaml +++ b/glance/templates/job-ks-endpoints.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.image.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.glance.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/glance/templates/job-ks-service.yaml b/glance/templates/job-ks-service.yaml index 8aaef789dc..78e0f664fb 100644 --- a/glance/templates/job-ks-service.yaml +++ b/glance/templates/job-ks-service.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-3" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.image.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.glance.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/glance/templates/job-ks-user.yaml b/glance/templates/job-ks-user.yaml index 7f646e39e3..0382fe444e 100644 --- a/glance/templates/job-ks-user.yaml +++ b/glance/templates/job-ks-user.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.image.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.glance.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/glance/templates/job-metadefs-load.yaml b/glance/templates/job-metadefs-load.yaml index 401274897f..5b16abf73b 100644 --- a/glance/templates/job-metadefs-load.yaml +++ b/glance/templates/job-metadefs-load.yaml @@ -25,9 +25,7 @@ metadata: labels: {{ tuple $envAll "glance" "metadefs-load" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade -{{- end }} {{ tuple $serviceAccountName $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: diff --git a/glance/templates/job-rabbit-init.yaml b/glance/templates/job-rabbit-init.yaml index 6bd14d6e1a..b5c4bf3e14 100644 --- a/glance/templates/job-rabbit-init.yaml +++ b/glance/templates/job-rabbit-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $rmqUserJob "tlsSecret" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.glance.enabled -}} {{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml index 2fddf9b4f5..d6ca4ea54f 100644 --- a/glance/templates/job-storage-init.yaml +++ b/glance/templates/job-storage-init.yaml @@ -53,9 +53,7 @@ metadata: labels: {{ tuple $envAll "glance" "storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade -{{- end }} {{ tuple $serviceAccountName $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: diff --git a/glance/values.yaml b/glance/values.yaml index 7076e0b341..32135f1385 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -1039,10 +1039,6 @@ pod: memory: "1024Mi" cpu: "2000m" -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - tls: identity: false oslo_messaging: false diff --git a/heat/templates/job-bootstrap.yaml b/heat/templates/job-bootstrap.yaml index e5157dae8e..c9e691a8e8 100644 --- a/heat/templates/job-bootstrap.yaml +++ b/heat/templates/job-bootstrap.yaml @@ -21,9 +21,7 @@ helm.sh/hook: post-install,post-upgrade {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $bootstrapJob "tlsSecret" .Values.secrets.tls.orchestration.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $bootstrapJob "jobAnnotations" (include "metadata.annotations.job.bootstrap" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.heat.enabled -}} {{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml index 442a2fa40d..e7d344ada3 100644 --- a/heat/templates/job-db-init.yaml +++ b/heat/templates/job-db-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.heat.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml index a25faf849e..716e30125b 100644 --- a/heat/templates/job-db-sync.yaml +++ b/heat/templates/job-db-sync.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.heat.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/heat/templates/job-image-repo-sync.yaml b/heat/templates/job-image-repo-sync.yaml index 83a84bbdee..9aad01e7f7 100644 --- a/heat/templates/job-image-repo-sync.yaml +++ b/heat/templates/job-image-repo-sync.yaml @@ -18,9 +18,7 @@ helm.sh/hook: post-install,post-upgrade {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "heat" -}} -{{- if .Values.helm3_hook }} {{- $_ := $imageRepoSyncJob "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.heat.enabled -}} {{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/heat/templates/job-ks-endpoints.yaml b/heat/templates/job-ks-endpoints.yaml index 21b0bd1ef4..09efbe052c 100644 --- a/heat/templates/job-ks-endpoints.yaml +++ b/heat/templates/job-ks-endpoints.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.orchestration.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.heat.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml index 930707ad98..1a84e32a91 100644 --- a/heat/templates/job-ks-service.yaml +++ b/heat/templates/job-ks-service.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-3" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.orchestration.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.heat.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/heat/templates/job-ks-user-domain.yaml b/heat/templates/job-ks-user-domain.yaml index 6e76df8fe4..bc0addb3e1 100644 --- a/heat/templates/job-ks-user-domain.yaml +++ b/heat/templates/job-ks-user-domain.yaml @@ -25,10 +25,8 @@ metadata: labels: {{ tuple $envAll "heat" "ks-user-domain" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: -{{- if .Values.helm3_hook }} "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation -{{- end }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml index e3fdd6b07a..c421e66708 100644 --- a/heat/templates/job-ks-user.yaml +++ b/heat/templates/job-ks-user.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.orchestration.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.heat.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/heat/templates/job-rabbit-init.yaml b/heat/templates/job-rabbit-init.yaml index bd6b228c93..abc1f83f2e 100644 --- a/heat/templates/job-rabbit-init.yaml +++ b/heat/templates/job-rabbit-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $rmqUserJob "tlsSecret" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.heat.enabled -}} {{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/heat/templates/job-trusts.yaml b/heat/templates/job-trusts.yaml index c6f2fd3f66..f5e26bac62 100644 --- a/heat/templates/job-trusts.yaml +++ b/heat/templates/job-trusts.yaml @@ -27,10 +27,8 @@ metadata: labels: {{ tuple $envAll "heat" "trusts" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: -{{- if .Values.helm3_hook }} "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation -{{- end }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: template: diff --git a/heat/values.yaml b/heat/values.yaml index 90fe560495..f8aa12c364 100644 --- a/heat/values.yaml +++ b/heat/values.yaml @@ -1206,10 +1206,6 @@ network_policy: egress: - {} -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - tls: identity: false oslo_messaging: false diff --git a/horizon/templates/job-db-init.yaml b/horizon/templates/job-db-init.yaml index 67169b5308..bbd855ea40 100644 --- a/horizon/templates/job-db-init.yaml +++ b/horizon/templates/job-db-init.yaml @@ -23,9 +23,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.horizon.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/horizon/templates/job-db-sync.yaml b/horizon/templates/job-db-sync.yaml index 616a619447..39e1d6934b 100644 --- a/horizon/templates/job-db-sync.yaml +++ b/horizon/templates/job-db-sync.yaml @@ -28,10 +28,8 @@ metadata: labels: {{ tuple $envAll "horizon" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-4" -{{- end }} {{ tuple $serviceAccountName $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} spec: diff --git a/horizon/values.yaml b/horizon/values.yaml index 1aaf139d6c..67529782ab 100644 --- a/horizon/values.yaml +++ b/horizon/values.yaml @@ -1385,10 +1385,6 @@ network_policy: egress: - {} -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - manifests: certificates: false configmap_bin: true diff --git a/ironic/templates/job-bootstrap.yaml b/ironic/templates/job-bootstrap.yaml index 3a942b6944..fff270d8b0 100644 --- a/ironic/templates/job-bootstrap.yaml +++ b/ironic/templates/job-bootstrap.yaml @@ -23,9 +23,7 @@ helm.sh/hook-weight: "5" {{- if .Values.pod.tolerations.ironic.enabled -}} {{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $bootstrapJob "jobAnnotations" (include "metadata.annotations.job.bootstrap" . | fromYaml) }} -{{- end }} {{ $bootstrapJob | include "helm-toolkit.manifests.job_bootstrap" }} {{- else }} {{ include "helm-toolkit.manifests.job_bootstrap" }} diff --git a/ironic/templates/job-db-init.yaml b/ironic/templates/job-db-init.yaml index 9ec9fda52f..09078fc3ca 100644 --- a/ironic/templates/job-db-init.yaml +++ b/ironic/templates/job-db-init.yaml @@ -19,9 +19,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.job_db_init }} {{- $dbInitJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.ironic.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/ironic/templates/job-db-sync.yaml b/ironic/templates/job-db-sync.yaml index fecf8a53e2..b4488514cf 100644 --- a/ironic/templates/job-db-sync.yaml +++ b/ironic/templates/job-db-sync.yaml @@ -19,9 +19,7 @@ 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 -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.ironic.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/ironic/templates/job-image-repo-sync.yaml b/ironic/templates/job-image-repo-sync.yaml index fa31d0e0fc..82838512a2 100644 --- a/ironic/templates/job-image-repo-sync.yaml +++ b/ironic/templates/job-image-repo-sync.yaml @@ -18,9 +18,7 @@ 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" -}} -{{- if .Values.helm3_hook }} {{- $_ := $imageRepoSyncJob "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.ironic.enabled -}} {{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/ironic/templates/job-ks-endpoints.yaml b/ironic/templates/job-ks-endpoints.yaml index 1b3a915159..3de5283ea3 100644 --- a/ironic/templates/job-ks-endpoints.yaml +++ b/ironic/templates/job-ks-endpoints.yaml @@ -19,9 +19,7 @@ helm.sh/hook-weight: "-2" {{- if .Values.manifests.job_ks_endpoints }} {{- $ksEndpointsJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksEndpointsJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.ironic.enabled -}} {{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/ironic/templates/job-ks-service.yaml b/ironic/templates/job-ks-service.yaml index 686fa091f8..01eb4e592c 100644 --- a/ironic/templates/job-ks-service.yaml +++ b/ironic/templates/job-ks-service.yaml @@ -19,9 +19,7 @@ helm.sh/hook-weight: "-3" {{- if .Values.manifests.job_ks_service }} {{- $ksServiceJob := dict "envAll" . "serviceName" "ironic" "serviceTypes" ( tuple "baremetal" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.ironic.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/ironic/templates/job-ks-user.yaml b/ironic/templates/job-ks-user.yaml index ed587397de..098e0c62ce 100644 --- a/ironic/templates/job-ks-user.yaml +++ b/ironic/templates/job-ks-user.yaml @@ -19,9 +19,7 @@ helm.sh/hook-weight: "-1" {{- if .Values.manifests.job_ks_user }} {{- $ksUserJob := dict "envAll" . "serviceName" "ironic" "jobAnnotations" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.ironic.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/ironic/templates/job-manage-cleaning-network.yaml b/ironic/templates/job-manage-cleaning-network.yaml index 48e8d729cc..f87397e533 100644 --- a/ironic/templates/job-manage-cleaning-network.yaml +++ b/ironic/templates/job-manage-cleaning-network.yaml @@ -23,10 +23,8 @@ kind: Job metadata: name: ironic-manage-cleaning-network annotations: -{{- if .Values.helm3_hook }} "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation -{{- end }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple "ironic_manage_cleaning_network" $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }} spec: diff --git a/ironic/templates/job-rabbit-init.yaml b/ironic/templates/job-rabbit-init.yaml index 0abfa91ac0..cffb6b084a 100644 --- a/ironic/templates/job-rabbit-init.yaml +++ b/ironic/templates/job-rabbit-init.yaml @@ -19,9 +19,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.job_rabbit_init }} {{- $rmqUserJob := dict "envAll" . "serviceName" "ironic" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.ironic.enabled -}} {{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/ironic/values.yaml b/ironic/values.yaml index efc17b05aa..dda901044d 100644 --- a/ironic/values.yaml +++ b/ironic/values.yaml @@ -18,8 +18,6 @@ --- release_group: null -helm3_hook: true - labels: api: node_selector_key: openstack-control-plane diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml index e12cf5bf81..1fb21e8e4f 100644 --- a/keystone/templates/job-credential-setup.yaml +++ b/keystone/templates/job-credential-setup.yaml @@ -58,11 +58,9 @@ metadata: labels: {{ tuple $envAll "keystone" "credential-setup" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: -{{- if .Values.helm3_hook }} "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-weight": "-5" "helm.sh/hook-delete-policy": before-hook-creation -{{- end }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple "keystone_credential_setup" $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }} spec: diff --git a/keystone/templates/job-db-init.yaml b/keystone/templates/job-db-init.yaml index 757b705e9e..6f35e12eaa 100644 --- a/keystone/templates/job-db-init.yaml +++ b/keystone/templates/job-db-init.yaml @@ -13,10 +13,8 @@ limitations under the License. */}} {{- define "metadata.annotations.job.db_init" }} -{{- if .Values.helm3_hook -}} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-5" -{{- end -}} {{- end }} {{- if .Values.manifests.job_db_init }} diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml index a4ff67d80c..ffa01965b7 100644 --- a/keystone/templates/job-db-sync.yaml +++ b/keystone/templates/job-db-sync.yaml @@ -13,10 +13,8 @@ limitations under the License. */}} {{- define "metadata.annotations.job.db_sync" }} -{{- if .Values.helm3_hook -}} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-4" -{{- end -}} {{- end }} {{- define "keystone.templates._job_db_sync.env_vars" -}} diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml index 2d547fe735..1d85aa7fb2 100644 --- a/keystone/templates/job-fernet-setup.yaml +++ b/keystone/templates/job-fernet-setup.yaml @@ -59,11 +59,9 @@ metadata: labels: {{ tuple $envAll "keystone" "fernet-setup" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: -{{- if .Values.helm3_hook }} "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-weight": "-5" "helm.sh/hook-delete-policy": before-hook-creation -{{- end }} {{ tuple "keystone_fernet_setup" $envAll | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 }} spec: template: diff --git a/keystone/templates/secret-credential-keys.yaml b/keystone/templates/secret-credential-keys.yaml index 302f31dad3..e9ede5b0f1 100644 --- a/keystone/templates/secret-credential-keys.yaml +++ b/keystone/templates/secret-credential-keys.yaml @@ -19,11 +19,9 @@ apiVersion: v1 kind: Secret metadata: name: keystone-credential-keys -{{- if .Values.helm3_hook }} annotations: "helm.sh/hook": pre-install "helm.sh/resource-policy": keep -{{- end }} type: Opaque data: {{- end }} diff --git a/keystone/templates/secret-fernet-keys.yaml b/keystone/templates/secret-fernet-keys.yaml index 603964ae1b..2d6c049aea 100644 --- a/keystone/templates/secret-fernet-keys.yaml +++ b/keystone/templates/secret-fernet-keys.yaml @@ -20,11 +20,9 @@ apiVersion: v1 kind: Secret metadata: name: keystone-fernet-keys -{{- if .Values.helm3_hook }} annotations: "helm.sh/hook": pre-install "helm.sh/resource-policy": keep -{{- end }} type: Opaque data: {{- end }} diff --git a/keystone/values.yaml b/keystone/values.yaml index 8cf7c57ca7..91fe0682c0 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -29,10 +29,6 @@ labels: release_group: null -# NOTE(gagehugo): the pre-install hook breaks upgrade for helm2 -# Set to false to upgrade using helm2 -helm3_hook: true - images: tags: bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble diff --git a/manila/templates/job-bootstrap.yaml b/manila/templates/job-bootstrap.yaml index 8589f2ba4b..6c769bd5d7 100644 --- a/manila/templates/job-bootstrap.yaml +++ b/manila/templates/job-bootstrap.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.bootstrap" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "5" {{- end }} -{{- end }} {{- if and .Values.manifests.job_bootstrap .Values.bootstrap.enabled }} {{- $bootstrapJob := dict "envAll" . "serviceName" "manila" "keystoneUser" .Values.bootstrap.ks_user "logConfigFile" .Values.conf.manila.DEFAULT.log_config_append "jobAnnotations" (include "metadata.annotations.job.bootstrap" . | fromYaml) -}} diff --git a/manila/templates/job-db-init.yaml b/manila/templates/job-db-init.yaml index f2df99fcff..062eb6d098 100644 --- a/manila/templates/job-db-init.yaml +++ b/manila/templates/job-db-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.manila.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/manila/templates/job-db-sync.yaml b/manila/templates/job-db-sync.yaml index 014e4cd5a6..206a62ee3e 100644 --- a/manila/templates/job-db-sync.yaml +++ b/manila/templates/job-db-sync.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.manila.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/manila/templates/job-image-repo-sync.yaml b/manila/templates/job-image-repo-sync.yaml index d7fc6438f2..9af2bdae6b 100644 --- a/manila/templates/job-image-repo-sync.yaml +++ b/manila/templates/job-image-repo-sync.yaml @@ -13,10 +13,8 @@ limitations under the License. */}} {{- define "metadata.annotations.job.repo_sync" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade {{- end }} -{{- end }} {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "manila" "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) -}} diff --git a/manila/templates/job-ks-endpoints.yaml b/manila/templates/job-ks-endpoints.yaml index 56b529ed72..e449438659 100644 --- a/manila/templates/job-ks-endpoints.yaml +++ b/manila/templates/job-ks-endpoints.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.ks_endpoints" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-2" {{- end }} -{{- end }} {{- if .Values.manifests.job_ks_endpoints }} {{- $ksServiceJob := dict "envAll" . "serviceName" "manila" "serviceTypes" ( tuple "share" "sharev2" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} diff --git a/manila/templates/job-ks-service.yaml b/manila/templates/job-ks-service.yaml index 895b31f566..41b6678e79 100644 --- a/manila/templates/job-ks-service.yaml +++ b/manila/templates/job-ks-service.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.ks_service" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-3" {{- end }} -{{- end }} {{- if .Values.manifests.job_ks_service }} {{- $ksServiceJob := dict "envAll" . "serviceName" "manila" "serviceTypes" ( tuple "share" "sharev2" ) "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}} diff --git a/manila/templates/job-ks-user.yaml b/manila/templates/job-ks-user.yaml index b7ef07e989..ce1f03e240 100644 --- a/manila/templates/job-ks-user.yaml +++ b/manila/templates/job-ks-user.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.ks_user" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-1" {{- end }} -{{- end }} {{- if .Values.manifests.job_ks_user }} {{- $ksUserJob := dict "envAll" . "serviceName" "manila" "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} diff --git a/manila/templates/job-rabbit-init.yaml b/manila/templates/job-rabbit-init.yaml index 9b2ab56410..61f38857e3 100644 --- a/manila/templates/job-rabbit-init.yaml +++ b/manila/templates/job-rabbit-init.yaml @@ -13,11 +13,9 @@ limitations under the License. */}} {{- define "metadata.annotations.job.rabbit_init" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-4" {{- end }} -{{- end }} {{- if .Values.manifests.job_rabbit_init }} {{- $rmqUserJob := dict "envAll" . "serviceName" "manila" "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) -}} diff --git a/manila/values.yaml b/manila/values.yaml index 1b73112f30..85e003fa32 100644 --- a/manila/values.yaml +++ b/manila/values.yaml @@ -38,10 +38,6 @@ labels: release_group: null -# NOTE(philsphicas): the pre-install hook breaks upgrade for helm2 -# Set to false to upgrade using helm2 -helm3_hook: true - images: tags: bootstrap: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble diff --git a/mariadb-backup/values.yaml b/mariadb-backup/values.yaml index 6240f6b562..1383796d8b 100644 --- a/mariadb-backup/values.yaml +++ b/mariadb-backup/values.yaml @@ -365,10 +365,6 @@ network_policy: egress: - {} -# Helm hook breaks for helm2. -# Set helm3_hook: false in case helm2 is used. -helm3_hook: true - manifests: certificates: false configmap_bin: true diff --git a/mariadb-cluster/templates/job-refresh-statefulset.yaml b/mariadb-cluster/templates/job-refresh-statefulset.yaml index b16a73035e..4a078ceafc 100644 --- a/mariadb-cluster/templates/job-refresh-statefulset.yaml +++ b/mariadb-cluster/templates/job-refresh-statefulset.yaml @@ -56,12 +56,10 @@ metadata: name: mariadb-cluster-refresh-statefulset labels: {{ tuple $envAll "mariadb-cluster" "refresh-statefulset" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} -{{- if .Values.helm3_hook }} annotations: "helm.sh/hook": "post-upgrade" "helm.sh/hook-weight": "5" "helm.sh/hook-delete-policy": "before-hook-creation" -{{- end }} spec: backoffLimit: {{ .Values.jobs.mariadb_cluster_refresh_statefulset.backoffLimit }} template: diff --git a/mariadb-cluster/values.yaml b/mariadb-cluster/values.yaml index e9e1848535..3d76a44b66 100644 --- a/mariadb-cluster/values.yaml +++ b/mariadb-cluster/values.yaml @@ -560,10 +560,6 @@ network_policy: egress: - {} -# Helm hook breaks for helm2. -# Set helm3_hook: false in case helm2 is used. -helm3_hook: true - manifests: certificates: false configmap_bin: true diff --git a/mariadb/values.yaml b/mariadb/values.yaml index 81dfccf0fc..ebeec56a01 100644 --- a/mariadb/values.yaml +++ b/mariadb/values.yaml @@ -677,10 +677,6 @@ network_policy: egress: - {} -# Helm hook breaks for helm2. -# Set helm3_hook: false in case helm2 is used. -helm3_hook: true - manifests: certificates: false configmap_bin: true diff --git a/masakari/templates/job-db-init.yaml b/masakari/templates/job-db-init.yaml index 04f6dc14b4..7f551100ad 100644 --- a/masakari/templates/job-db-init.yaml +++ b/masakari/templates/job-db-init.yaml @@ -13,16 +13,12 @@ limitations under the License. */}} {{- define "metadata.annotations.job.db_init" }} -{{- if .Values.helm3_hook -}} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-5" -{{- end -}} {{- end }} {{- if .Values.manifests.job_db_init }} {{- $dbInitJob := dict "envAll" . "serviceName" "masakari" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml ) }} -{{- end }} {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} {{- end }} diff --git a/masakari/templates/job-db-sync.yaml b/masakari/templates/job-db-sync.yaml index 44563bce2b..019391455a 100644 --- a/masakari/templates/job-db-sync.yaml +++ b/masakari/templates/job-db-sync.yaml @@ -24,10 +24,8 @@ metadata: name: masakari-db-sync annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} -{{- if .Values.helm3_hook }} "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "-4" -{{- end }} spec: template: metadata: diff --git a/masakari/templates/job-ks-endpoints.yaml b/masakari/templates/job-ks-endpoints.yaml index fb8718ccae..a95e6274d1 100644 --- a/masakari/templates/job-ks-endpoints.yaml +++ b/masakari/templates/job-ks-endpoints.yaml @@ -19,8 +19,6 @@ helm.sh/hook-weight: "-2" {{- if .Values.manifests.job_ks_endpoints }} {{- $ksServiceJob := dict "envAll" . "serviceName" "masakari" "serviceTypes" ( tuple "instance-ha" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml ) }} -{{- end }} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} {{- end }} diff --git a/masakari/templates/job-ks-service.yaml b/masakari/templates/job-ks-service.yaml index a33a9bec2c..9a32b818a7 100644 --- a/masakari/templates/job-ks-service.yaml +++ b/masakari/templates/job-ks-service.yaml @@ -19,8 +19,6 @@ helm.sh/hook-weight: "-3" {{- if .Values.manifests.job_ks_service }} {{- $ksServiceJob := dict "envAll" . "serviceName" "masakari" "serviceTypes" ( tuple "instance-ha" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml ) }} -{{- end }} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} {{- end }} diff --git a/masakari/templates/job-ks-user.yaml b/masakari/templates/job-ks-user.yaml index 0f0fd2768a..93a029e5ca 100644 --- a/masakari/templates/job-ks-user.yaml +++ b/masakari/templates/job-ks-user.yaml @@ -19,8 +19,6 @@ helm.sh/hook-weight: "-1" {{- if .Values.manifests.job_ks_user }} {{- $ksUserJob := dict "envAll" . "serviceName" "masakari" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml ) }} -{{- end }} {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} {{- end }} diff --git a/masakari/templates/job-rabbitmq-init.yaml b/masakari/templates/job-rabbitmq-init.yaml index 7965d8ed45..32adb57baf 100644 --- a/masakari/templates/job-rabbitmq-init.yaml +++ b/masakari/templates/job-rabbitmq-init.yaml @@ -19,8 +19,6 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.job_rabbit_init }} {{- $rmqUserJob := dict "envAll" . "serviceName" "masakari" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{ $rmqUserJob | include "helm-toolkit.manifests.job_rabbit_init" }} {{- end }} diff --git a/masakari/values.yaml b/masakari/values.yaml index 5b02294f6b..77503aa38b 100644 --- a/masakari/values.yaml +++ b/masakari/values.yaml @@ -613,10 +613,6 @@ conf: Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/var/lib/openstack/bin" masakari-monitors ALL=(ALL:ALL) NOPASSWD: /var/lib/openstack/bin/privsep-helper -# Note(xuxant): Hooks will break the upgrade for helm2 -# Set to false if using helm2. -helm3_hook: true - network: masakari_api: node_port: diff --git a/neutron/templates/job-bootstrap.yaml b/neutron/templates/job-bootstrap.yaml index ff9dbe8f44..0d635c3543 100644 --- a/neutron/templates/job-bootstrap.yaml +++ b/neutron/templates/job-bootstrap.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "5" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $bootstrapJob "tlsSecret" .Values.secrets.tls.network.server.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $bootstrapJob "jobAnnotations" (include "metadata.annotations.job.bootstrap" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.neutron.enabled -}} {{- $_ := set $bootstrapJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/neutron/templates/job-db-init.yaml b/neutron/templates/job-db-init.yaml index 184ec97d8b..1e957a28b1 100644 --- a/neutron/templates/job-db-init.yaml +++ b/neutron/templates/job-db-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.neutron.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml index 1d22407923..533123918f 100644 --- a/neutron/templates/job-db-sync.yaml +++ b/neutron/templates/job-db-sync.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.neutron.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/neutron/templates/job-image-repo-sync.yaml b/neutron/templates/job-image-repo-sync.yaml index 890c57ed54..f592561951 100644 --- a/neutron/templates/job-image-repo-sync.yaml +++ b/neutron/templates/job-image-repo-sync.yaml @@ -18,9 +18,7 @@ helm.sh/hook: post-install,post-upgrade {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "neutron" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $imageRepoSyncJob "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.neutron.enabled -}} {{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/neutron/templates/job-ks-endpoints.yaml b/neutron/templates/job-ks-endpoints.yaml index ec76b71dd2..5a770a0741 100644 --- a/neutron/templates/job-ks-endpoints.yaml +++ b/neutron/templates/job-ks-endpoints.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksEndpointsJob "tlsSecret" .Values.secrets.tls.network.server.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksEndpointsJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.neutron.enabled -}} {{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/neutron/templates/job-ks-service.yaml b/neutron/templates/job-ks-service.yaml index e4225c6e6d..411db8a51b 100644 --- a/neutron/templates/job-ks-service.yaml +++ b/neutron/templates/job-ks-service.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-3" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.network.server.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.neutron.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/neutron/templates/job-ks-user.yaml b/neutron/templates/job-ks-user.yaml index a80b0a2c7b..07aef29528 100644 --- a/neutron/templates/job-ks-user.yaml +++ b/neutron/templates/job-ks-user.yaml @@ -29,9 +29,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.network.server.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.neutron.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/neutron/templates/job-rabbit-init.yaml b/neutron/templates/job-rabbit-init.yaml index 0d08170d76..d2b9a9c5d0 100644 --- a/neutron/templates/job-rabbit-init.yaml +++ b/neutron/templates/job-rabbit-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $rmqUserJob "tlsSecret" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.neutron.enabled -}} {{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/neutron/values.yaml b/neutron/values.yaml index e6669f2f94..1f76419e34 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -2680,8 +2680,6 @@ network_policy: egress: - {} -helm3_hook: true - health_probe: logging: level: ERROR diff --git a/nova/templates/job-db-init.yaml b/nova/templates/job-db-init.yaml index 72b0a8086f..0229b76e65 100644 --- a/nova/templates/job-db-init.yaml +++ b/nova/templates/job-db-init.yaml @@ -27,9 +27,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.nova.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml index 061e18f183..6dc104cf79 100644 --- a/nova/templates/job-db-sync.yaml +++ b/nova/templates/job-db-sync.yaml @@ -43,9 +43,7 @@ env: {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.nova.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/nova/templates/job-image-repo-sync.yaml b/nova/templates/job-image-repo-sync.yaml index e2ee66dfe5..e230d39201 100644 --- a/nova/templates/job-image-repo-sync.yaml +++ b/nova/templates/job-image-repo-sync.yaml @@ -18,9 +18,7 @@ helm.sh/hook: post-install,post-upgrade {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "nova" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $imageRepoSyncJob "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.nova.enabled -}} {{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/nova/templates/job-ks-endpoints.yaml b/nova/templates/job-ks-endpoints.yaml index 1e41ec46dc..0eef1a3c11 100644 --- a/nova/templates/job-ks-endpoints.yaml +++ b/nova/templates/job-ks-endpoints.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.compute.osapi.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.nova.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/nova/templates/job-ks-service.yaml b/nova/templates/job-ks-service.yaml index 9e7a551f76..2b51838dd0 100644 --- a/nova/templates/job-ks-service.yaml +++ b/nova/templates/job-ks-service.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-3" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.compute.osapi.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.nova.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/nova/templates/job-ks-user.yaml b/nova/templates/job-ks-user.yaml index 1d58b7a59a..938813560c 100644 --- a/nova/templates/job-ks-user.yaml +++ b/nova/templates/job-ks-user.yaml @@ -26,9 +26,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.compute.osapi.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} -{{- end }} {{- if .Values.pod.tolerations.nova.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/nova/templates/job-nova-storage-init.yaml b/nova/templates/job-nova-storage-init.yaml index 85810f4e5a..e7e363dbe7 100644 --- a/nova/templates/job-nova-storage-init.yaml +++ b/nova/templates/job-nova-storage-init.yaml @@ -49,11 +49,9 @@ subjects: apiVersion: batch/v1 kind: Job metadata: -{{- if .Values.helm3_hook }} annotations: helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-6" -{{- end }} name: nova-storage-init labels: {{ tuple $envAll "nova" "storage-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} diff --git a/nova/templates/job-rabbit-init.yaml b/nova/templates/job-rabbit-init.yaml index b5133d30f9..7fb85718a1 100644 --- a/nova/templates/job-rabbit-init.yaml +++ b/nova/templates/job-rabbit-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $rmqUserJob "tlsSecret" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.nova.enabled -}} {{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/nova/values.yaml b/nova/values.yaml index 5f38df5966..2ad7f6b7c6 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -2686,10 +2686,6 @@ network_policy: egress: - {} -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - health_probe: logging: level: ERROR diff --git a/octavia/templates/job-db-init.yaml b/octavia/templates/job-db-init.yaml index c532cc998f..2d602337a1 100644 --- a/octavia/templates/job-db-init.yaml +++ b/octavia/templates/job-db-init.yaml @@ -25,8 +25,6 @@ helm.sh/hook-weight: "-5" {{- $dbPersist := dict "adminSecret" .Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "task_flow" "configDbKey" "persistence_connection" -}} {{- $dbsToInit := list $dbSvc $dbPersist }} {{- $dbInitJob := dict "envAll" . "serviceName" $serviceName "dbsToInit" $dbsToInit -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} {{- end }} diff --git a/octavia/values.yaml b/octavia/values.yaml index 91b9290c53..1ce3d0636a 100644 --- a/octavia/values.yaml +++ b/octavia/values.yaml @@ -40,10 +40,6 @@ labels: node_selector_key: openstack-control-plane node_selector_value: enabled -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - images: tags: test: docker.io/xrally/xrally-openstack:2.0.0 diff --git a/placement/templates/job-db-init.yaml b/placement/templates/job-db-init.yaml index 6edd4175ea..e36c360d1e 100644 --- a/placement/templates/job-db-init.yaml +++ b/placement/templates/job-db-init.yaml @@ -27,9 +27,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) -}} -{{- end }} {{- if .Values.pod.tolerations.placement.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/placement/templates/job-db-sync.yaml b/placement/templates/job-db-sync.yaml index fea53d9702..e51877e5c0 100644 --- a/placement/templates/job-db-sync.yaml +++ b/placement/templates/job-db-sync.yaml @@ -24,11 +24,9 @@ helm.sh/hook-weight: "-3" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.placement.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/placement/templates/job-image-repo-sync.yaml b/placement/templates/job-image-repo-sync.yaml index 2cda817e33..765a5755ca 100644 --- a/placement/templates/job-image-repo-sync.yaml +++ b/placement/templates/job-image-repo-sync.yaml @@ -20,9 +20,7 @@ helm.sh/hook: post-install,post-upgrade {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "placement" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $imageRepoSyncJob "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.placement.enabled -}} {{- $_ := set $imageRepoSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/placement/templates/job-ks-endpoints.yaml b/placement/templates/job-ks-endpoints.yaml index bfb0bd2831..8f8c01f970 100644 --- a/placement/templates/job-ks-endpoints.yaml +++ b/placement/templates/job-ks-endpoints.yaml @@ -24,9 +24,7 @@ helm.sh/hook-weight: "1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.placement.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} -{{- end }} {{- if .Values.pod.tolerations.placement.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/placement/templates/job-ks-service.yaml b/placement/templates/job-ks-service.yaml index 3f05eb0654..c18e9dfff6 100644 --- a/placement/templates/job-ks-service.yaml +++ b/placement/templates/job-ks-service.yaml @@ -24,9 +24,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.placement.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}} -{{- end }} {{- if .Values.pod.tolerations.placement.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/placement/templates/job-ks-user.yaml b/placement/templates/job-ks-user.yaml index 056938bdda..e3a17c2a90 100644 --- a/placement/templates/job-ks-user.yaml +++ b/placement/templates/job-ks-user.yaml @@ -24,9 +24,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.placement.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} -{{- end }} {{- if .Values.pod.tolerations.placement.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/placement/values.yaml b/placement/values.yaml index 345a5fbde3..99c8da9a8a 100644 --- a/placement/values.yaml +++ b/placement/values.yaml @@ -457,10 +457,6 @@ dependencies: - endpoint: internal service: oslo_db -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - tls: identity: false oslo_messaging: false diff --git a/prometheus-mysql-exporter/templates/exporter-job-create-user.yaml b/prometheus-mysql-exporter/templates/exporter-job-create-user.yaml index 3352ab8d6a..10481452ba 100644 --- a/prometheus-mysql-exporter/templates/exporter-job-create-user.yaml +++ b/prometheus-mysql-exporter/templates/exporter-job-create-user.yaml @@ -24,12 +24,10 @@ metadata: name: exporter-create-sql-user labels: {{ tuple $envAll "prometheus-mysql-exporter" "create-sql-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} -{{- if .Values.helm3_hook }} annotations: "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "5" "helm.sh/hook-delete-policy": "before-hook-creation" -{{- end }} spec: backoffLimit: {{ .Values.jobs.exporter_create_sql_user.backoffLimit }} template: diff --git a/prometheus-mysql-exporter/values.yaml b/prometheus-mysql-exporter/values.yaml index 51af790843..bb303ae356 100644 --- a/prometheus-mysql-exporter/values.yaml +++ b/prometheus-mysql-exporter/values.yaml @@ -308,10 +308,6 @@ network_policy: egress: - {} -# Helm hook breaks for helm2. -# Set helm3_hook: false in case helm2 is used. -helm3_hook: true - manifests: certificates: false job_image_repo_sync: true diff --git a/rabbitmq/templates/job-cluster-wait.yaml b/rabbitmq/templates/job-cluster-wait.yaml index 1c4378c708..784a574f32 100644 --- a/rabbitmq/templates/job-cluster-wait.yaml +++ b/rabbitmq/templates/job-cluster-wait.yaml @@ -37,11 +37,9 @@ metadata: {{ tuple $envAll "rabbitmq" "cluster-wait" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} -{{- if .Values.helm3_hook }} "helm.sh/hook": "post-install,post-upgrade" "helm.sh/hook-weight": "5" "helm.sh/hook-delete-policy": before-hook-creation -{{- end }} spec: template: metadata: diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index fca24ae0d4..5609c0b1ef 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -391,10 +391,6 @@ volume: class_name: general size: 768Mi -# Hook break for helm2. -# Set helm3_hook to false while using helm2 -helm3_hook: true - manifests: certificates: false configmap_bin: true diff --git a/rally/templates/job-db-init.yaml b/rally/templates/job-db-init.yaml index f1fcbd7ea8..74cb25ad0b 100644 --- a/rally/templates/job-db-init.yaml +++ b/rally/templates/job-db-init.yaml @@ -20,9 +20,7 @@ helm.sh/hook-weight: "-3" {{- if .Values.manifests.job_db_init }} {{- $dbInitJob := dict "envAll" . "serviceName" "rally" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} {{- end }} diff --git a/rally/templates/job-image-repo-sync.yaml b/rally/templates/job-image-repo-sync.yaml index a2b4e32f24..1bde62aa29 100644 --- a/rally/templates/job-image-repo-sync.yaml +++ b/rally/templates/job-image-repo-sync.yaml @@ -19,9 +19,7 @@ helm.sh/hook: post-install,post-upgrade {{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} {{- $imageRepoSyncJob := dict "envAll" . "serviceName" "rally" -}} -{{- if .Values.helm3_hook }} {{- $_ := $imageRepoSyncJob "jobAnnotations" (include "metadata.annotations.job.repo_sync" . | fromYaml) }} -{{- end }} {{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} {{- end }} diff --git a/rally/templates/job-ks-endpoints.yaml b/rally/templates/job-ks-endpoints.yaml index 2626b6eec5..55145f1ff4 100644 --- a/rally/templates/job-ks-endpoints.yaml +++ b/rally/templates/job-ks-endpoints.yaml @@ -28,10 +28,8 @@ metadata: name: rally-ks-endpoints annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-1" -{{- end }} spec: template: metadata: diff --git a/rally/templates/job-ks-service.yaml b/rally/templates/job-ks-service.yaml index 89e6c9370e..c44c56e953 100644 --- a/rally/templates/job-ks-service.yaml +++ b/rally/templates/job-ks-service.yaml @@ -28,10 +28,8 @@ metadata: name: rally-ks-service annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "-2" -{{- end }} spec: template: metadata: diff --git a/rally/templates/job-ks-user.yaml b/rally/templates/job-ks-user.yaml index 997495d6d2..592cd39faf 100644 --- a/rally/templates/job-ks-user.yaml +++ b/rally/templates/job-ks-user.yaml @@ -24,9 +24,7 @@ helm.sh/hook-weight: "1" {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.identity.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) }} -{{- end }} {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} {{- end }} diff --git a/rally/templates/job-manage-db.yaml b/rally/templates/job-manage-db.yaml index 0e6040182a..70d872cd56 100644 --- a/rally/templates/job-manage-db.yaml +++ b/rally/templates/job-manage-db.yaml @@ -24,10 +24,8 @@ metadata: name: rally-manage-db annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "2" -{{- end }} spec: template: metadata: diff --git a/rally/templates/job-run-task.yaml b/rally/templates/job-run-task.yaml index c4cb14cf4a..f3f3d666c7 100644 --- a/rally/templates/job-run-task.yaml +++ b/rally/templates/job-run-task.yaml @@ -24,10 +24,8 @@ metadata: name: rally-run-task annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} -{{- if .Values.helm3_hook }} helm.sh/hook: post-install,post-upgrade helm.sh/hook-weight: "3" -{{- end }} spec: backoffLimit: {{ .Values.jobs.run_tasks.backoffLimit }} template: diff --git a/rally/values.yaml b/rally/values.yaml index 88995e9cf9..b15f16e367 100644 --- a/rally/values.yaml +++ b/rally/values.yaml @@ -3991,10 +3991,6 @@ conf: times: 6 type: constant -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - tls: identity: false diff --git a/releasenotes/notes/common-eb7338a63d83ad95.yaml b/releasenotes/notes/common-eb7338a63d83ad95.yaml new file mode 100644 index 0000000000..e1d9a2138c --- /dev/null +++ b/releasenotes/notes/common-eb7338a63d83ad95.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Support for Helm 2 has been removed by removal of the helm3_hook value across all charts. + It is no longer possible to set helm3_hook to False to support Helm 2. +... diff --git a/skyline/templates/job-db-init.yaml b/skyline/templates/job-db-init.yaml index f3a79f1b8d..e2c478da81 100644 --- a/skyline/templates/job-db-init.yaml +++ b/skyline/templates/job-db-init.yaml @@ -23,9 +23,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.skyline.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/skyline/templates/job-db-sync.yaml b/skyline/templates/job-db-sync.yaml index 23fde8b9b9..baa9cfcb1f 100644 --- a/skyline/templates/job-db-sync.yaml +++ b/skyline/templates/job-db-sync.yaml @@ -35,9 +35,7 @@ metadata: {{ tuple . $serviceName "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: {{ tuple $serviceAccountName . | include "helm-toolkit.snippets.custom_job_annotations" | indent 4 -}} -{{- if .Values.helm3_hook }} {{ include "metadata.annotations.job.db_sync" . | indent 4 }} -{{- end }} spec: backoffLimit: 1000 template: diff --git a/skyline/templates/job-ks-user.yaml b/skyline/templates/job-ks-user.yaml index e685113fea..c662c9a32d 100644 --- a/skyline/templates/job-ks-user.yaml +++ b/skyline/templates/job-ks-user.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.skyline.skyline.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} -{{- end }} {{- if .Values.pod.tolerations.skyline.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/skyline/values.yaml b/skyline/values.yaml index 2c1f0f01a0..b0da6963bf 100644 --- a/skyline/values.yaml +++ b/skyline/values.yaml @@ -21,8 +21,6 @@ labels: node_selector_key: openstack-control-plane node_selector_value: enabled -helm3_hook: true - images: pull_policy: IfNotPresent tags: diff --git a/swift/templates/job-ks-endpoints.yaml b/swift/templates/job-ks-endpoints.yaml index e7cd5ecb49..25337eab45 100644 --- a/swift/templates/job-ks-endpoints.yaml +++ b/swift/templates/job-ks-endpoints.yaml @@ -9,8 +9,6 @@ helm.sh/hook-weight: "-2" {{- if .Values.manifests.job_ks_endpoints }} {{- $ksServiceJob := dict "envAll" . "serviceName" "swift" "serviceTypes" ( tuple "object-store" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_endpoints" }} {{- end }} diff --git a/swift/templates/job-ks-service.yaml b/swift/templates/job-ks-service.yaml index 8d7e75acaf..d15f51a6ce 100644 --- a/swift/templates/job-ks-service.yaml +++ b/swift/templates/job-ks-service.yaml @@ -9,8 +9,6 @@ helm.sh/hook-weight: "-3" {{- if .Values.manifests.job_ks_service }} {{- $ksServiceJob := dict "envAll" . "serviceName" "swift" "serviceTypes" ( tuple "object-store" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{ $ksServiceJob | include "helm-toolkit.manifests.job_ks_service" }} {{- end }} diff --git a/swift/templates/job-ks-user.yaml b/swift/templates/job-ks-user.yaml index bd382edb31..c126d754c3 100644 --- a/swift/templates/job-ks-user.yaml +++ b/swift/templates/job-ks-user.yaml @@ -9,8 +9,6 @@ helm.sh/hook-weight: "-1" {{- if .Values.manifests.job_ks_user }} {{- $ksUserJob := dict "envAll" . "serviceName" "swift" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) }} -{{- end }} {{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }} {{- end }} diff --git a/swift/values.yaml b/swift/values.yaml index ccfa9b29f5..35b7f35600 100644 --- a/swift/values.yaml +++ b/swift/values.yaml @@ -13,9 +13,6 @@ --- release_group: null -# Helm3 hook for job ordering -helm3_hook: true - labels: api: node_selector_key: openstack-control-plane diff --git a/tacker/templates/job-db-init.yaml b/tacker/templates/job-db-init.yaml index bbf4d7d622..62da9a2718 100644 --- a/tacker/templates/job-db-init.yaml +++ b/tacker/templates/job-db-init.yaml @@ -26,11 +26,9 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.tacker.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} {{ $dbInitJob | include "helm-toolkit.manifests.job_db_init_mysql" }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/tacker/templates/job-db-sync.yaml b/tacker/templates/job-db-sync.yaml index 95f1377a86..6e387db683 100644 --- a/tacker/templates/job-db-sync.yaml +++ b/tacker/templates/job-db-sync.yaml @@ -23,9 +23,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.tacker.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/tacker/templates/job-ks-endpoints.yaml b/tacker/templates/job-ks-endpoints.yaml index 282068c490..85b25eb025 100644 --- a/tacker/templates/job-ks-endpoints.yaml +++ b/tacker/templates/job-ks-endpoints.yaml @@ -21,9 +21,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.nfv_orchestration.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.tacker.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/tacker/templates/job-ks-service.yaml b/tacker/templates/job-ks-service.yaml index 1fdf0da0a7..329fd23e93 100644 --- a/tacker/templates/job-ks-service.yaml +++ b/tacker/templates/job-ks-service.yaml @@ -21,9 +21,7 @@ helm.sh/hook-weight: "-3" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.nfv_orchestration.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.tacker.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/tacker/templates/job-ks-user.yaml b/tacker/templates/job-ks-user.yaml index 1cf42fd915..0eddf72970 100644 --- a/tacker/templates/job-ks-user.yaml +++ b/tacker/templates/job-ks-user.yaml @@ -21,9 +21,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.nfv_orchestration.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.tacker.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/tacker/templates/job-rabbit-init.yaml b/tacker/templates/job-rabbit-init.yaml index 8c1a64b94e..6f748f2d6f 100644 --- a/tacker/templates/job-rabbit-init.yaml +++ b/tacker/templates/job-rabbit-init.yaml @@ -21,9 +21,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $rmqUserJob "tlsSecret" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rmqUserJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.tacker.enabled -}} {{- $_ := set $rmqUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/tacker/values.yaml b/tacker/values.yaml index d48a85664d..8be4a9aa85 100644 --- a/tacker/values.yaml +++ b/tacker/values.yaml @@ -29,10 +29,6 @@ labels: node_selector_key: openstack-control-plane node_selector_value: enabled -# NOTE(philsphicas): the pre-install hook breaks upgrade for helm2 -# Set to false to upgrade using helm2 -helm3_hook: true - images: pull_policy: IfNotPresent tags: diff --git a/tempest/templates/job-ks-user.yaml b/tempest/templates/job-ks-user.yaml index 4537d5a536..41132e957c 100644 --- a/tempest/templates/job-ks-user.yaml +++ b/tempest/templates/job-ks-user.yaml @@ -20,9 +20,7 @@ helm.sh/hook-weight: "-1" {{- if .Values.manifests.job_ks_user }} {{- $ksUserJob := dict "envAll" . "serviceName" "tempest" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} -{{- end }} {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.identity.api.internal -}} {{- end -}} diff --git a/tempest/values.yaml b/tempest/values.yaml index 6aab9d35b0..547b4779e3 100644 --- a/tempest/values.yaml +++ b/tempest/values.yaml @@ -93,8 +93,6 @@ dependencies: - endpoint: internal service: local_image_registry -helm3_hook: true - conf: script: | tempest run --config-file /etc/tempest/tempest.conf -w 4 --smoke diff --git a/trove/templates/job-db-init.yaml b/trove/templates/job-db-init.yaml index 02634b2b26..94d6f6e3a0 100644 --- a/trove/templates/job-db-init.yaml +++ b/trove/templates/job-db-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.trove.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/trove/templates/job-db-sync.yaml b/trove/templates/job-db-sync.yaml index 7a23f7fb56..a92866eafe 100644 --- a/trove/templates/job-db-sync.yaml +++ b/trove/templates/job-db-sync.yaml @@ -19,9 +19,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.job_db_sync }} {{- $dbSyncJob := dict "envAll" . "serviceName" "trove" "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.trove.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/trove/templates/job-ks-endpoints.yaml b/trove/templates/job-ks-endpoints.yaml index bf4e23fc9f..9e879c03cb 100644 --- a/trove/templates/job-ks-endpoints.yaml +++ b/trove/templates/job-ks-endpoints.yaml @@ -19,9 +19,7 @@ helm.sh/hook-weight: "-1" {{- if .Values.manifests.job_ks_endpoints }} {{- $ksEndpointsJob := dict "envAll" . "serviceName" "trove" "serviceTypes" ( tuple "database" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksEndpointsJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.trove.enabled -}} {{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/trove/templates/job-ks-service.yaml b/trove/templates/job-ks-service.yaml index de1f14384d..113e2bf5d0 100644 --- a/trove/templates/job-ks-service.yaml +++ b/trove/templates/job-ks-service.yaml @@ -19,9 +19,7 @@ helm.sh/hook-weight: "-2" {{- if .Values.manifests.job_ks_service }} {{- $ksServiceJob := dict "envAll" . "serviceName" "trove" "serviceTypes" ( tuple "database" ) -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.trove.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/trove/templates/job-ks-user.yaml b/trove/templates/job-ks-user.yaml index 2a84ba7668..ca9a42d363 100644 --- a/trove/templates/job-ks-user.yaml +++ b/trove/templates/job-ks-user.yaml @@ -19,9 +19,7 @@ helm.sh/hook-weight: "-3" {{- if .Values.manifests.job_ks_user }} {{- $ksUserJob := dict "envAll" . "serviceName" "trove" -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.trove.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/trove/templates/job-rabbit-init.yaml b/trove/templates/job-rabbit-init.yaml index 54cf661b55..5fd71e70bb 100644 --- a/trove/templates/job-rabbit-init.yaml +++ b/trove/templates/job-rabbit-init.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $rabbitInitJob "tlsSecret" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $rabbitInitJob "jobAnnotations" (include "metadata.annotations.job.rabbit_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.trove.enabled -}} {{- $_ := set $rabbitInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/trove/values.yaml b/trove/values.yaml index 280740b34a..75e9b8bb99 100644 --- a/trove/values.yaml +++ b/trove/values.yaml @@ -847,6 +847,4 @@ manifests: secret_registry: true service_api: true service_ingress_api: true - -helm3_hook: true ... diff --git a/zaqar/templates/job-db-init.yaml b/zaqar/templates/job-db-init.yaml index 6d261ec7da..c77c0b4ebd 100644 --- a/zaqar/templates/job-db-init.yaml +++ b/zaqar/templates/job-db-init.yaml @@ -23,9 +23,7 @@ helm.sh/hook-weight: "-5" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbInitJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbInitJob "jobAnnotations" (include "metadata.annotations.job.db_init" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.zaqar.enabled -}} {{- $_ := set $dbInitJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/zaqar/templates/job-db-sync.yaml b/zaqar/templates/job-db-sync.yaml index 90d67199a4..33dd4d4766 100644 --- a/zaqar/templates/job-db-sync.yaml +++ b/zaqar/templates/job-db-sync.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-4" {{- if .Values.manifests.certificates -}} {{- $_ := set $dbSyncJob "dbAdminTlsSecret" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $dbSyncJob "jobAnnotations" (include "metadata.annotations.job.db_sync" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.zaqar.enabled -}} {{- $_ := set $dbSyncJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/zaqar/templates/job-ks-endpoints.yaml b/zaqar/templates/job-ks-endpoints.yaml index 487f9c7df0..84dee3668c 100644 --- a/zaqar/templates/job-ks-endpoints.yaml +++ b/zaqar/templates/job-ks-endpoints.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-2" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksEndpointsJob "tlsSecret" .Values.secrets.tls.messaging.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksEndpointsJob "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.zaqar.enabled -}} {{- $_ := set $ksEndpointsJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/zaqar/templates/job-ks-service.yaml b/zaqar/templates/job-ks-service.yaml index 4b338c35a3..9ab5bab537 100644 --- a/zaqar/templates/job-ks-service.yaml +++ b/zaqar/templates/job-ks-service.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-3" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksServiceJob "tlsSecret" .Values.secrets.tls.messaging.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksServiceJob "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) }} -{{- end }} {{- if .Values.pod.tolerations.zaqar.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end }} diff --git a/zaqar/templates/job-ks-user.yaml b/zaqar/templates/job-ks-user.yaml index 40360b48f7..adad908734 100644 --- a/zaqar/templates/job-ks-user.yaml +++ b/zaqar/templates/job-ks-user.yaml @@ -22,9 +22,7 @@ helm.sh/hook-weight: "-1" {{- if or .Values.manifests.certificates .Values.tls.identity -}} {{- $_ := set $ksUserJob "tlsSecret" .Values.secrets.tls.messaging.api.internal -}} {{- end -}} -{{- if .Values.helm3_hook }} {{- $_ := set $ksUserJob "jobAnnotations" (include "metadata.annotations.job.ks_user" . | fromYaml) -}} -{{- end }} {{- if .Values.pod.tolerations.zaqar.enabled -}} {{- $_ := set $ksUserJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/zaqar/values.yaml b/zaqar/values.yaml index 4de6ab9865..fba257dd33 100644 --- a/zaqar/values.yaml +++ b/zaqar/values.yaml @@ -632,10 +632,6 @@ bootstrap: # create a test queue in Zaqar openstack queue create test-queue || echo "Queue already exists" -# NOTE(helm_hook): helm_hook might break for helm2 binary. -# set helm3_hook: false when using the helm2 binary. -helm3_hook: true - manifests: certificates: false configmap_bin: true