Improved HelmRelease delete

Mirantis · Aug 27, 2024 · 76dcb18 · 76dcb18
1 parent ee22e2b
commit 76dcb18
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/internal/controller/deployment_controller.go b/internal/controller/deployment_controller.go
@@ -319,6 +319,15 @@ func (r *DeploymentReconciler) Delete(ctx context.Context, l logr.Logger, deploy
 		}
 		return ctrl.Result{}, err
 	}
+	uninstall := hr.GetUninstall()
+	if !uninstall.DisableHooks {
+		uninstall.DisableHooks = true
+		hr.Spec.Uninstall = &uninstall
+		l.Info("Disabling hooks for HelmRelease")
+		if err := r.Client.Update(ctx, hr); err != nil {
+			return ctrl.Result{}, err
+		}
+	}
 	err = helm.DeleteHelmRelease(ctx, r.Client, deployment.Name, deployment.Namespace)
 	if err != nil {
 		return ctrl.Result{}, err

diff --git a/templates/cluster-api-provider-aws/templates/crds/awsmanagedcontrolplane.yaml b/templates/cluster-api-provider-aws/templates/crds/awsmanagedcontrolplane.yaml
@@ -353,7 +353,7 @@ spec:
                   apiServer:
                     default: false
                     description: APIServer indicates if the Kubernetes API Server log
-                      (kube-apiserver) shoulkd be enabled
+                      (kube-apiserver) should be enabled
                     type: boolean
                   audit:
                     default: false
@@ -2352,7 +2352,7 @@ spec:
                   apiServer:
                     default: false
                     description: APIServer indicates if the Kubernetes API Server log
-                      (kube-apiserver) shoulkd be enabled
+                      (kube-apiserver) should be enabled
                     type: boolean
                   audit:
                     default: false