Handle hosted mode addons in addon progressing controller

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

pkg/addon/controllers/addonprogressing/controller.go

@@ -38,7 +38,7 @@ const (
 	ProgressingFailed  string = "Failed"
 )
 
-// addonProgressingController reconciles instances of managedclusteradd on the hub
+// addonProgressingController reconciles instances of managedclusteraddon on the hub
 // based to update the status progressing condition and last applied config
 type addonProgressingController struct {
 	addonClient                  addonv1alpha1client.Interface
@@ -67,11 +67,18 @@ func NewAddonProgressingController(
 	return factory.New().WithInformersQueueKeysFunc(
 		queue.QueueKeyByMetaNamespaceName,
 		addonInformers.Informer(), clusterManagementAddonInformers.Informer()).
-		// TODO: consider hosted manifestwork
-		WithInformersQueueKeysFunc(
+		WithFilteredEventsInformersQueueKeysFunc(
 			func(obj runtime.Object) []string {
 				accessor, _ := meta.Accessor(obj)
-				return []string{fmt.Sprintf("%s/%s", accessor.GetNamespace(), accessor.GetLabels()[addonapiv1alpha1.AddonLabelKey])}
+				namespace := accessor.GetNamespace()
+				if len(accessor.GetLabels()[addonapiv1alpha1.AddonNamespaceLabelKey]) > 0 {
+					namespace = accessor.GetLabels()[addonapiv1alpha1.AddonNamespaceLabelKey]
+				}
+				return []string{fmt.Sprintf("%s/%s", namespace, accessor.GetLabels()[addonapiv1alpha1.AddonLabelKey])}
+			},
+			func(obj interface{}) bool {
+				accessor, _ := meta.Accessor(obj)
+				return len(accessor.GetLabels()) > 0 && len(accessor.GetLabels()[addonapiv1alpha1.AddonLabelKey]) > 0
 			},
 			workInformers.Informer()).
 		WithSync(c.sync).ToController("addon-progressing-controller", recorder)
@@ -117,22 +124,26 @@ func (c *addonProgressingController) sync(ctx context.Context, syncCtx factory.S
 func (c *addonProgressingController) updateAddonProgressingAndLastApplied(
 	ctx context.Context, newaddon, oldaddon *addonapiv1alpha1.ManagedClusterAddOn) (bool, error) {
 	patcher := patcher.NewPatcher[
-		*addonapiv1alpha1.ManagedClusterAddOn, addonapiv1alpha1.ManagedClusterAddOnSpec, addonapiv1alpha1.ManagedClusterAddOnStatus](
+		*addonapiv1alpha1.ManagedClusterAddOn,
+		addonapiv1alpha1.ManagedClusterAddOnSpec,
+		addonapiv1alpha1.ManagedClusterAddOnStatus](
 		c.addonClient.AddonV1alpha1().ManagedClusterAddOns(newaddon.Namespace))
 	// check config references
 	if supported, config := isConfigurationSupported(newaddon); !supported {
 		meta.SetStatusCondition(&newaddon.Status.Conditions, metav1.Condition{
-			Type:    addonapiv1alpha1.ManagedClusterAddOnConditionProgressing,
-			Status:  metav1.ConditionFalse,
-			Reason:  addonapiv1alpha1.ProgressingReasonConfigurationUnsupported,
-			Message: fmt.Sprintf("Configuration with gvr %s/%s is not supported for this addon", config.Group, config.Resource),
+			Type:   addonapiv1alpha1.ManagedClusterAddOnConditionProgressing,
+			Status: metav1.ConditionFalse,
+			Reason: addonapiv1alpha1.ProgressingReasonConfigurationUnsupported,
+			Message: fmt.Sprintf("Configuration with gvr %s/%s is not supported for this addon",
+				config.Group, config.Resource),
 		})
 
 		return patcher.PatchStatus(ctx, newaddon, newaddon.Status, oldaddon.Status)
 	}
 
 	// wait until addon has ManifestApplied condition
-	if cond := meta.FindStatusCondition(newaddon.Status.Conditions, addonapiv1alpha1.ManagedClusterAddOnManifestApplied); cond == nil {
+	if cond := meta.FindStatusCondition(
+		newaddon.Status.Conditions, addonapiv1alpha1.ManagedClusterAddOnManifestApplied); cond == nil {
 		meta.SetStatusCondition(&newaddon.Status.Conditions, metav1.Condition{
 			Type:    addonapiv1alpha1.ManagedClusterAddOnConditionProgressing,
 			Status:  metav1.ConditionFalse,
@@ -142,6 +153,25 @@ func (c *addonProgressingController) updateAddonProgressingAndLastApplied(
 		return patcher.PatchStatus(ctx, newaddon, newaddon.Status, oldaddon.Status)
 	}
 
+	var hostingClusterName string = ""
+	if newaddon.Annotations != nil && len(newaddon.Annotations[addonapiv1alpha1.HostingClusterNameAnnotationKey]) > 0 {
+		hostingClusterName = newaddon.Annotations[addonapiv1alpha1.HostingClusterNameAnnotationKey]
+	}
+
+	if len(hostingClusterName) > 0 {
+		// wait until addon has HostingManifestApplied condition
+		if cond := meta.FindStatusCondition(
+			newaddon.Status.Conditions, addonapiv1alpha1.ManagedClusterAddOnHostingManifestApplied); cond == nil {
+			meta.SetStatusCondition(&newaddon.Status.Conditions, metav1.Condition{
+				Type:    addonapiv1alpha1.ManagedClusterAddOnConditionProgressing,
+				Status:  metav1.ConditionFalse,
+				Reason:  "WaitingForHostingManifestApplied",
+				Message: "Waiting for ManagedClusterAddOn HostingManifestApplied condition",
+			})
+			return patcher.PatchStatus(ctx, newaddon, newaddon.Status, oldaddon.Status)
+		}
+	}
+
 	// set upgrade flag
 	isUpgrade := false
 	for _, configReference := range newaddon.Status.ConfigReferences {
@@ -152,7 +182,6 @@ func (c *addonProgressingController) updateAddonProgressingAndLastApplied(
 	}
 
 	// get addon works
-	// TODO: consider hosted manifestwork
 	requirement, _ := labels.NewRequirement(addonapiv1alpha1.AddonLabelKey, selection.Equals, []string{newaddon.Name})
 	selector := labels.NewSelector().Add(*requirement)
 	addonWorks, err := c.workLister.ManifestWorks(newaddon.Namespace).List(selector)
@@ -161,6 +190,17 @@ func (c *addonProgressingController) updateAddonProgressingAndLastApplied(
 		return patcher.PatchStatus(ctx, newaddon, newaddon.Status, oldaddon.Status)
 	}
 
+	if len(hostingClusterName) > 0 {
+		// get hosted addon works
+		hostedAddonWorks, err := c.workLister.ManifestWorks(hostingClusterName).List(selector)
+		if err != nil {
+			setAddOnProgressingAndLastApplied(isUpgrade, ProgressingFailed, err.Error(), newaddon)
+			return patcher.PatchStatus(ctx, newaddon, newaddon.Status, oldaddon.Status)
+		}
+		addonWorks = append(addonWorks, hostedAddonWorks...)
+
+	}
+
 	if len(addonWorks) == 0 {
 		setAddOnProgressingAndLastApplied(isUpgrade, ProgressingDoing, "no addon works", newaddon)
 		return patcher.PatchStatus(ctx, newaddon, newaddon.Status, oldaddon.Status)

pkg/registration/spoke/addon/configuration.go

@@ -15,8 +15,6 @@ import (
 
 const (
 	defaultAddOnInstallationNamespace = "open-cluster-management-agent-addon"
-	// hostingClusterNameAnnotation is the annotation for indicating the hosting cluster name
-	hostingClusterNameAnnotation = "addon.open-cluster-management.io/hosting-cluster-name"
 )
 
 // registrationConfig contains necessary information for addon registration
@@ -76,7 +74,7 @@ func getAddOnInstallationNamespace(addOn *addonv1alpha1.ManagedClusterAddOn) str
 
 // isAddonRunningOutsideManagedCluster returns whether the addon agent is running on the managed cluster
 func isAddonRunningOutsideManagedCluster(addOn *addonv1alpha1.ManagedClusterAddOn) bool {
-	hostingCluster, ok := addOn.Annotations[hostingClusterNameAnnotation]
+	hostingCluster, ok := addOn.Annotations[addonv1alpha1.HostingClusterNameAnnotationKey]
 	if ok && len(hostingCluster) != 0 {
 		return true
 	}

pkg/registration/spoke/addon/configuration_test.go

@@ -85,7 +85,7 @@ func TestGetRegistrationConfigs(t *testing.T) {
 					Namespace: testinghelpers.TestManagedClusterName,
 					Name:      addOnName,
 					Annotations: map[string]string{
-						hostingClusterNameAnnotation: "test",
+						addonv1alpha1.HostingClusterNameAnnotationKey: "test",
 					},
 				},
 				Spec: addonv1alpha1.ManagedClusterAddOnSpec{

pkg/registration/spoke/addon/lease_controller_test.go

@@ -296,7 +296,7 @@ func TestSync(t *testing.T) {
 					Namespace: testinghelpers.TestManagedClusterName,
 					Name:      "test",
 					Annotations: map[string]string{
-						hostingClusterNameAnnotation: "cluster1",
+						addonv1alpha1.HostingClusterNameAnnotationKey: "cluster1",
 					},
 				},
 				Spec: addonv1alpha1.ManagedClusterAddOnSpec{

pkg/registration/spoke/addon/registration_controller_test.go

@@ -437,7 +437,7 @@ func newManagedClusterAddOn(namespace, name string, registrations []addonv1alpha
 	}
 
 	if hostedMode {
-		addon.SetAnnotations(map[string]string{hostingClusterNameAnnotation: "test"})
+		addon.SetAnnotations(map[string]string{addonv1alpha1.HostingClusterNameAnnotationKey: "test"})
 	}
 	return addon
 }