Skip to content

Commit d69a3e3

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #116 from theobarberbany/update-flags-feature-gates
OCPCLOUD-2565: Adds --feature-gates CLI argument
2 parents f51665b + 971e9af commit d69a3e3

18 files changed

+1157
-16
lines changed

‎cmd/manager/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
corev1 "k8s.io/api/core/v1"
4040
"k8s.io/client-go/kubernetes"
4141
"k8s.io/client-go/rest"
42+
k8sflag "k8s.io/component-base/cli/flag"
4243
"k8s.io/klog/v2"
4344
"k8s.io/klog/v2/klogr"
4445
ctrl "sigs.k8s.io/controller-runtime"
@@ -100,6 +101,9 @@ func main() {
100101
"Maximum number of concurrent reconciles per controller instance.",
101102
)
102103

104+
featureGateArgs := map[string]bool{}
105+
flag.Var(k8sflag.NewMapStringBool(&featureGateArgs), "feature-gates", "A set of key=value pairs that describe feature gates for alpha/experimen")
106+
103107
klog.InitFlags(nil)
104108
flag.Set("logtostderr", "true")
105109
flag.Parse()

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ require (
2323
golang.org/x/crypto v0.24.0
2424

2525
// kube 1.30
26-
k8s.io/api v0.30.1
27-
k8s.io/apimachinery v0.30.1
28-
k8s.io/client-go v0.30.1
26+
k8s.io/api v0.30.2
27+
k8s.io/apimachinery v0.30.2
28+
k8s.io/client-go v0.30.2
2929
k8s.io/klog/v2 v2.120.1
3030
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0
3131
sigs.k8s.io/controller-runtime v0.18.4
@@ -41,6 +41,7 @@ require (
4141
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
4242
github.com/openshift/library-go v0.0.0-20240607134135-aed018c215a1
4343
go.uber.org/mock v0.4.0
44+
k8s.io/component-base v0.30.2
4445
)
4546

4647
require (
@@ -136,7 +137,6 @@ require (
136137
k8s.io/apiextensions-apiserver v0.30.1 // indirect
137138
k8s.io/apiserver v0.30.1 // indirect
138139
k8s.io/cli-runtime v0.30.0 // indirect
139-
k8s.io/component-base v0.30.1 // indirect
140140
k8s.io/kube-aggregator v0.30.1 // indirect
141141
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
142142
k8s.io/kubectl v0.30.0 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -736,20 +736,20 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
736736
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
737737
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
738738
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
739-
k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY=
740-
k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM=
739+
k8s.io/api v0.30.2 h1:+ZhRj+28QT4UOH+BKznu4CBgPWgkXO7XAvMcMl0qKvI=
740+
k8s.io/api v0.30.2/go.mod h1:ULg5g9JvOev2dG0u2hig4Z7tQ2hHIuS+m8MNZ+X6EmI=
741741
k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws=
742742
k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4=
743-
k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U=
744-
k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
743+
k8s.io/apimachinery v0.30.2 h1:fEMcnBj6qkzzPGSVsAZtQThU62SmQ4ZymlXRC5yFSCg=
744+
k8s.io/apimachinery v0.30.2/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
745745
k8s.io/apiserver v0.30.1 h1:BEWEe8bzS12nMtDKXzCF5Q5ovp6LjjYkSp8qOPk8LZ8=
746746
k8s.io/apiserver v0.30.1/go.mod h1:i87ZnQ+/PGAmSbD/iEKM68bm1D5reX8fO4Ito4B01mo=
747747
k8s.io/cli-runtime v0.30.0 h1:0vn6/XhOvn1RJ2KJOC6IRR2CGqrpT6QQF4+8pYpWQ48=
748748
k8s.io/cli-runtime v0.30.0/go.mod h1:vATpDMATVTMA79sZ0YUCzlMelf6rUjoBzlp+RnoM+cg=
749-
k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q=
750-
k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc=
751-
k8s.io/component-base v0.30.1 h1:bvAtlPh1UrdaZL20D9+sWxsJljMi0QZ3Lmw+kmZAaxQ=
752-
k8s.io/component-base v0.30.1/go.mod h1:e/X9kDiOebwlI41AvBHuWdqFriSRrX50CdwA9TFaHLI=
749+
k8s.io/client-go v0.30.2 h1:sBIVJdojUNPDU/jObC+18tXWcTJVcwyqS9diGdWHk50=
750+
k8s.io/client-go v0.30.2/go.mod h1:JglKSWULm9xlJLx4KCkfLLQ7XwtlbflV6uFFSHTMgVs=
751+
k8s.io/component-base v0.30.2 h1:pqGBczYoW1sno8q9ObExUqrYSKhtE5rW3y6gX88GZII=
752+
k8s.io/component-base v0.30.2/go.mod h1:yQLkQDrkK8J6NtP+MGJOws+/PPeEXNpwFixsUI7h/OE=
753753
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
754754
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
755755
k8s.io/kube-aggregator v0.30.1 h1:ymR2BsxDacTKwzKTuNhGZttuk009c+oZbSeD+IPX5q4=

‎vendor/k8s.io/component-base/cli/flag/ciphersuites_flag.go

Lines changed: 147 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/component-base/cli/flag/colon_separated_multimap_string_string.go

Lines changed: 102 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/component-base/cli/flag/configuration_map.go

Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)