From f09ff75a5e554bececd919080cf531167974f529 Mon Sep 17 00:00:00 2001 From: Zhiwei Yin Date: Wed, 23 Apr 2025 21:35:44 +0800 Subject: [PATCH] upgrade api to enable ResourceCleanup feature gate by default (#963) Signed-off-by: Zhiwei Yin --- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- vendor/open-cluster-management.io/api/feature/feature.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 47b33c402..e36472865 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( k8s.io/kube-aggregator v0.32.1 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 open-cluster-management.io/addon-framework v0.12.1-0.20250407131028-9d436ffc2da7 - open-cluster-management.io/api v0.16.2-0.20250422072120-cadf714c3055 + open-cluster-management.io/api v0.16.2-0.20250422142209-8449b0f472f7 open-cluster-management.io/sdk-go v0.16.1-0.20250411154302-3a424961ead4 sigs.k8s.io/cluster-inventory-api v0.0.0-20240730014211-ef0154379848 sigs.k8s.io/controller-runtime v0.20.2 diff --git a/go.sum b/go.sum index 6afa7d605..abdb29515 100644 --- a/go.sum +++ b/go.sum @@ -487,8 +487,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= open-cluster-management.io/addon-framework v0.12.1-0.20250407131028-9d436ffc2da7 h1:oLu9ag44Msf56Hb19b/b+UTNq0J2l9rhlBQ1gh7izCU= open-cluster-management.io/addon-framework v0.12.1-0.20250407131028-9d436ffc2da7/go.mod h1:7AEw1Sq9UEWpQGTU8zV1XPNkFRBYPbyBh8tfhISV++s= -open-cluster-management.io/api v0.16.2-0.20250422072120-cadf714c3055 h1:D2vT3nnMS/To3ptz8LLg1zfJm/pL8XIaO1g7Qbyc/5o= -open-cluster-management.io/api v0.16.2-0.20250422072120-cadf714c3055/go.mod h1:/OeqXycNBZQoe3WG6ghuWsMgsKGuMZrK8ZpsU6gWL0Y= +open-cluster-management.io/api v0.16.2-0.20250422142209-8449b0f472f7 h1:CLoFsE3XjSlYr8YLbrlyBdpEYgz9gaM6X5R9z3CTKss= +open-cluster-management.io/api v0.16.2-0.20250422142209-8449b0f472f7/go.mod h1:/OeqXycNBZQoe3WG6ghuWsMgsKGuMZrK8ZpsU6gWL0Y= open-cluster-management.io/sdk-go v0.16.1-0.20250411154302-3a424961ead4 h1:PT6kDaKjDi0EaQyNzIWzYAYeK4QpBHbm+/7VPrpJEkY= open-cluster-management.io/sdk-go v0.16.1-0.20250411154302-3a424961ead4/go.mod h1:FtOYjn5dL8e9S1gzNb8cBNsFzHJ1F3cpmCo+qrltido= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= diff --git a/vendor/modules.txt b/vendor/modules.txt index baa9ebd19..8bd23849f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1714,7 +1714,7 @@ open-cluster-management.io/addon-framework/pkg/agent open-cluster-management.io/addon-framework/pkg/assets open-cluster-management.io/addon-framework/pkg/index open-cluster-management.io/addon-framework/pkg/utils -# open-cluster-management.io/api v0.16.2-0.20250422072120-cadf714c3055 +# open-cluster-management.io/api v0.16.2-0.20250422142209-8449b0f472f7 ## explicit; go 1.23.6 open-cluster-management.io/api/addon/v1alpha1 open-cluster-management.io/api/client/addon/clientset/versioned diff --git a/vendor/open-cluster-management.io/api/feature/feature.go b/vendor/open-cluster-management.io/api/feature/feature.go index edcfd87ee..bcc1759b6 100644 --- a/vendor/open-cluster-management.io/api/feature/feature.go +++ b/vendor/open-cluster-management.io/api/feature/feature.go @@ -28,7 +28,7 @@ const ( ClusterProperty featuregate.Feature = "ClusterProperty" // AddonManagement is a feature gate on hub controller and spoke-agent. When it is enabled on the - //spoke agent, it will start a new controllers to manage the managed cluster addons + // spoke agent, it will start a new controllers to manage the managed cluster addons // registration and maintains the status of managed cluster addons through watching their leases. // When it is enabled on hub controller, it will start a new controller to process addon automatic // installation and rolling out. @@ -107,7 +107,7 @@ var DefaultHubRegistrationFeatureGates = map[featuregate.Feature]featuregate.Fea DefaultClusterSet: {Default: true, PreRelease: featuregate.Alpha}, V1beta1CSRAPICompatibility: {Default: false, PreRelease: featuregate.Alpha}, ManagedClusterAutoApproval: {Default: false, PreRelease: featuregate.Alpha}, - ResourceCleanup: {Default: false, PreRelease: featuregate.Alpha}, + ResourceCleanup: {Default: true, PreRelease: featuregate.Beta}, ClusterProfile: {Default: false, PreRelease: featuregate.Alpha}, ClusterImporter: {Default: false, PreRelease: featuregate.Alpha}, }