Merge pull request #1607 from njhale/adoption

feat(operator): automatically adopt generated resources

Author: openshift-merge-robot

cmd/olm/manager.go

@@ -38,7 +38,7 @@ func Manager(ctx context.Context) (ctrl.Manager, error) {
 	if feature.Gate.Enabled(feature.OperatorLifecycleManagerV2) {
 		setupLog.Info(fmt.Sprintf("feature enabled: %v", feature.OperatorLifecycleManagerV2))
 
-		reconciler, err := operators.NewOperatorReconciler(
+		operatorReconciler, err := operators.NewOperatorReconciler(
 			mgr.GetClient(),
 			ctrl.Log.WithName("controllers").WithName("operator"),
 			mgr.GetScheme(),
@@ -65,9 +65,23 @@ func Manager(ctx context.Context) (ctrl.Manager, error) {
 		}
 		setupLog.Info("v2alpha1 CRDs installed")
 
-		if err = reconciler.SetupWithManager(mgr); err != nil {
+		if err = operatorReconciler.SetupWithManager(mgr); err != nil {
 			return nil, err
 		}
+
+		adoptionReconciler, err := operators.NewAdoptionReconciler(
+			mgr.GetClient(),
+			ctrl.Log.WithName("controllers").WithName("adoption"),
+			mgr.GetScheme(),
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		if err = adoptionReconciler.SetupWithManager(mgr); err != nil {
+			return nil, err
+		}
+
 	}
 
 	setupLog.Info("manager configured")

pkg/controller/install/certresources.go

@@ -215,21 +215,21 @@ func (i *StrategyDeploymentInstaller) installCertRequirementsForDeployment(deplo
 	}
 	service.SetName(ServiceName(deploymentName))
 	service.SetNamespace(i.owner.GetNamespace())
-	ownerutil.AddNonBlockingOwner(service, i.owner)
 
 	existingService, err := i.strategyClient.GetOpLister().CoreV1().ServiceLister().Services(i.owner.GetNamespace()).Get(service.GetName())
 	if err == nil {
 		if !ownerutil.Adoptable(i.owner, existingService.GetOwnerReferences()) {
 			return nil, fmt.Errorf("service %s not safe to replace: extraneous ownerreferences found", service.GetName())
 		}
-		service.SetOwnerReferences(append(service.GetOwnerReferences(), existingService.GetOwnerReferences()...))
+		service.SetOwnerReferences(existingService.GetOwnerReferences())
 
 		// Delete the Service to replace
 		deleteErr := i.strategyClient.GetOpClient().DeleteService(service.GetNamespace(), service.GetName(), &metav1.DeleteOptions{})
 		if err != nil && !k8serrors.IsNotFound(deleteErr) {
 			return nil, fmt.Errorf("could not delete existing service %s", service.GetName())
 		}
 	}
+	ownerutil.AddNonBlockingOwner(service, i.owner)
 
 	// Attempt to create the Service
 	_, err = i.strategyClient.GetOpClient().CreateService(service)