Remove support for Helm 2

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é <mgagne@calavera.ca>

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) -}}

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 -}}

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) }}

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) -}}

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) -}}

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) -}}

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) -}}

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) -}}

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

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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

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:

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 }}

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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:

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

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 }}

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 -}}

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 }}

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 }}

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 }}

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 }}

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:

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:

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 -}}

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 -}}

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) -}}

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 -}}

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 }}
+{{- end }}

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 -}}

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

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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:

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 -}}

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:

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

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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:

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 -}}

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 -}}

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:

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

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 -}}

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:

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

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" }}

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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 -}}

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:

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 -}}

ironic/values.yaml

@@ -18,8 +18,6 @@
 ---
 release_group: null
 
-helm3_hook: true
-
 labels:
   api:
     node_selector_key: openstack-control-plane

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:

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 }}

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" -}}

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:

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 }}

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 }}

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

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) -}}

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 -}}

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 -}}

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) -}}

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) -}}

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) -}}

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) -}}

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) -}}

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

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

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:

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

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

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 }}

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:

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 }}