Handle k8s resource conflict due to same CR names (#201)

* Check for pre-existed deployments and statefulsets not created by the controller

* Code review comments

* Code review updates

* Update error message text

* Code review updates

* Update OperatorGroup namespace

* Code review updates

* Code review updates

---------

Co-authored-by: Scott McClements <[email protected]>

Author: smcclem

controllers/webspherelibertyapplication_controller.go

@@ -140,6 +140,21 @@ func (r *ReconcileWebSphereLiberty) Reconcile(ctx context.Context, request ctrl.
 		// Error reading the object - requeue the request.
 		return reconcile.Result{}, err
 	}
+
+	isKnativeSupported, err := r.IsGroupVersionSupported(servingv1.SchemeGroupVersion.String(), "Service")
+	if err != nil {
+		r.ManageError(err, common.StatusConditionTypeReconciled, instance)
+	} else if !isKnativeSupported && instance.Spec.CreateKnativeService != nil && *instance.Spec.CreateKnativeService {
+		reqLogger.V(1).Info(fmt.Sprintf("%s is not supported on the cluster", servingv1.SchemeGroupVersion.String()))
+	}
+
+	// Check if there is an existing Deployment, Statefulset or Knative service by this name
+	// not managed by this operator
+	err = oputils.CheckForNameConflicts("WebSphereLibertyApplication", instance.Name, instance.Namespace, r.GetClient(), request, isKnativeSupported)
+	if err != nil {
+		return r.ManageError(err, common.StatusConditionTypeReconciled, instance)
+	}
+
 	// Check if the WebSphereLibertyApplication instance is marked to be deleted, which is
 	// indicated by the deletion timestamp being set.
 	isInstanceMarkedToBeDeleted := instance.GetDeletionTimestamp() != nil
@@ -289,13 +304,6 @@ func (r *ReconcileWebSphereLiberty) Reconcile(ctx context.Context, request ctrl.
 		}
 	}
 
-	isKnativeSupported, err := r.IsGroupVersionSupported(servingv1.SchemeGroupVersion.String(), "Service")
-	if err != nil {
-		r.ManageError(err, common.StatusConditionTypeReconciled, instance)
-	} else if !isKnativeSupported && instance.Spec.CreateKnativeService != nil && *instance.Spec.CreateKnativeService {
-		reqLogger.V(1).Info(fmt.Sprintf("%s is not supported on the cluster", servingv1.SchemeGroupVersion.String()))
-	}
-
 	if instance.Spec.CreateKnativeService != nil && *instance.Spec.CreateKnativeService {
 		// Clean up non-Knative resources
 		resources := []client.Object{

go.mod

@@ -3,7 +3,7 @@ module github.com/WASdev/websphere-liberty-operator
 go 1.19
 
 require (
-	github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20230221145444-413ec4e4e2e8
+	github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20230331211904-f635163c3ca2
 	github.com/go-logr/logr v1.2.2
 	github.com/openshift/api v0.0.0-20220414050251-a83e6f8f1d50 // Openshift 4.9
 	github.com/openshift/library-go v0.0.0-20220630204433-c71d40c7de49

go.sum

@@ -74,6 +74,8 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
 github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
 github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20230221145444-413ec4e4e2e8 h1:TQoCfE4LBHdX4+Uy8NYfXdhccjvUuOcNSoNIDW2M7NM=
 github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20230221145444-413ec4e4e2e8/go.mod h1:4VWsptFxqCCiaEvAAp1ntOMTjTIUDbYHlRkeE4Aclo0=
+github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20230331211904-f635163c3ca2 h1:oJT1ea3w7dEptSPpEWWtWkO2JJbGQYHLdRMwSmw8qTE=
+github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20230331211904-f635163c3ca2/go.mod h1:4VWsptFxqCCiaEvAAp1ntOMTjTIUDbYHlRkeE4Aclo0=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=

scripts/dev.sh

@@ -207,6 +207,9 @@ kind: OperatorGroup
 metadata:
   name: websphere-operator-group
   namespace: $NAMESPACE
+spec:
+  targetNamespaces:
+    - $NAMESPACE    
 EOF
 
     oc apply -f $OG_FILE