Merge pull request #88655 from soltysh/deprecate_generator

Deprecate --generator flag from kubectl create commands

Kubernetes-commit: b9696133ffe5a2ae0c7869753a5096419cd3b62c
This commit is contained in:
Kubernetes Publisher 2020-03-03 12:17:01 -08:00
commit 9235667978
4 changed files with 13 additions and 12 deletions

6
Godeps/Godeps.json generated
View file

@ -568,11 +568,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "8f54d34188b0"
"Rev": "8661bc967ba8"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "b9f0d37e94c6"
"Rev": "6584f51ae935"
},
{
"ImportPath": "k8s.io/cli-runtime",
@ -580,7 +580,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "ca7edf3d8a93"
"Rev": "eb0bad8167df"
},
{
"ImportPath": "k8s.io/code-generator",

12
go.mod
View file

@ -36,10 +36,10 @@ require (
golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7
gopkg.in/yaml.v2 v2.2.8
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20200302082247-8f54d34188b0
k8s.io/apimachinery v0.0.0-20200302045842-b9f0d37e94c6
k8s.io/api v0.0.0-20200303042250-8661bc967ba8
k8s.io/apimachinery v0.0.0-20200303201514-6584f51ae935
k8s.io/cli-runtime v0.0.0-20200221172330-03707b9714f9
k8s.io/client-go v0.0.0-20200302082525-ca7edf3d8a93
k8s.io/client-go v0.0.0-20200303162532-eb0bad8167df
k8s.io/component-base v0.0.0-20200302162701-77f056ceea66
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
@ -53,10 +53,10 @@ require (
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20200302082247-8f54d34188b0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200302045842-b9f0d37e94c6
k8s.io/api => k8s.io/api v0.0.0-20200303042250-8661bc967ba8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200303201514-6584f51ae935
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200221172330-03707b9714f9
k8s.io/client-go => k8s.io/client-go v0.0.0-20200302082525-ca7edf3d8a93
k8s.io/client-go => k8s.io/client-go v0.0.0-20200303162532-eb0bad8167df
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c
k8s.io/component-base => k8s.io/component-base v0.0.0-20200302162701-77f056ceea66
k8s.io/metrics => k8s.io/metrics v0.0.0-20200229084100-9a31b1dece01

6
go.sum
View file

@ -306,10 +306,10 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200302082247-8f54d34188b0/go.mod h1:+2jnw1NMpdXlVDlcy5KjXl7Gh4M0HZ0AhKakQo+KiV8=
k8s.io/apimachinery v0.0.0-20200302045842-b9f0d37e94c6/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4=
k8s.io/api v0.0.0-20200303042250-8661bc967ba8/go.mod h1:+2jnw1NMpdXlVDlcy5KjXl7Gh4M0HZ0AhKakQo+KiV8=
k8s.io/apimachinery v0.0.0-20200303201514-6584f51ae935/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4=
k8s.io/cli-runtime v0.0.0-20200221172330-03707b9714f9/go.mod h1:jFVnu9CV5hIeRRksJ7Tt7Uo+k7nXrLmHlLDSZT+lSsw=
k8s.io/client-go v0.0.0-20200302082525-ca7edf3d8a93/go.mod h1:2DzSdhxUXsi3Ln8q5B+GHLG6b2cQN64WNsTnBYZ8Y4Y=
k8s.io/client-go v0.0.0-20200303162532-eb0bad8167df/go.mod h1:f3OvjVgLfl47XmS3B0Ajl6SOZOsHRqC+j9b7JOyW3iU=
k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/component-base v0.0.0-20200302162701-77f056ceea66/go.mod h1:TFzve7JW8Nl3KjrLk5oj8UA+qvh04n0NuTOciggyn1s=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

View file

@ -452,6 +452,7 @@ func AddApplyAnnotationVarFlags(cmd *cobra.Command, applyAnnotation *bool) {
// TODO: need to take a pass at other generator commands to use this set of flags
func AddGeneratorFlags(cmd *cobra.Command, defaultGenerator string) {
cmd.Flags().String("generator", defaultGenerator, "The name of the API generator to use.")
cmd.Flags().MarkDeprecated("generator", "has no effect and will be removed in the future.")
AddDryRunFlag(cmd)
}