controllers/finalizers: respect the enabled status of PDB (#1109)

Signed-off-by: Furkan <[email protected]>
VictoriaMetrics · Sep 19, 2024 · 4e6d5cc · 4e6d5cc
1 parent aea068e
commit 4e6d5cc
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 14 deletions.
diff --git a/internal/controller/operator/factory/finalize/vmagent.go b/internal/controller/operator/factory/finalize/vmagent.go
@@ -56,8 +56,10 @@ func OnVMAgentDelete(ctx context.Context, rclient client.Client, crd *vmv1beta1.
 	}
 
 	// check PDB
-	if err := finalizePBD(ctx, rclient, crd); err != nil {
-		return err
+	if crd.Spec.PodDisruptionBudget != nil {
+		if err := finalizePBD(ctx, rclient, crd); err != nil {
+			return err
+		}
 	}
 	// remove vmagents service discovery rbac.
 	if config.IsClusterWideAccessAllowed() {

diff --git a/internal/controller/operator/factory/finalize/vmalert.go b/internal/controller/operator/factory/finalize/vmalert.go
@@ -38,8 +38,10 @@ func OnVMAlertDelete(ctx context.Context, rclient client.Client, crd *vmv1beta1.
 	}
 
 	// check PDB
-	if err := finalizePBD(ctx, rclient, crd); err != nil {
-		return err
+	if crd.Spec.PodDisruptionBudget != nil {
+		if err := finalizePBD(ctx, rclient, crd); err != nil {
+			return err
+		}
 	}
 	if err := deleteSA(ctx, rclient, crd); err != nil {
 		return err

diff --git a/internal/controller/operator/factory/finalize/vmalertmanager.go b/internal/controller/operator/factory/finalize/vmalertmanager.go
@@ -37,8 +37,10 @@ func OnVMAlertManagerDelete(ctx context.Context, rclient client.Client, crd *vmv
 	}
 
 	// check PDB
-	if err := finalizePBD(ctx, rclient, crd); err != nil {
-		return err
+	if crd.Spec.PodDisruptionBudget != nil {
+		if err := finalizePBD(ctx, rclient, crd); err != nil {
+			return err
+		}
 	}
 
 	if err := deleteSA(ctx, rclient, crd); err != nil {

diff --git a/internal/controller/operator/factory/finalize/vmauth.go b/internal/controller/operator/factory/finalize/vmauth.go
@@ -51,8 +51,10 @@ func OnVMAuthDelete(ctx context.Context, rclient client.Client, crd *vmv1beta1.V
 	}
 
 	// check PDB
-	if err := finalizePBD(ctx, rclient, crd); err != nil {
-		return err
+	if crd.Spec.PodDisruptionBudget != nil {
+		if err := finalizePBD(ctx, rclient, crd); err != nil {
+			return err
+		}
 	}
 
 	// check ingress

diff --git a/internal/controller/operator/factory/finalize/vmcluster.go b/internal/controller/operator/factory/finalize/vmcluster.go
@@ -57,8 +57,10 @@ func OnVMClusterDelete(ctx context.Context, rclient client.Client, crd *vmv1beta
 		}
 
 		// check PDB
-		if err := finalizePBDWithName(ctx, rclient, obj.GetNameWithPrefix(crd.Name), crd.Namespace); err != nil {
-			return err
+		if crd.Spec.VMInsert.PodDisruptionBudget != nil {
+			if err := finalizePBDWithName(ctx, rclient, obj.GetNameWithPrefix(crd.Name), crd.Namespace); err != nil {
+				return err
+			}
 		}
 	}
 
@@ -84,8 +86,10 @@ func OnVMClusterDelete(ctx context.Context, rclient client.Client, crd *vmv1beta
 		}
 
 		// check PDB
-		if err := finalizePBDWithName(ctx, rclient, obj.GetNameWithPrefix(crd.Name), crd.Namespace); err != nil {
-			return err
+		if crd.Spec.VMSelect.PodDisruptionBudget != nil {
+			if err := finalizePBDWithName(ctx, rclient, obj.GetNameWithPrefix(crd.Name), crd.Namespace); err != nil {
+				return err
+			}
 		}
 	}
 	if crd.Spec.VMStorage != nil {
@@ -104,8 +108,10 @@ func OnVMClusterDelete(ctx context.Context, rclient client.Client, crd *vmv1beta
 		}
 
 		// check PDB
-		if err := finalizePBDWithName(ctx, rclient, obj.GetNameWithPrefix(crd.Name), crd.Namespace); err != nil {
-			return err
+		if crd.Spec.VMStorage.PodDisruptionBudget != nil {
+			if err := finalizePBDWithName(ctx, rclient, obj.GetNameWithPrefix(crd.Name), crd.Namespace); err != nil {
+				return err
+			}
 		}
 	}