refactor: Ensure the cleanup logic is properly executed

bytedance · Jun 3, 2024 · 8a1bd11 · 8a1bd11
1 parent 6ee1a56
commit 8a1bd11
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/internal/policy/clusterpolicy_controller.go b/internal/policy/clusterpolicy_controller.go
@@ -146,17 +146,18 @@ func (c *ClusterPolicyController) handleDeleteVarmorClusterPolicy(name string) e
 	ap, err := c.varmorInterface.ArmorProfiles(varmorconfig.Namespace).Get(context.Background(), apName, metav1.GetOptions{})
 	if err != nil {
 		if k8errors.IsNotFound(err) {
-			return nil
+			logger.Info("ArmorProfile object not found", "namespace", varmorconfig.Namespace, "name", apName)
+		} else {
+			logger.Error(err, "c.varmorInterface.ArmorProfiles().Get()")
+			return err
+		}
+	} else {
+		logger.Info("delete ArmorProfile")
+		err = c.varmorInterface.ArmorProfiles(varmorconfig.Namespace).Delete(context.Background(), apName, metav1.DeleteOptions{})
+		if err != nil {
+			logger.Error(err, "ArmorProfile().Delete()")
+			return err
 		}
-		logger.Error(err, "c.varmorInterface.ArmorProfiles().Get()")
-		return err
-	}
-
-	logger.Info("delete ArmorProfile")
-	err = c.varmorInterface.ArmorProfiles(varmorconfig.Namespace).Delete(context.Background(), apName, metav1.DeleteOptions{})
-	if err != nil {
-		logger.Error(err, "ArmorProfile().Delete()")
-		return err
 	}
 
 	if c.restartExistWorkloads && ap.Spec.UpdateExistingWorkloads {

diff --git a/internal/policy/policy_controller.go b/internal/policy/policy_controller.go
@@ -151,17 +151,18 @@ func (c *PolicyController) handleDeleteVarmorPolicy(namespace, name string) erro
 	ap, err := c.varmorInterface.ArmorProfiles(namespace).Get(context.Background(), apName, metav1.GetOptions{})
 	if err != nil {
 		if k8errors.IsNotFound(err) {
-			return nil
+			logger.Info("ArmorProfile object not found", "namespace", namespace, "name", apName)
+		} else {
+			logger.Error(err, "c.varmorInterface.ArmorProfiles().Get()")
+			return err
+		}
+	} else {
+		logger.Info("delete ArmorProfile")
+		err = c.varmorInterface.ArmorProfiles(namespace).Delete(context.Background(), apName, metav1.DeleteOptions{})
+		if err != nil {
+			logger.Error(err, "ArmorProfile().Delete()")
+			return err
 		}
-		logger.Error(err, "c.varmorInterface.ArmorProfiles().Get()")
-		return err
-	}
-
-	logger.Info("delete ArmorProfile")
-	err = c.varmorInterface.ArmorProfiles(namespace).Delete(context.Background(), apName, metav1.DeleteOptions{})
-	if err != nil {
-		logger.Error(err, "ArmorProfile().Delete()")
-		return err
 	}
 
 	if c.restartExistWorkloads && ap.Spec.UpdateExistingWorkloads {