Use PackageName name as the name of subscription (IBM#1084)

* use pkg name as the name of subscription

Signed-off-by: YuChen <[email protected]>

* fix for test error

Signed-off-by: YuChen <[email protected]>

---------

Signed-off-by: YuChen <[email protected]>

Author: YCShen1010

controllers/operandrequest/operandrequest_controller.go

@@ -100,6 +100,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Re
 		if reflect.DeepEqual(existingInstance.Status, requestInstance.Status) {
 			return
 		}
+
+		// Update requestInstance's resource version to avoid conflicts
+		requestInstance.ResourceVersion = existingInstance.ResourceVersion
 		if err := r.Client.Status().Patch(ctx, requestInstance, client.MergeFrom(existingInstance)); err != nil && !apierrors.IsNotFound(err) {
 			reconcileErr = utilerrors.NewAggregate([]error{reconcileErr, fmt.Errorf("error while patching OperandRequest.Status: %v", err)})
 		}

controllers/operandrequest/reconcile_operator.go

@@ -667,7 +667,7 @@ func (r *Reconciler) generateClusterObjects(o *operatorv1alpha1.Operator, regist
 	// Subscription Object
 	sub := &olmv1alpha1.Subscription{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        o.Name,
+			Name:        o.PackageName,
 			Namespace:   namespace,
 			Labels:      labels,
 			Annotations: annotations,
@@ -683,7 +683,7 @@ func (r *Reconciler) generateClusterObjects(o *operatorv1alpha1.Operator, regist
 		},
 	}
 	sub.SetGroupVersionKind(schema.GroupVersionKind{Group: olmv1alpha1.SchemeGroupVersion.Group, Kind: "Subscription", Version: olmv1alpha1.SchemeGroupVersion.Version})
-	klog.V(3).Info("Generating Subscription:  ", o.Name, " in the Namespace: ", namespace)
+	klog.V(3).Info("Generating Subscription:  ", o.PackageName, " in the Namespace: ", namespace)
 	co.subscription = sub
 	return co
 }