Remove component adoption labels before initial CSV copy.

Operator component labels were not being stripped before initially
creating a CSV copy (they were only being stripped on subsequent
updates to copies).

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

Author: benluddy

pkg/controller/operators/olm/operatorgroup.go

@@ -755,6 +755,12 @@ func (a *Operator) copyToNamespace(csv *v1alpha1.ClusterServiceVersion, namespac
 		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)
+			}
+		}
 
 		logger.Debug("copying CSV to target")
 		createdCSV, err := a.client.OperatorsV1alpha1().ClusterServiceVersions(namespace).Create(context.TODO(), newCSV, metav1.CreateOptions{})

pkg/controller/operators/olm/operatorgroup_test.go

@@ -1,11 +1,10 @@
 package olm
 
 import (
-	"io/ioutil"
 	"testing"
 	"time"
 
-	"github.com/sirupsen/logrus"
+	"github.com/sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/require"
 
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -126,12 +125,12 @@ func TestCopyToNamespace(t *testing.T) {
 			Namespace: "bar",
 			Original: &v1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
-					Name: "name",
+					Name:      "name",
 					Namespace: "foo",
 					Labels: map[string]string{
 						"operators.coreos.com/foo": "",
 						"operators.coreos.com/bar": "",
-						"untouched": "fine",
+						"untouched":                "fine",
 					},
 				},
 			},
@@ -142,25 +141,25 @@ func TestCopyToNamespace(t *testing.T) {
 					Labels: map[string]string{
 						"operators.coreos.com/foo": "",
 						"operators.coreos.com/bar": "",
-						"untouched": "fine",
+						"untouched":                "fine",
 					},
 				},
 				Status: v1alpha1.ClusterServiceVersionStatus{
-					Message:        "The operator is running in foo but is managing this namespace",
-					Reason:         v1alpha1.CSVReasonCopied},
+					Message: "The operator is running in foo but is managing this namespace",
+					Reason:  v1alpha1.CSVReasonCopied},
 			},
 			ExpectedResult: &v1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "name",
 					Namespace: "bar",
 					Labels: map[string]string{
-						"untouched": "fine",
+						"untouched":      "fine",
 						"olm.copiedFrom": "foo",
 					},
 				},
 				Status: v1alpha1.ClusterServiceVersionStatus{
-					Message:        "The operator is running in foo but is managing this namespace",
-					Reason:         v1alpha1.CSVReasonCopied,
+					Message: "The operator is running in foo but is managing this namespace",
+					Reason:  v1alpha1.CSVReasonCopied,
 				},
 			},
 			ExpectedActions: []ktesting.Action{
@@ -169,7 +168,63 @@ func TestCopyToNamespace(t *testing.T) {
 						Name:      "name",
 						Namespace: "bar",
 						Labels: map[string]string{
-							"untouched": "fine",
+							"untouched":      "fine",
+							"olm.copiedFrom": "foo",
+						},
+					},
+					Status: v1alpha1.ClusterServiceVersionStatus{
+						Message: "The operator is running in foo but is managing this namespace",
+						Reason:  v1alpha1.CSVReasonCopied,
+					},
+				}),
+			},
+		},
+				{
+			Name:      "component labels are stripped before initial copy",
+			Namespace: "bar",
+			Original: &v1alpha1.ClusterServiceVersion{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "name",
+					Namespace: "foo",
+					Labels: map[string]string{
+						"operators.coreos.com/foo": "",
+						"operators.coreos.com/bar": "",
+						"untouched":                "fine",
+					},
+				},
+			},
+			ExistingCopy: nil,
+			ExpectedResult: &v1alpha1.ClusterServiceVersion{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "name",
+					Namespace: "bar",
+					Labels: map[string]string{
+						"untouched":      "fine",
+						"olm.copiedFrom": "foo",
+					},
+				},
+				Status: v1alpha1.ClusterServiceVersionStatus{
+					Message: "The operator is running in foo but is managing this namespace",
+					Reason:  v1alpha1.CSVReasonCopied,
+				},
+			},
+			ExpectedActions: []ktesting.Action{
+				ktesting.NewCreateAction(gvr, "bar", &v1alpha1.ClusterServiceVersion{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "name",
+						Namespace: "bar",
+						Labels: map[string]string{
+							"untouched":      "fine",
+							"olm.copiedFrom": "foo",
+						},
+					},
+				}),
+				ktesting.NewUpdateSubresourceAction(gvr, "status", "bar", &v1alpha1.ClusterServiceVersion{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "name",
+						Namespace: "bar",
+						Labels: map[string]string{
+							"untouched":      "fine",
 							"olm.copiedFrom": "foo",
 						},
 					},
@@ -190,10 +245,11 @@ func TestCopyToNamespace(t *testing.T) {
 			if tc.ExistingCopy != nil {
 				client = fake.NewSimpleClientset(tc.ExistingCopy)
 				v1alpha1lister.ClusterServiceVersionListerReturns(FakeClusterServiceVersionLister{tc.ExistingCopy})
+			} else {
+				v1alpha1lister.ClusterServiceVersionListerReturns(FakeClusterServiceVersionLister(nil))
 			}
 
-			logger := logrus.New()
-			logger.SetOutput(ioutil.Discard)
+			logger, _ := test.NewNullLogger()
 
 			o := &Operator{
 				lister: lister,