fix: skip GC for ManifestWorks managed by ManifestWorkReplicaSet (#1299)

Skip garbage collection for ManifestWorks that have the
ManifestWorkReplicaSet controller label, as these should be
managed exclusively by the ManifestWorkReplicaSet controller.

Changes:
- Fix logic bug in controller to properly check for ReplicaSet label
- Add unit tests for label-based GC skip behavior
- Add integration test to verify GC skip for ReplicaSet-managed works

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Signed-off-by: Jian Qiu <jqiu@redhat.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: qiujian16

deploy/cluster-manager/olm-catalog/latest/manifests/cluster-manager.clusterserviceversion.yaml

@@ -59,7 +59,7 @@ metadata:
     categories: Integration & Delivery,OpenShift Optional
     certified: "false"
     containerImage: quay.io/open-cluster-management/registration-operator:latest
-    createdAt: "2025-11-26T02:38:33Z"
+    createdAt: "2025-12-15T05:30:24Z"
     description: Manages the installation and upgrade of the ClusterManager.
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

deploy/klusterlet/olm-catalog/latest/manifests/klusterlet.clusterserviceversion.yaml

@@ -31,7 +31,7 @@ metadata:
     categories: Integration & Delivery,OpenShift Optional
     certified: "false"
     containerImage: quay.io/open-cluster-management/registration-operator:latest
-    createdAt: "2025-11-26T02:38:33Z"
+    createdAt: "2025-12-15T05:30:24Z"
     description: Manages the installation and upgrade of the Klusterlet.
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

go.mod

@@ -40,8 +40,8 @@ require (
 	k8s.io/kubectl v0.34.3
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
 	open-cluster-management.io/addon-framework v1.1.1-0.20251126020917-1a0a9be61322
-	open-cluster-management.io/api v1.1.1-0.20251124092621-2337d27c3b7f
-	open-cluster-management.io/sdk-go v1.1.1-0.20251209031938-62521c9935ac
+	open-cluster-management.io/api v1.1.1-0.20251215032811-ee922fbb996c
+	open-cluster-management.io/sdk-go v1.1.1-0.20251215074442-72dfdeb13ed1
 	sigs.k8s.io/about-api v0.0.0-20250131010323-518069c31c03
 	sigs.k8s.io/cluster-inventory-api v0.0.0-20240730014211-ef0154379848
 	sigs.k8s.io/controller-runtime v0.22.4

go.sum

@@ -590,10 +590,10 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 open-cluster-management.io/addon-framework v1.1.1-0.20251126020917-1a0a9be61322 h1:ibdBTpWmpQ37f1jZgR3fFIDK5uDTOJRvOkDKnRjLOpg=
 open-cluster-management.io/addon-framework v1.1.1-0.20251126020917-1a0a9be61322/go.mod h1:YqG/M9aLM/jhUXZDb2lEi2gGFU8NHAPTsQEFGk/tiS8=
-open-cluster-management.io/api v1.1.1-0.20251124092621-2337d27c3b7f h1:aOEXqgXvWSykMvzw9drHsLGUNP3xhsk1PcdRzfOVXoM=
-open-cluster-management.io/api v1.1.1-0.20251124092621-2337d27c3b7f/go.mod h1:Hk/3c114t6Ba5qhpqw+RoA93yEbE2CosG+JzzBZ6aCo=
-open-cluster-management.io/sdk-go v1.1.1-0.20251209031938-62521c9935ac h1:Wt7rzenZqrtyYI58+lpe9tmf9e5Ft8Wwd0MyDwuJ4ck=
-open-cluster-management.io/sdk-go v1.1.1-0.20251209031938-62521c9935ac/go.mod h1:0EZ9M7AtD0b+x9lUo5pYlyFF2aKOk1y88looeOVybwU=
+open-cluster-management.io/api v1.1.1-0.20251215032811-ee922fbb996c h1:LWZ+5dwVSNVM84eMBiQkygyYIlAudXSwQ6IM5LXr7QY=
+open-cluster-management.io/api v1.1.1-0.20251215032811-ee922fbb996c/go.mod h1:Hk/3c114t6Ba5qhpqw+RoA93yEbE2CosG+JzzBZ6aCo=
+open-cluster-management.io/sdk-go v1.1.1-0.20251215074442-72dfdeb13ed1 h1:if168++xGJnZywbqYRYDhWTz5kCp2HpBQ59KmRX9Ag4=
+open-cluster-management.io/sdk-go v1.1.1-0.20251215074442-72dfdeb13ed1/go.mod h1:Hp1DYO2ABl/jt35Aw2IoeuJuvvURWXj1z2Gc8fdIVTw=
 sigs.k8s.io/about-api v0.0.0-20250131010323-518069c31c03 h1:1ShFiMjGQOR/8jTBkmZrk1gORxnvMwm1nOy2/DbHg4U=
 sigs.k8s.io/about-api v0.0.0-20250131010323-518069c31c03/go.mod h1:F1pT4mK53U6F16/zuaPSYpBaR7x5Kjym6aKJJC0/DHU=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=

manifests/cluster-manager/hub/crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml

@@ -376,6 +376,7 @@ spec:
                 type: object
               supportedConfigs:
                 description: |-
+                  Deprecated: Will be removed and replaced with DefaultConfigs in v1beta1.
                   supportedConfigs is a list of configuration types supported by add-on.
                   An empty list means the add-on does not require configurations.
                   The default is an empty list
@@ -422,7 +423,7 @@ spec:
               add-on.
             properties:
               defaultconfigReferences:
-                description: defaultconfigReferences is a list of current add-on default
+                description: DefaultConfigReferences is a list of current add-on default
                   configuration references.
                 items:
                   description: |-

manifests/cluster-manager/hub/crds/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml

@@ -751,12 +751,20 @@ spec:
                           type: integer
                         degraded:
                           type: integer
+                        desiredTotal:
+                          description: DesiredTotal is the number of ManifestWorks
+                            that will be created by the ManifestWorkReplicaSet.
+                          type: integer
                         progressing:
                           type: integer
                         total:
                           description: Total number of ManifestWorks managed by the
                             ManifestWorkReplicaSet
                           type: integer
+                        updated:
+                          description: Updated is the number of clusters with updated
+                            revision applied.
+                          type: integer
                       type: object
                   type: object
                 type: array
@@ -773,11 +781,19 @@ spec:
                     type: integer
                   degraded:
                     type: integer
+                  desiredTotal:
+                    description: DesiredTotal is the number of ManifestWorks that
+                      will be created by the ManifestWorkReplicaSet.
+                    type: integer
                   progressing:
                     type: integer
                   total:
                     description: Total number of ManifestWorks managed by the ManifestWorkReplicaSet
                     type: integer
+                  updated:
+                    description: Updated is the number of clusters with updated revision
+                      applied.
+                    type: integer
                 type: object
             type: object
         type: object

manifests/cluster-manager/hub/crds/0000_01_addon.open-cluster-management.io_managedclusteraddons.crd.yaml

@@ -243,9 +243,8 @@ spec:
                       - name
                       type: object
                     lastObservedGeneration:
-                      description: |-
-                        Deprecated: Use LastAppliedConfig instead
-                        lastObservedGeneration is the observed generation of the add-on configuration.
+                      description: lastObservedGeneration is the observed generation
+                        of the add-on configuration.
                       format: int64
                       type: integer
                     name:
@@ -302,14 +301,16 @@ spec:
                     create a csr for the addon agent with the registrationConfig.
                   properties:
                     signerName:
-                      description: signerName is the name of signer that addon agent
-                        will use to create csr.
+                      description: |-
+                        Deprecated: Will be replaced with type: kubeClient and type: csr in v1beta1.
+                        signerName is the name of signer that addon agent will use to create csr.
                       maxLength: 571
                       minLength: 5
                       pattern: ^([a-z0-9][a-z0-9-]*[a-z0-9]\.)+[a-z]+\/[a-z0-9-\.]+$
                       type: string
                     subject:
                       description: |-
+                        Deprecated: Will be replaced with type: kubeClient and type: csr in v1beta1.
                         subject is the user subject of the addon agent to be registered to the hub.
                         If it is not set, the addon agent will have the default subject
                         "subject": {

pkg/registration/register/grpc/spoke_driver.go

@@ -24,6 +24,7 @@ import (
 	"open-cluster-management.io/sdk-go/pkg/basecontroller/events"
 	"open-cluster-management.io/sdk-go/pkg/basecontroller/factory"
 	cloudeventsaddon "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/addon"
+	cloudeventsaddonv1alpha1 "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/addon/v1alpha1"
 	cloudeventscluster "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/cluster"
 	cloudeventscsr "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/csr"
 	cloudeventsevent "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/event"
@@ -142,7 +143,7 @@ func (d *GRPCDriver) BuildClients(ctx context.Context, secretOption register.Sec
 		ctx,
 		cloudeventsoptions.NewGenericClientOptions(
 			config,
-			cloudeventsaddon.NewManagedClusterAddOnCodec(),
+			cloudeventsaddonv1alpha1.NewManagedClusterAddOnCodec(),
 			secretOption.ClusterName,
 		).WithClusterName(secretOption.ClusterName).WithClientWatcherStore(addonWatchStore))
 	if err != nil {

pkg/server/grpc/options.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
 
-	addonce "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/addon"
+	addonce "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/addon/v1alpha1"
 	clusterce "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/cluster"
 	csrce "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/csr"
 	eventce "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/event"

pkg/server/services/addon/addon.go

@@ -14,7 +14,7 @@ import (
 	addonclientset "open-cluster-management.io/api/client/addon/clientset/versioned"
 	addoninformerv1alpha1 "open-cluster-management.io/api/client/addon/informers/externalversions/addon/v1alpha1"
 	addonlisterv1alpha1 "open-cluster-management.io/api/client/addon/listers/addon/v1alpha1"
-	addonce "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/addon"
+	addonce "open-cluster-management.io/sdk-go/pkg/cloudevents/clients/addon/v1alpha1"
 	"open-cluster-management.io/sdk-go/pkg/cloudevents/generic/types"
 	"open-cluster-management.io/sdk-go/pkg/cloudevents/server"