From 08ce6a0f148f51d69214cada6c560200b56792fe Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Tue, 16 Jan 2024 18:30:03 -0800 Subject: [PATCH] Get rid of gengo WithoutDefaultFlagParsing --- .../code-generator/cmd/applyconfiguration-gen/args/args.go | 2 +- staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go | 2 +- .../src/k8s.io/code-generator/cmd/conversion-gen/args/args.go | 2 +- staging/src/k8s.io/code-generator/cmd/deepcopy-gen/args/args.go | 2 +- .../src/k8s.io/code-generator/cmd/defaulter-gen/args/args.go | 2 +- staging/src/k8s.io/code-generator/cmd/import-boss/main.go | 2 +- staging/src/k8s.io/code-generator/cmd/informer-gen/args/args.go | 2 +- staging/src/k8s.io/code-generator/cmd/lister-gen/args/args.go | 2 +- .../code-generator/cmd/prerelease-lifecycle-gen/args/args.go | 2 +- staging/src/k8s.io/code-generator/cmd/register-gen/args/args.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/args/args.go index 5cf48ec5028..e05bf6aaf63 100644 --- a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/args/args.go @@ -48,7 +48,7 @@ type CustomArgs struct { // NewDefaults returns default arguments for the generator. func NewDefaults() (*args.GeneratorArgs, *CustomArgs) { - genericArgs := args.Default().WithoutDefaultFlagParsing() + genericArgs := args.Default() customArgs := &CustomArgs{ ExternalApplyConfigurations: map[types.Name]string{ // Always include the applyconfigurations we've generated in client-go. They are sufficient for the vast majority of use cases. diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go index 079137118a5..3467da348e7 100644 --- a/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/client-gen/args/args.go @@ -68,7 +68,7 @@ type CustomArgs struct { } func NewDefaults() (*args.GeneratorArgs, *CustomArgs) { - genericArgs := args.Default().WithoutDefaultFlagParsing() + genericArgs := args.Default() customArgs := &CustomArgs{ ClientsetName: "internalclientset", ClientsetAPIPath: "/apis", diff --git a/staging/src/k8s.io/code-generator/cmd/conversion-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/conversion-gen/args/args.go index 23ad21bd451..1001383e27f 100644 --- a/staging/src/k8s.io/code-generator/cmd/conversion-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/conversion-gen/args/args.go @@ -63,7 +63,7 @@ type CustomArgs struct { // NewDefaults returns default arguments for the generator. func NewDefaults() (*args.GeneratorArgs, *CustomArgs) { - genericArgs := args.Default().WithoutDefaultFlagParsing() + genericArgs := args.Default() customArgs := &CustomArgs{ BasePeerDirs: DefaultBasePeerDirs, SkipUnsafe: false, diff --git a/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/args/args.go index caeb0f90326..e884be8979f 100644 --- a/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/deepcopy-gen/args/args.go @@ -29,7 +29,7 @@ type CustomArgs generators.CustomArgs // NewDefaults returns default arguments for the generator. func NewDefaults() (*args.GeneratorArgs, *CustomArgs) { - genericArgs := args.Default().WithoutDefaultFlagParsing() + genericArgs := args.Default() customArgs := &CustomArgs{} genericArgs.CustomArgs = (*generators.CustomArgs)(customArgs) // convert to upstream type to make type-casts work there return genericArgs, customArgs diff --git a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/args/args.go index 07e808bd09e..de6221dc583 100644 --- a/staging/src/k8s.io/code-generator/cmd/defaulter-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/defaulter-gen/args/args.go @@ -29,7 +29,7 @@ type CustomArgs generators.CustomArgs // NewDefaults returns default arguments for the generator. func NewDefaults() (*args.GeneratorArgs, *CustomArgs) { - genericArgs := args.Default().WithoutDefaultFlagParsing() + genericArgs := args.Default() customArgs := &CustomArgs{} genericArgs.CustomArgs = (*generators.CustomArgs)(customArgs) // convert to upstream type to make type-casts work there return genericArgs, customArgs diff --git a/staging/src/k8s.io/code-generator/cmd/import-boss/main.go b/staging/src/k8s.io/code-generator/cmd/import-boss/main.go index 9df2cf19489..4efb7211fc4 100644 --- a/staging/src/k8s.io/code-generator/cmd/import-boss/main.go +++ b/staging/src/k8s.io/code-generator/cmd/import-boss/main.go @@ -30,7 +30,7 @@ import ( func main() { klog.InitFlags(nil) - arguments := args.Default().WithoutDefaultFlagParsing() + arguments := args.Default() pflag.CommandLine.BoolVar(&arguments.IncludeTestFiles, "include-test-files", false, "If true, include *_test.go files.") diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/args/args.go index 86680a21189..febb1d53568 100644 --- a/staging/src/k8s.io/code-generator/cmd/informer-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/args/args.go @@ -40,7 +40,7 @@ type CustomArgs struct { // NewDefaults returns default arguments for the generator. func NewDefaults() (*args.GeneratorArgs, *CustomArgs) { - genericArgs := args.Default().WithoutDefaultFlagParsing() + genericArgs := args.Default() customArgs := &CustomArgs{ SingleDirectory: false, PluralExceptions: []string{"Endpoints:Endpoints"}, diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/lister-gen/args/args.go index 2434ea070ba..1d67ff78839 100644 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/args/args.go @@ -36,7 +36,7 @@ type CustomArgs struct { // NewDefaults returns default arguments for the generator. func NewDefaults() (*args.GeneratorArgs, *CustomArgs) { - genericArgs := args.Default().WithoutDefaultFlagParsing() + genericArgs := args.Default() customArgs := &CustomArgs{ PluralExceptions: []string{"Endpoints:Endpoints"}, } diff --git a/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/args/args.go index 86fc223f111..f0849a843c6 100644 --- a/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/prerelease-lifecycle-gen/args/args.go @@ -29,7 +29,7 @@ type CustomArgs statusgenerators.CustomArgs // NewDefaults returns default arguments for the generator. func NewDefaults() (*args.GeneratorArgs, *CustomArgs) { - genericArgs := args.Default().WithoutDefaultFlagParsing() + genericArgs := args.Default() customArgs := &CustomArgs{} genericArgs.CustomArgs = (*statusgenerators.CustomArgs)(customArgs) // convert to upstream type to make type-casts work there return genericArgs, customArgs diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/args/args.go b/staging/src/k8s.io/code-generator/cmd/register-gen/args/args.go index 225341a8f1d..d03ecc817ad 100644 --- a/staging/src/k8s.io/code-generator/cmd/register-gen/args/args.go +++ b/staging/src/k8s.io/code-generator/cmd/register-gen/args/args.go @@ -30,7 +30,7 @@ type CustomArgs struct { // NewDefaults returns default arguments for the generator. func NewDefaults() *args.GeneratorArgs { - genericArgs := args.Default().WithoutDefaultFlagParsing() + genericArgs := args.Default() genericArgs.CustomArgs = &CustomArgs{} return genericArgs }