Merge pull request #140 from iamniting/scc

fix: fix ensureDeleted of openshiftSccs via returning an error
openshift · Apr 4, 2022 · b5dc6f1 · b5dc6f1
2 parents 41db655 + 0713745
commit b5dc6f1
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/controllers/scc.go b/controllers/scc.go
@@ -73,12 +73,11 @@ func (c openshiftSccs) ensureDeleted(r *LVMClusterReconciler, ctx context.Contex
 		for _, scc := range sccs {
 			err = r.SecurityClient.SecurityContextConstraints().Delete(ctx, scc.Name, metav1.DeleteOptions{})
 			if err != nil {
-				if errors.IsNotFound(err) {
-					r.Log.Info("SecurityContextConstraint is already deleted", "SecurityContextConstraint", scc.Name)
-					return nil
-				} else {
+				if !errors.IsNotFound(err) {
 					r.Log.Error(err, "failed to delete SecurityContextConstraint", "SecurityContextConstraint", scc.Name)
+					return err
 				}
+				r.Log.Info("SecurityContextConstraint is already deleted", "SecurityContextConstraint", scc.Name)
 			}
 		}
 	}