disown copied csvs

remove the label from any copied csv if it has been previously adopted

Signed-off-by: Evan Cordell <[email protected]>

Author: ecordell

pkg/controller/operators/adoption_controller.go

@@ -187,6 +187,12 @@ func (r *AdoptionReconciler) ReconcileClusterServiceVersion(ctx context.Context,
 		return reconcile.Result{}, err
 	}
 
+	// disown copied csvs - a previous release inadvertently adopted them, this cleans any up if they are adopted
+	if in.IsCopied() {
+		err := r.disownFromAll(ctx, in)
+		return reconcile.Result{}, err
+	}
+
 	// Adopt all resources owned by the CSV if necessary
 	return reconcile.Result{}, r.adoptComponents(ctx, in)
 }
@@ -315,6 +321,31 @@ func (r *AdoptionReconciler) disown(ctx context.Context, operator *decorators.Op
 	return r.Patch(ctx, uCObj, client.MergeFrom(cObj))
 }
 
+func (r *AdoptionReconciler) disownFromAll(ctx context.Context, component runtime.Object) error {
+	cObj, ok := component.(client.Object)
+	if !ok {
+		return fmt.Errorf("Unable to typecast runtime.Object to client.Object")
+	}
+	var operators []decorators.Operator
+	for _, name := range decorators.OperatorNames(cObj.GetLabels()) {
+		o := &operatorsv1.Operator{}
+		o.SetName(name.Name)
+		operator, err := r.factory.NewOperator(o)
+		if err != nil {
+			return err
+		}
+		operators = append(operators, *operator)
+	}
+	errs := make([]error,0)
+	for _, operator := range operators {
+		if err := r.disown(ctx, &operator, component); err != nil {
+			errs = append(errs, err)
+		}
+	}
+
+	return utilerrors.NewAggregate(errs)
+}
+
 func (r *AdoptionReconciler) adoptees(ctx context.Context, operator decorators.Operator, csv *operatorsv1alpha1.ClusterServiceVersion) ([]runtime.Object, error) {
 	// Note: We need to figure out how to dynamically add new list types here (or some equivalent) in
 	// order to support operators composed of custom resources.