Skip to content

Commit 16e08f3

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#73408 from Klaven/component-base-flags
Move flag util pkgs to k8s.io/component-base/cli
2 parents 3e74895 + 160ed26 commit 16e08f3

File tree

104 files changed

+303
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+303
-299
lines changed

‎cmd/cloud-controller-manager/app/BUILD‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ go_library(
2525
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
2626
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
2727
"//staging/src/k8s.io/apiserver/pkg/server/healthz:go_default_library",
28-
"//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library",
29-
"//staging/src/k8s.io/apiserver/pkg/util/globalflag:go_default_library",
28+
"//staging/src/k8s.io/apiserver/pkg/util/term:go_default_library",
3029
"//staging/src/k8s.io/client-go/tools/leaderelection:go_default_library",
3130
"//staging/src/k8s.io/client-go/tools/leaderelection/resourcelock:go_default_library",
3231
"//staging/src/k8s.io/cloud-provider:go_default_library",
32+
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
33+
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
3334
"//vendor/github.com/spf13/cobra:go_default_library",
3435
"//vendor/k8s.io/klog:go_default_library",
3536
],

‎cmd/cloud-controller-manager/app/controllermanager.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,12 @@ import (
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
"k8s.io/apiserver/pkg/server"
3232
"k8s.io/apiserver/pkg/server/healthz"
33-
apiserverflag "k8s.io/apiserver/pkg/util/flag"
34-
"k8s.io/apiserver/pkg/util/globalflag"
33+
"k8s.io/apiserver/pkg/util/term"
3534
"k8s.io/client-go/tools/leaderelection"
3635
"k8s.io/client-go/tools/leaderelection/resourcelock"
3736
cloudprovider "k8s.io/cloud-provider"
37+
cliflag "k8s.io/component-base/cli/flag"
38+
"k8s.io/component-base/cli/globalflag"
3839
"k8s.io/klog"
3940
cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
4041
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
@@ -91,15 +92,15 @@ the cloud specific control loops shipped with Kubernetes.`,
9192
fs.AddFlagSet(f)
9293
}
9394
usageFmt := "Usage:\n %s\n"
94-
cols, _, _ := apiserverflag.TerminalSize(cmd.OutOrStdout())
95+
cols, _, _ := term.TerminalSize(cmd.OutOrStdout())
9596
cmd.SetUsageFunc(func(cmd *cobra.Command) error {
9697
fmt.Fprintf(cmd.OutOrStderr(), usageFmt, cmd.UseLine())
97-
apiserverflag.PrintSections(cmd.OutOrStderr(), namedFlagSets, cols)
98+
cliflag.PrintSections(cmd.OutOrStderr(), namedFlagSets, cols)
9899
return nil
99100
})
100101
cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
101102
fmt.Fprintf(cmd.OutOrStdout(), "%s\n\n"+usageFmt, cmd.Long, cmd.UseLine())
102-
apiserverflag.PrintSections(cmd.OutOrStdout(), namedFlagSets, cols)
103+
cliflag.PrintSections(cmd.OutOrStdout(), namedFlagSets, cols)
103104
})
104105

105106
return cmd

‎cmd/cloud-controller-manager/app/options/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ go_library(
2525
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
2626
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
2727
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
28-
"//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library",
2928
"//staging/src/k8s.io/client-go/informers:go_default_library",
3029
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
3130
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
3231
"//staging/src/k8s.io/client-go/rest:go_default_library",
3332
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
3433
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
34+
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
3535
"//vendor/k8s.io/klog:go_default_library",
3636
],
3737
)

‎cmd/cloud-controller-manager/app/options/options.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ import (
2222
"net"
2323
"time"
2424

25-
"k8s.io/api/core/v1"
25+
v1 "k8s.io/api/core/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
utilerrors "k8s.io/apimachinery/pkg/util/errors"
2828
apiserveroptions "k8s.io/apiserver/pkg/server/options"
2929
utilfeature "k8s.io/apiserver/pkg/util/feature"
30-
apiserverflag "k8s.io/apiserver/pkg/util/flag"
3130
"k8s.io/client-go/informers"
3231
clientset "k8s.io/client-go/kubernetes"
3332
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
3433
restclient "k8s.io/client-go/rest"
3534
"k8s.io/client-go/tools/clientcmd"
3635
"k8s.io/client-go/tools/record"
36+
cliflag "k8s.io/component-base/cli/flag"
3737
"k8s.io/klog"
3838
ccmconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config"
3939
ccmconfigscheme "k8s.io/kubernetes/cmd/cloud-controller-manager/app/apis/config/scheme"
@@ -124,8 +124,8 @@ func NewDefaultComponentConfig(insecurePort int32) (*ccmconfig.CloudControllerMa
124124
}
125125

126126
// Flags returns flags for a specific APIServer by section name
127-
func (o *CloudControllerManagerOptions) Flags(allControllers, disabledByDefaultControllers []string) apiserverflag.NamedFlagSets {
128-
fss := apiserverflag.NamedFlagSets{}
127+
func (o *CloudControllerManagerOptions) Flags(allControllers, disabledByDefaultControllers []string) cliflag.NamedFlagSets {
128+
fss := cliflag.NamedFlagSets{}
129129
o.Generic.AddFlags(&fss, allControllers, disabledByDefaultControllers)
130130
o.KubeCloudShared.AddFlags(fss.FlagSet("generic"))
131131
o.ServiceController.AddFlags(fss.FlagSet("service controller"))

‎cmd/controller-manager/app/options/BUILD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ go_library(
1717
"//pkg/cloudprovider/providers:go_default_library",
1818
"//pkg/controller/apis/config:go_default_library",
1919
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
20-
"//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library",
21-
"//staging/src/k8s.io/apiserver/pkg/util/globalflag:go_default_library",
20+
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
21+
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
2222
"//staging/src/k8s.io/component-base/config:go_default_library",
2323
"//vendor/github.com/spf13/pflag:go_default_library",
2424
],
@@ -43,8 +43,8 @@ go_test(
4343
srcs = ["globalflags_test.go"],
4444
embed = [":go_default_library"],
4545
deps = [
46-
"//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library",
47-
"//staging/src/k8s.io/apiserver/pkg/util/globalflag:go_default_library",
46+
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
47+
"//staging/src/k8s.io/component-base/cli/globalflag:go_default_library",
4848
"//vendor/github.com/spf13/pflag:go_default_library",
4949
],
5050
)

‎cmd/controller-manager/app/options/generic.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
"k8s.io/apimachinery/pkg/util/sets"
24-
apiserverflag "k8s.io/apiserver/pkg/util/flag"
24+
cliflag "k8s.io/component-base/cli/flag"
2525
componentbaseconfig "k8s.io/component-base/config"
2626
"k8s.io/kubernetes/pkg/client/leaderelectionconfig"
2727
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
@@ -48,7 +48,7 @@ func NewGenericControllerManagerConfigurationOptions(cfg *kubectrlmgrconfig.Gene
4848
}
4949

5050
// AddFlags adds flags related to generic for controller manager to the specified FlagSet.
51-
func (o *GenericControllerManagerConfigurationOptions) AddFlags(fss *apiserverflag.NamedFlagSets, allControllers, disabledByDefaultControllers []string) {
51+
func (o *GenericControllerManagerConfigurationOptions) AddFlags(fss *cliflag.NamedFlagSets, allControllers, disabledByDefaultControllers []string) {
5252
if o == nil {
5353
return
5454
}

‎cmd/controller-manager/app/options/globalflags.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package options
1919
import (
2020
"github.com/spf13/pflag"
2121

22-
"k8s.io/apiserver/pkg/util/globalflag"
22+
"k8s.io/component-base/cli/globalflag"
2323

2424
// ensure libs have a chance to globally register their flags
2525
_ "k8s.io/kubernetes/pkg/cloudprovider/providers"

‎cmd/controller-manager/app/options/globalflags_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ import (
2525

2626
"github.com/spf13/pflag"
2727

28-
apiserverflag "k8s.io/apiserver/pkg/util/flag"
29-
"k8s.io/apiserver/pkg/util/globalflag"
28+
cliflag "k8s.io/component-base/cli/flag"
29+
"k8s.io/component-base/cli/globalflag"
3030
)
3131

3232
func TestAddCustomGlobalFlags(t *testing.T) {
33-
namedFlagSets := &apiserverflag.NamedFlagSets{}
33+
namedFlagSets := &cliflag.NamedFlagSets{}
3434
// Note that we will register all flags (including klog flags) into the same
3535
// flag set. This allows us to test against all global flags from
3636
// flags.CommandLine.
@@ -45,7 +45,7 @@ func TestAddCustomGlobalFlags(t *testing.T) {
4545

4646
// Get all flags from flags.CommandLine, except flag `test.*`.
4747
wantedFlag := []string{"help"}
48-
pflag.CommandLine.SetNormalizeFunc(apiserverflag.WordSepNormalizeFunc)
48+
pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
4949
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
5050
pflag.VisitAll(func(flag *pflag.Flag) {
5151
if !strings.Contains(flag.Name, "test.") {

‎cmd/hyperkube/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ go_library(
2828
"//pkg/kubectl/cmd:go_default_library",
2929
"//pkg/version/prometheus:go_default_library",
3030
"//staging/src/k8s.io/apiserver/pkg/server:go_default_library",
31-
"//staging/src/k8s.io/apiserver/pkg/util/flag:go_default_library",
31+
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",
3232
"//staging/src/k8s.io/component-base/logs:go_default_library",
3333
"//vendor/github.com/spf13/cobra:go_default_library",
3434
"//vendor/github.com/spf13/pflag:go_default_library",

‎cmd/hyperkube/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"github.com/spf13/pflag"
3434

3535
"k8s.io/apiserver/pkg/server"
36-
utilflag "k8s.io/apiserver/pkg/util/flag"
36+
cliflag "k8s.io/component-base/cli/flag"
3737
"k8s.io/component-base/logs"
3838
cloudcontrollermanager "k8s.io/kubernetes/cmd/cloud-controller-manager/app"
3939
kubeapiserver "k8s.io/kubernetes/cmd/kube-apiserver/app"
@@ -52,11 +52,11 @@ func main() {
5252
hyperkubeCommand, allCommandFns := NewHyperKubeCommand(server.SetupSignalHandler())
5353

5454
// TODO: once we switch everything over to Cobra commands, we can go back to calling
55-
// utilflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
55+
// cliflag.InitFlags() (by removing its pflag.Parse() call). For now, we have to set the
5656
// normalize func and add the go flag set by hand.
57-
pflag.CommandLine.SetNormalizeFunc(utilflag.WordSepNormalizeFunc)
57+
pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
5858
pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
59-
// utilflag.InitFlags()
59+
// cliflag.InitFlags()
6060
logs.InitLogs()
6161
defer logs.FlushLogs()
6262

0 commit comments

Comments
 (0)