From ee94e07c52afca3a1899b2c01d0de1e69e78aed2 Mon Sep 17 00:00:00 2001 From: t3mi Date: Thu, 22 Aug 2024 17:14:11 +0000 Subject: [PATCH] feat(helm): allow upgrade checker to be disabled Signed-off-by: t3mi --- .../pre-release-hook/batch_v1_job_pre-upgrade-checker.yaml | 2 ++ ...sterrole_azureserviceoperator-pre-upgrade-checker-role.yaml | 2 ++ ...g_azureserviceoperator-pre-upgrade-checker-rolebinding.yaml | 2 ++ ...erviceaccount_azureserviceoperator-pre-upgrade-checker.yaml | 2 ++ v2/charts/azure-service-operator/values.yaml | 3 +++ 5 files changed, 11 insertions(+) diff --git a/v2/charts/azure-service-operator/templates/pre-release-hook/batch_v1_job_pre-upgrade-checker.yaml b/v2/charts/azure-service-operator/templates/pre-release-hook/batch_v1_job_pre-upgrade-checker.yaml index 13104ecbd9b..47af50e141f 100644 --- a/v2/charts/azure-service-operator/templates/pre-release-hook/batch_v1_job_pre-upgrade-checker.yaml +++ b/v2/charts/azure-service-operator/templates/pre-release-hook/batch_v1_job_pre-upgrade-checker.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.disablePreUpgradeCheck }} apiVersion: batch/v1 kind: Job metadata: @@ -25,3 +26,4 @@ spec: requests: cpu: 200m memory: 256Mi +{{- end }} diff --git a/v2/charts/azure-service-operator/templates/pre-release-hook/rbac.authorization.k8s.io_v1_clusterrole_azureserviceoperator-pre-upgrade-checker-role.yaml b/v2/charts/azure-service-operator/templates/pre-release-hook/rbac.authorization.k8s.io_v1_clusterrole_azureserviceoperator-pre-upgrade-checker-role.yaml index 476a6cae529..bce8a88191b 100644 --- a/v2/charts/azure-service-operator/templates/pre-release-hook/rbac.authorization.k8s.io_v1_clusterrole_azureserviceoperator-pre-upgrade-checker-role.yaml +++ b/v2/charts/azure-service-operator/templates/pre-release-hook/rbac.authorization.k8s.io_v1_clusterrole_azureserviceoperator-pre-upgrade-checker-role.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.disablePreUpgradeCheck }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -18,3 +19,4 @@ rules: - patch - update - watch +{{- end }} diff --git a/v2/charts/azure-service-operator/templates/pre-release-hook/rbac.authorization.k8s.io_v1_clusterrolebinding_azureserviceoperator-pre-upgrade-checker-rolebinding.yaml b/v2/charts/azure-service-operator/templates/pre-release-hook/rbac.authorization.k8s.io_v1_clusterrolebinding_azureserviceoperator-pre-upgrade-checker-rolebinding.yaml index 213853d49bd..159088d2e09 100644 --- a/v2/charts/azure-service-operator/templates/pre-release-hook/rbac.authorization.k8s.io_v1_clusterrolebinding_azureserviceoperator-pre-upgrade-checker-rolebinding.yaml +++ b/v2/charts/azure-service-operator/templates/pre-release-hook/rbac.authorization.k8s.io_v1_clusterrolebinding_azureserviceoperator-pre-upgrade-checker-rolebinding.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.disablePreUpgradeCheck }} apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: @@ -14,3 +15,4 @@ subjects: - kind: ServiceAccount name: azureserviceoperator-pre-upgrade-checker namespace: {{ .Release.Namespace }} +{{- end }} diff --git a/v2/charts/azure-service-operator/templates/pre-release-hook/v1_serviceaccount_azureserviceoperator-pre-upgrade-checker.yaml b/v2/charts/azure-service-operator/templates/pre-release-hook/v1_serviceaccount_azureserviceoperator-pre-upgrade-checker.yaml index 4b7d75eca63..753cde18415 100644 --- a/v2/charts/azure-service-operator/templates/pre-release-hook/v1_serviceaccount_azureserviceoperator-pre-upgrade-checker.yaml +++ b/v2/charts/azure-service-operator/templates/pre-release-hook/v1_serviceaccount_azureserviceoperator-pre-upgrade-checker.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.disablePreUpgradeCheck }} apiVersion: v1 kind: ServiceAccount metadata: @@ -7,3 +8,4 @@ metadata: "helm.sh/hook": pre-upgrade "helm.sh/hook-weight": "-1" "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded +{{- end }} diff --git a/v2/charts/azure-service-operator/values.yaml b/v2/charts/azure-service-operator/values.yaml index 92c862b32ed..acba18ff6d8 100644 --- a/v2/charts/azure-service-operator/values.yaml +++ b/v2/charts/azure-service-operator/values.yaml @@ -71,6 +71,9 @@ azureTargetNamespaces: [] # watchers, webhooks or both. azureOperatorMode: "" +# Opt-out for upgrade block +disablePreUpgradeCheck: false + webhook: # webhook.port determines the port the webhook endpoint binds to. port: 9443