subscription owned by operator

Author: dminnear-rh

internal/controller/pattern_controller.go

@@ -162,11 +162,19 @@ func (r *PatternReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 
 	// -- GitOps Subscription
 	targetSub, _ := newSubscriptionFromConfigMap(r.fullClient)
+	if operatorConfigMap, err := GetOperatorConfigmap(); err == nil {
+		if err := controllerutil.SetOwnerReference(operatorConfigMap, targetSub, r.Scheme); err != nil {
+			return r.actionPerformed(qualifiedInstance, "error setting owner of gitops subscription", err)
+		}
+	} else {
+		return r.actionPerformed(qualifiedInstance, "error getting operator configmap", err)
+	}
+
 	sub, _ := getSubscription(r.olmClient, targetSub.Name)
 	if sub == nil {
 		err = createSubscription(r.olmClient, targetSub)
 		return r.actionPerformed(qualifiedInstance, "create gitops subscription", err)
-	} else if owner, ok := sub.Labels["app.kubernetes.io/managed-by"]; ok && owner == "patterns-operator" {
+	} else if ownedBySame(targetSub, sub) {
 		// Check version/channel etc
 		// Dangerous if multiple patterns do not agree, or automatic upgrades are in place...
 		changed, errSub := updateSubscription(r.olmClient, targetSub, sub)

internal/controller/subscription.go

@@ -73,7 +73,6 @@ func newSubscriptionFromConfigMap(r kubernetes.Interface) (*operatorv1alpha1.Sub
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      GitOpsDefaultPackageName,
 			Namespace: SubscriptionNamespace,
-			Labels:    map[string]string{"app.kubernetes.io/managed-by": "patterns-operator"},
 		},
 		Spec: spec,
 	}

internal/controller/utils.go

@@ -40,6 +40,7 @@ import (
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
+	ctrl "sigs.k8s.io/controller-runtime"
 
 	configv1 "github.com/openshift/api/config/v1"
 )
@@ -404,3 +405,17 @@ func IsCommonSlimmed(patternPath string) bool {
 	}
 	return true
 }
+
+// Gets the configmap for the Patterns Operator. (Used as an owner reference for the operator itself.)
+func GetOperatorConfigmap() (*corev1.ConfigMap, error) {
+	config, err := ctrl.GetConfig()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get config: %s", err)
+	}
+	clientset, err := kubernetes.NewForConfig(config)
+	if err != nil {
+		return nil, fmt.Errorf("failed to call NewForConfig: %s", err)
+	}
+
+	return clientset.CoreV1().ConfigMaps(OperatorNamespace).Get(context.Background(), OperatorConfigMap, metav1.GetOptions{})
+}