From c45cc8c60b90ddcc16944b735c30fa39924bc113 Mon Sep 17 00:00:00 2001
From: Shivaani Gupta <gshivaani@vmware.com>
Date: Tue, 11 Apr 2023 15:38:15 -0700
Subject: [PATCH] Rebasing from latest main

---
 .../clusterbootstrap_controller.go            |  5 --
 .../clusterbootstrapclone.go                  | 57 +------------------
 2 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/addons/controllers/clusterbootstrap_controller.go b/addons/controllers/clusterbootstrap_controller.go
index 0d30e1d85a..017580b688 100644
--- a/addons/controllers/clusterbootstrap_controller.go
+++ b/addons/controllers/clusterbootstrap_controller.go
@@ -481,11 +481,6 @@ func (r *ClusterBootstrapReconciler) patchClusterBootstrapFromTemplate(
 		return nil, err
 	}
 
-	if err := clusterBootstrapHelper.AddPackageLabelForCNIProvider(cluster.Name, updatedClusterBootstrap); err != nil {
-		r.Log.Error(err, fmt.Sprintf("unable to add labels to cni provider"))
-		return nil, err
-	}
-
 	r.Log.Info("updated clusterBootstrap", "clusterBootstrap", updatedClusterBootstrap)
 	return updatedClusterBootstrap, nil
 }
diff --git a/addons/pkg/util/clusterbootstrapclone/clusterbootstrapclone.go b/addons/pkg/util/clusterbootstrapclone/clusterbootstrapclone.go
index eb2a01924c..30a28a5577 100644
--- a/addons/pkg/util/clusterbootstrapclone/clusterbootstrapclone.go
+++ b/addons/pkg/util/clusterbootstrapclone/clusterbootstrapclone.go
@@ -466,12 +466,6 @@ func (h *Helper) HandleExistingClusterBootstrap(clusterBootstrap *runtanzuv1alph
 		h.Logger.Error(err, fmt.Sprintf("unable to add cluster %s/%s as owner reference to providers", cluster.Namespace, cluster.Name))
 	}
 
-	if err := h.AddPackageLabelForCNIProvider(cluster.Name, clusterBootstrap); err != nil {
-		h.Logger.Error(err, fmt.Sprintf("unable to add labels to cni provider"))
-		return nil, err
-	}
-	h.Logger.Info("patched labels for cni provider.")
-
 	clusterBootstrap.OwnerReferences = []metav1.OwnerReference{
 		{
 			APIVersion:         clusterapiv1beta1.GroupVersion.String(),
@@ -1080,41 +1074,16 @@ func (h *Helper) getListOfExistingProviders(clusterBootstrap *runtanzuv1alpha3.C
 
 func (h *Helper) AddClusterOwnerRefToExistingProviders(cluster *clusterapiv1beta1.Cluster, clusterBootstrap *runtanzuv1alpha3.ClusterBootstrap) error {
 
-	exsitingProviders, err := h.getListOfExistingProviders(clusterBootstrap)
+	existingProviders, err := h.getListOfExistingProviders(clusterBootstrap)
 	if err != nil {
 		return err
 	}
-	if err = h.AddClusterOwnerRef(cluster, exsitingProviders, nil, nil); err != nil {
+	if err = h.AddClusterOwnerRef(cluster, existingProviders, nil, nil); err != nil {
 		return err
 	}
 	return nil
 }
 
-// AddPackageLabelForCNIProvider patch the missing labels for AntreaConfig(cni config) when it's related to
-// an existing clusterboostrap. To make antreaconfig works with old versions, it relies on the package label now.
-func (h *Helper) AddPackageLabelForCNIProvider(clusterName string, clusterBootstrap *runtanzuv1alpha3.ClusterBootstrap) error {
-	cni := clusterBootstrap.Spec.CNI
-	if cni != nil {
-		providers, err := h.getListOfExistingProviders(clusterBootstrap)
-		if err != nil {
-			return err
-		}
-		for _, p := range providers {
-			if cni.ValuesFrom != nil && cni.ValuesFrom.ProviderRef != nil && p.GetKind() == cni.ValuesFrom.ProviderRef.Kind {
-				labels := p.GetLabels()
-				if labels == nil {
-					labels = map[string]string{}
-				}
-				labels[addontypes.PackageNameLabel] = util.ParseStringForLabel(cni.RefName)
-				labels[addontypes.ClusterNameLabel] = clusterName
-				return h.setLabels(labels, p)
-			}
-		}
-
-	}
-	return nil
-}
-
 // AddClusterOwnerRef adds cluster as an owner reference to the children with given controller and blockownerdeletion settings
 func (h *Helper) AddClusterOwnerRef(cluster *clusterapiv1beta1.Cluster, children []*unstructured.Unstructured, controller, blockownerdeletion *bool) error {
 	ownerRef := metav1.OwnerReference{
@@ -1146,28 +1115,6 @@ func ownedByDifferentCluster(k8SObject *unstructured.Unstructured, cluster *clus
 	return ""
 }
 
-func (h *Helper) setLabels(labels map[string]string, child *unstructured.Unstructured) error {
-	gvr, err := h.GVRHelper.GetGVR(child.GroupVersionKind().GroupKind())
-	if err != nil {
-		h.Logger.Error(err, fmt.Sprintf("unable to get GVR of %s/%s", child.GetNamespace(), child.GetName()))
-		return err
-	}
-
-	patchObj := unstructured.Unstructured{}
-	patchObj.SetLabels(labels)
-	patchData, err := patchObj.MarshalJSON()
-	if err != nil {
-		h.Logger.Error(err, fmt.Sprintf("unable to patch provider %s/%s", child.GetNamespace(), child.GetName()), "gvr", gvr)
-		return err
-	}
-	_, err = h.DynamicClient.Resource(*gvr).Namespace(child.GetNamespace()).Patch(h.Ctx, child.GetName(), types.MergePatchType, patchData, metav1.PatchOptions{})
-	if err != nil {
-		h.Logger.Error(err, fmt.Sprintf("unable to patch provider %s/%s", child.GetNamespace(), child.GetName()), "gvr", gvr)
-	}
-	return err
-
-}
-
 func (h *Helper) setOwnerRef(ownerRef *metav1.OwnerReference, children []*unstructured.Unstructured) error {
 	for _, child := range children {
 		gvr, err := h.GVRHelper.GetGVR(child.GroupVersionKind().GroupKind())