Skip to content

Commit 775e3ba

Browse files
Update api dependency and fix disabling DefaultClusterSet featureGate issue (#460)
Signed-off-by: Rokibul Hasan <[email protected]>
1 parent 15b68c4 commit 775e3ba

File tree

5 files changed

+5
-8
lines changed

5 files changed

+5
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
k8s.io/klog/v2 v2.130.1
2929
k8s.io/kubectl v0.30.0
3030
k8s.io/utils v0.0.0-20240310230437-4693a0247e57
31-
open-cluster-management.io/api v0.15.0
31+
open-cluster-management.io/api v0.15.1-0.20241106012558-db876bf4ff8a
3232
open-cluster-management.io/cluster-proxy v0.4.0
3333
open-cluster-management.io/managed-serviceaccount v0.6.0
3434
open-cluster-management.io/ocm v0.15.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ k8s.io/kubectl v0.30.0 h1:xbPvzagbJ6RNYVMVuiHArC1grrV5vSmmIcSZuCdzRyk=
572572
k8s.io/kubectl v0.30.0/go.mod h1:zgolRw2MQXLPwmic2l/+iHs239L49fhSeICuMhQQXTI=
573573
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY=
574574
k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
575-
open-cluster-management.io/api v0.15.0 h1:lRee1KOlGHZb2scTA7ff9E9Fxt2hJc7jpkHnaCbvkOU=
576-
open-cluster-management.io/api v0.15.0/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
575+
open-cluster-management.io/api v0.15.1-0.20241106012558-db876bf4ff8a h1:QTljOjTR8jDpw/EWhOoakGcStGVftQkBWHVxGZMhEUQ=
576+
open-cluster-management.io/api v0.15.1-0.20241106012558-db876bf4ff8a/go.mod h1:9erZEWEn4bEqh0nIX2wA7f/s3KCuFycQdBrPrRzi0QM=
577577
open-cluster-management.io/cluster-proxy v0.4.0 h1:rm0UDaDWe3/P3xLzwqdHtqNksKwSzsic02MkrEe6BnM=
578578
open-cluster-management.io/cluster-proxy v0.4.0/go.mod h1:gTvfDHAhGezhdg4BD3ECBn6jbg2Y5PbHhV2ceW5nrB0=
579579
open-cluster-management.io/managed-serviceaccount v0.6.0 h1:qIi5T9WQJBuoGqnYGIktXbtqfQoiN2H9XU2P/6lAQiw=

pkg/genericclioptions/feature_gates.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ func init() {
1717
utilruntime.Must(HubMutableFeatureGate.Add(ocmfeature.DefaultHubAddonManagerFeatureGates))
1818
utilruntime.Must(SpokeMutableFeatureGate.Add(ocmfeature.DefaultSpokeRegistrationFeatureGates))
1919
utilruntime.Must(SpokeMutableFeatureGate.Add(ocmfeature.DefaultSpokeWorkFeatureGates))
20-
21-
// Update default features
22-
utilruntime.Must(HubMutableFeatureGate.SetFromMap(map[string]bool{string(ocmfeature.DefaultClusterSet): true}))
2320
}
2421

2522
func ConvertToFeatureGateAPI(featureGates featuregate.MutableFeatureGate, defaultFeatureGate map[featuregate.Feature]featuregate.FeatureSpec) []operatorv1.FeatureGate {

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,7 @@ k8s.io/utils/pointer
12181218
k8s.io/utils/ptr
12191219
k8s.io/utils/strings/slices
12201220
k8s.io/utils/trace
1221-
# open-cluster-management.io/api v0.15.0
1221+
# open-cluster-management.io/api v0.15.1-0.20241106012558-db876bf4ff8a
12221222
## explicit; go 1.22.0
12231223
open-cluster-management.io/api/addon/v1alpha1
12241224
open-cluster-management.io/api/client/addon/clientset/versioned

vendor/open-cluster-management.io/api/feature/feature.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)