From 775e3ba94ef9609a5d19071b21b6776075d68aa4 Mon Sep 17 00:00:00 2001 From: Rokibul Hasan Date: Mon, 11 Nov 2024 21:02:10 +0600 Subject: [PATCH] Update `api` dependency and fix disabling `DefaultClusterSet` featureGate issue (#460) Signed-off-by: Rokibul Hasan --- go.mod | 2 +- go.sum | 4 ++-- pkg/genericclioptions/feature_gates.go | 3 --- vendor/modules.txt | 2 +- vendor/open-cluster-management.io/api/feature/feature.go | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 5003b9e1..6d00a63e 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( k8s.io/klog/v2 v2.130.1 k8s.io/kubectl v0.30.0 k8s.io/utils v0.0.0-20240310230437-4693a0247e57 - open-cluster-management.io/api v0.15.0 + open-cluster-management.io/api v0.15.1-0.20241106012558-db876bf4ff8a open-cluster-management.io/cluster-proxy v0.4.0 open-cluster-management.io/managed-serviceaccount v0.6.0 open-cluster-management.io/ocm v0.15.0 diff --git a/go.sum b/go.sum index 82f50801..dd32f79f 100644 --- a/go.sum +++ b/go.sum @@ -572,8 +572,8 @@ k8s.io/kubectl v0.30.0 h1:xbPvzagbJ6RNYVMVuiHArC1grrV5vSmmIcSZuCdzRyk= k8s.io/kubectl v0.30.0/go.mod h1:zgolRw2MQXLPwmic2l/+iHs239L49fhSeICuMhQQXTI= k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY= k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -open-cluster-management.io/api v0.15.0 h1:lRee1KOlGHZb2scTA7ff9E9Fxt2hJc7jpkHnaCbvkOU= -open-cluster-management.io/api v0.15.0/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM= +open-cluster-management.io/api v0.15.1-0.20241106012558-db876bf4ff8a h1:QTljOjTR8jDpw/EWhOoakGcStGVftQkBWHVxGZMhEUQ= +open-cluster-management.io/api v0.15.1-0.20241106012558-db876bf4ff8a/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM= open-cluster-management.io/cluster-proxy v0.4.0 h1:rm0UDaDWe3/P3xLzwqdHtqNksKwSzsic02MkrEe6BnM= open-cluster-management.io/cluster-proxy v0.4.0/go.mod h1:gTvfDHAhGezhdg4BD3ECBn6jbg2Y5PbHhV2ceW5nrB0= open-cluster-management.io/managed-serviceaccount v0.6.0 h1:qIi5T9WQJBuoGqnYGIktXbtqfQoiN2H9XU2P/6lAQiw= diff --git a/pkg/genericclioptions/feature_gates.go b/pkg/genericclioptions/feature_gates.go index 26e51dec..0f22be1c 100644 --- a/pkg/genericclioptions/feature_gates.go +++ b/pkg/genericclioptions/feature_gates.go @@ -17,9 +17,6 @@ func init() { utilruntime.Must(HubMutableFeatureGate.Add(ocmfeature.DefaultHubAddonManagerFeatureGates)) utilruntime.Must(SpokeMutableFeatureGate.Add(ocmfeature.DefaultSpokeRegistrationFeatureGates)) utilruntime.Must(SpokeMutableFeatureGate.Add(ocmfeature.DefaultSpokeWorkFeatureGates)) - - // Update default features - utilruntime.Must(HubMutableFeatureGate.SetFromMap(map[string]bool{string(ocmfeature.DefaultClusterSet): true})) } func ConvertToFeatureGateAPI(featureGates featuregate.MutableFeatureGate, defaultFeatureGate map[featuregate.Feature]featuregate.FeatureSpec) []operatorv1.FeatureGate { diff --git a/vendor/modules.txt b/vendor/modules.txt index 31703ac2..1a61b600 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1218,7 +1218,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# open-cluster-management.io/api v0.15.0 +# open-cluster-management.io/api v0.15.1-0.20241106012558-db876bf4ff8a ## explicit; go 1.22.0 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 a6b15196..1e658be5 100644 --- a/vendor/open-cluster-management.io/api/feature/feature.go +++ b/vendor/open-cluster-management.io/api/feature/feature.go @@ -96,7 +96,7 @@ var DefaultSpokeRegistrationFeatureGates = map[featuregate.Feature]featuregate.F // feature keys for registration hub controller. To add a new feature, define a key for it above and // add it here. var DefaultHubRegistrationFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ - DefaultClusterSet: {Default: false, PreRelease: featuregate.Alpha}, + DefaultClusterSet: {Default: true, PreRelease: featuregate.Alpha}, V1beta1CSRAPICompatibility: {Default: false, PreRelease: featuregate.Alpha}, ManagedClusterAutoApproval: {Default: false, PreRelease: featuregate.Alpha}, ResourceCleanup: {Default: false, PreRelease: featuregate.Alpha},