Add logging and reduce the amount of metadata in the TransformFunc

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

pkg/controller/operators/olm/operator.go

@@ -338,8 +338,24 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat
 					Spec:       v1alpha1.ClusterServiceVersionSpec{},
 					Status:     v1alpha1.ClusterServiceVersionStatus{},
 				}
-				if csv.Annotations == nil {
-					csv.Annotations = make(map[string]string, 2)
+				// copy only the nececessary labels
+				labels := csv.Labels
+				csv.Labels = make(map[string]string, 2)
+				if l, ok := labels[v1alpha1.CopiedLabelKey]; ok {
+					csv.Labels[v1alpha1.CopiedLabelKey] = l
+				}
+				if l, ok := labels[install.OLMManagedLabelKey]; ok {
+					csv.Labels[install.OLMManagedLabelKey] = l
+				}
+
+				// copy only the nececessary annotations
+				annotations := csv.Annotations
+				csv.Annotations = make(map[string]string, 4)
+				if a, ok := annotations[operatorsv1.OperatorGroupAnnotationKey]; ok {
+					csv.Annotations[operatorsv1.OperatorGroupAnnotationKey] = a
+				}
+				if a, ok := annotations[operatorsv1.OperatorGroupNamespaceAnnotationKey]; ok {
+					csv.Annotations[operatorsv1.OperatorGroupNamespaceAnnotationKey] = a
 				}
 				// fake CSV hashes for tracking purposes only
 				csv.Annotations[copyCSVSpecHash] = specHash

pkg/controller/operators/olm/operatorgroup.go

@@ -812,6 +812,11 @@ func (a *Operator) copyToNamespace(prototype *v1alpha1.ClusterServiceVersion, ns
 		if _, err := a.client.OperatorsV1alpha1().ClusterServiceVersions(nsTo).UpdateStatus(context.TODO(), created, metav1.UpdateOptions{}); err != nil {
 			return nil, fmt.Errorf("failed to update status on new CSV: %w", err)
 		}
+		a.logger.WithFields(logrus.Fields{
+			"nsFrom": nsFrom,
+			"nsTo":   nsTo,
+			"csv":    prototype.Name,
+		}).Info("copyToNamespace: created")
 		return &v1alpha1.ClusterServiceVersion{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      created.Name,
@@ -838,6 +843,7 @@ func (a *Operator) copyToNamespace(prototype *v1alpha1.ClusterServiceVersion, ns
 		a.logger.WithFields(logrus.Fields{
 			"nsFrom": nsFrom,
 			"nsTo":   nsTo,
+			"csv":    updated.Name,
 		}).Info("copyToNamespace: updated Metadata+Spec")
 	} else {
 		// Avoid mutating cached copied CSV.
@@ -852,6 +858,7 @@ func (a *Operator) copyToNamespace(prototype *v1alpha1.ClusterServiceVersion, ns
 		a.logger.WithFields(logrus.Fields{
 			"nsFrom": nsFrom,
 			"nsTo":   nsTo,
+			"csv":    updated.Name,
 		}).Info("copyToNamespace: updated Status")
 	}
 	return &v1alpha1.ClusterServiceVersion{