Remove component adoption labels before initial CSV copy.

Signed-off-by: Ben Luddy <[email protected]>

Author: benluddy

pkg/controller/operators/olm/operatorgroup.go

@@ -705,79 +705,63 @@ func (a *Operator) copyToNamespace(csv *v1alpha1.ClusterServiceVersion, namespac
 	}
 
 	logger := a.logger.WithField("operator-ns", csv.GetNamespace()).WithField("target-ns", namespace)
+
 	newCSV := csv.DeepCopy()
+	newCSV.SetNamespace(namespace)
+	newCSV.SetResourceVersion("")
+	newCSV.SetLabels(utillabels.AddLabel(newCSV.GetLabels(), v1alpha1.CopiedLabelKey, csv.GetNamespace()))
+	// remove Operator object component labels before copying so that copied CSVs do not show up in the component list
+	for k := range newCSV.GetLabels() {
+		if strings.HasPrefix(k, decorators.ComponentLabelKeyPrefix) {
+			delete(newCSV.Labels, k)
+		}
+	}
 	delete(newCSV.Annotations, v1.OperatorGroupTargetsAnnotationKey)
 
-	fetchedCSV, err := a.lister.OperatorsV1alpha1().ClusterServiceVersionLister().ClusterServiceVersions(namespace).Get(newCSV.GetName())
-	logger = logger.WithField("csv", csv.GetName())
-	if fetchedCSV != nil {
-		logger.Debug("checking annotations")
-
-		if !reflect.DeepEqual(a.copyOperatorGroupAnnotations(&fetchedCSV.ObjectMeta), a.copyOperatorGroupAnnotations(&newCSV.ObjectMeta)) ||
-			len(decorators.OperatorNames(fetchedCSV.GetLabels())) > 0 {
+	logger.Debug("copying CSV to target")
+	copiedCSV, err := a.client.OperatorsV1alpha1().ClusterServiceVersions(namespace).Create(context.TODO(), newCSV, metav1.CreateOptions{})
+	if k8serrors.IsAlreadyExists(err) {
+		copiedCSV, err = a.lister.OperatorsV1alpha1().ClusterServiceVersionLister().ClusterServiceVersions(namespace).Get(newCSV.GetName())
+		if !reflect.DeepEqual(a.copyOperatorGroupAnnotations(&copiedCSV.ObjectMeta), a.copyOperatorGroupAnnotations(&newCSV.ObjectMeta)) ||
+			len(decorators.OperatorNames(copiedCSV.GetLabels())) > 0 {
 			// TODO: only copy over the opgroup annotations, not _all_ annotations
-			fetchedCSV.Annotations = newCSV.Annotations
-			fetchedCSV.SetLabels(utillabels.AddLabel(fetchedCSV.GetLabels(), v1alpha1.CopiedLabelKey, csv.GetNamespace()))
+			copiedCSV.Annotations = newCSV.Annotations
+			copiedCSV.SetLabels(utillabels.AddLabel(copiedCSV.GetLabels(), v1alpha1.CopiedLabelKey, csv.GetNamespace()))
 
 			// remove Operator object component labels before copying so that copied CSVs do not show up in the component list
-			for k := range fetchedCSV.GetLabels() {
+			for k := range copiedCSV.GetLabels() {
 				if strings.HasPrefix(k, decorators.ComponentLabelKeyPrefix) {
-					delete(fetchedCSV.Labels, k)
+					delete(copiedCSV.Labels, k)
 				}
 			}
 
 			// CRs don't support strategic merge patching, but in the future if they do this should be updated to patch
-			logger.Debug("updating target CSV")
-			if fetchedCSV, err = a.client.OperatorsV1alpha1().ClusterServiceVersions(namespace).Update(context.TODO(), fetchedCSV, metav1.UpdateOptions{}); err != nil {
+			logger.Debug("updating existing target CSV")
+			if copiedCSV, err = a.client.OperatorsV1alpha1().ClusterServiceVersions(namespace).Update(context.TODO(), copiedCSV, metav1.UpdateOptions{}); err != nil {
 				logger.WithError(err).Error("update target CSV failed")
 				return nil, err
 			}
 		}
+	} else if err != nil {
+		a.logger.Errorf("Create for new CSV failed: %v", err)
+		return nil, err
+	}
 
-		logger.Debug("checking status")
-		newCSV.Status = csv.Status
-		newCSV.Status.Reason = v1alpha1.CSVReasonCopied
-		newCSV.Status.Message = fmt.Sprintf("The operator is running in %s but is managing this namespace", csv.GetNamespace())
-
-		if !reflect.DeepEqual(fetchedCSV.Status, newCSV.Status) {
-			logger.Debug("updating status")
-			// Must use fetchedCSV because UpdateStatus(...) checks resource UID.
-			fetchedCSV.Status = newCSV.Status
-			if fetchedCSV, err = a.client.OperatorsV1alpha1().ClusterServiceVersions(namespace).UpdateStatus(context.TODO(), fetchedCSV, metav1.UpdateOptions{}); err != nil {
-				logger.WithError(err).Error("status update for target CSV failed")
-				return nil, err
-			}
-		}
-
-		return fetchedCSV, nil
-
-	} else if k8serrors.IsNotFound(err) {
-		newCSV.SetNamespace(namespace)
-		newCSV.SetResourceVersion("")
-		newCSV.SetLabels(utillabels.AddLabel(newCSV.GetLabels(), v1alpha1.CopiedLabelKey, csv.GetNamespace()))
+	logger.Debug("checking status")
+	newCSV.Status = csv.Status
+	newCSV.Status.Reason = v1alpha1.CSVReasonCopied
+	newCSV.Status.Message = fmt.Sprintf("The operator is running in %s but is managing this namespace", csv.GetNamespace())
 
-		logger.Debug("copying CSV to target")
-		createdCSV, err := a.client.OperatorsV1alpha1().ClusterServiceVersions(namespace).Create(context.TODO(), newCSV, metav1.CreateOptions{})
-		if err != nil {
-			a.logger.Errorf("Create for new CSV failed: %v", err)
-			return nil, err
-		}
-		createdCSV.Status.Reason = v1alpha1.CSVReasonCopied
-		createdCSV.Status.Message = fmt.Sprintf("The operator is running in %s but is managing this namespace", csv.GetNamespace())
-		if _, err := a.client.OperatorsV1alpha1().ClusterServiceVersions(namespace).UpdateStatus(context.TODO(), createdCSV, metav1.UpdateOptions{}); err != nil {
-			a.logger.Errorf("Status update for CSV failed: %v", err)
+	if !reflect.DeepEqual(copiedCSV.Status, newCSV.Status) {
+		logger.Debug("updating status")
+		// Must use fetchedCSV because UpdateStatus(...) checks resource UID.
+		copiedCSV.Status = newCSV.Status
+		if copiedCSV, err = a.client.OperatorsV1alpha1().ClusterServiceVersions(namespace).UpdateStatus(context.TODO(), copiedCSV, metav1.UpdateOptions{}); err != nil {
+			logger.WithError(err).Error("status update for target CSV failed")
 			return nil, err
 		}
-
-		return createdCSV, nil
-
-	} else if err != nil {
-		logger.WithError(err).Error("couldn't get CSV")
-		return nil, err
 	}
-
-	// this return shouldn't be hit
-	return nil, fmt.Errorf("unhandled code path")
+	return copiedCSV, nil
 }
 
 func (a *Operator) pruneFromNamespace(operatorGroupName, namespace string) error {