From d83175571d18cb747a037ed4e44dfa18afb1a254 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Sun, 13 Mar 2016 16:26:26 -0700 Subject: [PATCH 1/3] include the client-gen arguments in the generated files --- cmd/libs/go2idl/client-gen/args/args.go | 2 ++ .../go2idl/client-gen/generators/client_generator.go | 6 ++++++ cmd/libs/go2idl/client-gen/main.go | 10 ++++++++++ 3 files changed, 18 insertions(+) diff --git a/cmd/libs/go2idl/client-gen/args/args.go b/cmd/libs/go2idl/client-gen/args/args.go index cd325d061d6..af27a94cef1 100644 --- a/cmd/libs/go2idl/client-gen/args/args.go +++ b/cmd/libs/go2idl/client-gen/args/args.go @@ -41,4 +41,6 @@ type Args struct { ClientsetOnly bool // FakeClient determines if client-gen generates the fake clients. FakeClient bool + // CmdArgs is the command line arguments supplied when the client-gen is called. + CmdArgs string } diff --git a/cmd/libs/go2idl/client-gen/generators/client_generator.go b/cmd/libs/go2idl/client-gen/generators/client_generator.go index b7ca2f6994f..be5ebf8edbe 100644 --- a/cmd/libs/go2idl/client-gen/generators/client_generator.go +++ b/cmd/libs/go2idl/client-gen/generators/client_generator.go @@ -18,6 +18,7 @@ limitations under the License. package generators import ( + "fmt" "os" "path/filepath" "strings" @@ -153,6 +154,11 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat glog.Fatalf("cannot convert arguments.CustomArgs to clientgenargs.Args") } + if len(customArgs.CmdArgs) != 0 { + boilerplate = append(boilerplate, []byte(fmt.Sprintf("\n// This file is generated by client-gen with arguments: %s\n\n", customArgs.CmdArgs))...) + } else { + boilerplate = append(boilerplate, []byte(fmt.Sprintf("\n// This file is generated by client-gen with the default arguments.\n\n"))...) + } gvToTypes := map[unversioned.GroupVersion][]*types.Type{} for gv, inputDir := range customArgs.GroupVersionToInputPath { p := context.Universe.Package(inputDir) diff --git a/cmd/libs/go2idl/client-gen/main.go b/cmd/libs/go2idl/client-gen/main.go index 3098a38db68..9b9f0b63e89 100644 --- a/cmd/libs/go2idl/client-gen/main.go +++ b/cmd/libs/go2idl/client-gen/main.go @@ -74,6 +74,14 @@ func parseInputVersions() (paths []string, groupVersions []unversioned.GroupVers func main() { arguments := args.Default() flag.Parse() + var cmdArgs string + flag.VisitAll(func(f *flag.Flag) { + if !f.Changed { + return + } + cmdArgs = cmdArgs + fmt.Sprintf("--%s=%s ", f.Name, f.Value) + }) + dependencies := []string{ "k8s.io/kubernetes/pkg/fields", "k8s.io/kubernetes/pkg/labels", @@ -97,6 +105,7 @@ func main() { "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/", false, false, + cmdArgs, } } else { inputPath, groupVersions, gvToPath, err := parseInputVersions() @@ -119,6 +128,7 @@ func main() { *clientsetPath, *clientsetOnly, *fakeClient, + cmdArgs, } } From ec02dfc9f054dd9d951b4420a5d0395148c52189 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Sun, 13 Mar 2016 16:26:30 -0700 Subject: [PATCH 2/3] generated changes --- .../clientset_generated/test_internalclientset/clientset.go | 2 ++ .../go2idl/client-gen/testoutput/testgroup/unversioned/doc.go | 2 ++ .../testoutput/testgroup/unversioned/testgroup_client.go | 2 ++ .../client-gen/testoutput/testgroup/unversioned/testtype.go | 2 ++ pkg/client/clientset_generated/internalclientset/clientset.go | 2 ++ .../internalclientset/fake/clientset_generated.go | 2 ++ pkg/client/typed/generated/core/unversioned/componentstatus.go | 2 ++ pkg/client/typed/generated/core/unversioned/configmap.go | 2 ++ pkg/client/typed/generated/core/unversioned/core_client.go | 2 ++ pkg/client/typed/generated/core/unversioned/doc.go | 2 ++ pkg/client/typed/generated/core/unversioned/endpoints.go | 2 ++ pkg/client/typed/generated/core/unversioned/event.go | 2 ++ pkg/client/typed/generated/core/unversioned/fake/doc.go | 2 ++ .../generated/core/unversioned/fake/fake_componentstatus.go | 2 ++ .../typed/generated/core/unversioned/fake/fake_configmap.go | 2 ++ .../typed/generated/core/unversioned/fake/fake_core_client.go | 2 ++ .../typed/generated/core/unversioned/fake/fake_endpoints.go | 2 ++ pkg/client/typed/generated/core/unversioned/fake/fake_event.go | 2 ++ .../typed/generated/core/unversioned/fake/fake_limitrange.go | 2 ++ .../typed/generated/core/unversioned/fake/fake_namespace.go | 2 ++ pkg/client/typed/generated/core/unversioned/fake/fake_node.go | 2 ++ .../generated/core/unversioned/fake/fake_persistentvolume.go | 2 ++ .../core/unversioned/fake/fake_persistentvolumeclaim.go | 2 ++ pkg/client/typed/generated/core/unversioned/fake/fake_pod.go | 2 ++ .../typed/generated/core/unversioned/fake/fake_podtemplate.go | 2 ++ .../core/unversioned/fake/fake_replicationcontroller.go | 2 ++ .../typed/generated/core/unversioned/fake/fake_resourcequota.go | 2 ++ pkg/client/typed/generated/core/unversioned/fake/fake_secret.go | 2 ++ .../typed/generated/core/unversioned/fake/fake_service.go | 2 ++ .../generated/core/unversioned/fake/fake_serviceaccount.go | 2 ++ pkg/client/typed/generated/core/unversioned/limitrange.go | 2 ++ pkg/client/typed/generated/core/unversioned/namespace.go | 2 ++ pkg/client/typed/generated/core/unversioned/node.go | 2 ++ pkg/client/typed/generated/core/unversioned/persistentvolume.go | 2 ++ .../typed/generated/core/unversioned/persistentvolumeclaim.go | 2 ++ pkg/client/typed/generated/core/unversioned/pod.go | 2 ++ pkg/client/typed/generated/core/unversioned/podtemplate.go | 2 ++ .../typed/generated/core/unversioned/replicationcontroller.go | 2 ++ pkg/client/typed/generated/core/unversioned/resourcequota.go | 2 ++ pkg/client/typed/generated/core/unversioned/secret.go | 2 ++ pkg/client/typed/generated/core/unversioned/service.go | 2 ++ pkg/client/typed/generated/core/unversioned/serviceaccount.go | 2 ++ pkg/client/typed/generated/extensions/unversioned/daemonset.go | 2 ++ pkg/client/typed/generated/extensions/unversioned/deployment.go | 2 ++ pkg/client/typed/generated/extensions/unversioned/doc.go | 2 ++ .../typed/generated/extensions/unversioned/extensions_client.go | 2 ++ pkg/client/typed/generated/extensions/unversioned/fake/doc.go | 2 ++ .../generated/extensions/unversioned/fake/fake_daemonset.go | 2 ++ .../generated/extensions/unversioned/fake/fake_deployment.go | 2 ++ .../extensions/unversioned/fake/fake_extensions_client.go | 2 ++ .../extensions/unversioned/fake/fake_horizontalpodautoscaler.go | 2 ++ .../typed/generated/extensions/unversioned/fake/fake_ingress.go | 2 ++ .../typed/generated/extensions/unversioned/fake/fake_job.go | 2 ++ .../generated/extensions/unversioned/fake/fake_replicaset.go | 2 ++ .../typed/generated/extensions/unversioned/fake/fake_scale.go | 2 ++ .../extensions/unversioned/fake/fake_thirdpartyresource.go | 2 ++ .../generated/extensions/unversioned/horizontalpodautoscaler.go | 2 ++ pkg/client/typed/generated/extensions/unversioned/ingress.go | 2 ++ pkg/client/typed/generated/extensions/unversioned/job.go | 2 ++ pkg/client/typed/generated/extensions/unversioned/replicaset.go | 2 ++ pkg/client/typed/generated/extensions/unversioned/scale.go | 2 ++ .../generated/extensions/unversioned/thirdpartyresource.go | 2 ++ 62 files changed, 124 insertions(+) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go index 37f97595e36..7d5f7a25773 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/clientset.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with arguments: --test=true + package test_internalclientset import ( diff --git a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/doc.go b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/doc.go index 9300170400f..d36238bfa55 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/doc.go +++ b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/doc.go @@ -14,5 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with arguments: --test=true + // Package unversioned has the automatically generated clients for unversioned resources. package unversioned diff --git a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_client.go index 86dfe639cd6..9405acb11b0 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testgroup_client.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with arguments: --test=true + package unversioned import ( diff --git a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go index ec735a4e379..55d453737bc 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go +++ b/cmd/libs/go2idl/client-gen/testoutput/testgroup/unversioned/testtype.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with arguments: --test=true + package unversioned import ( diff --git a/pkg/client/clientset_generated/internalclientset/clientset.go b/pkg/client/clientset_generated/internalclientset/clientset.go index 599a0c40b29..1896268f36a 100644 --- a/pkg/client/clientset_generated/internalclientset/clientset.go +++ b/pkg/client/clientset_generated/internalclientset/clientset.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package internalclientset import ( diff --git a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go b/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go index 6c7f6313d82..066a5299a3a 100644 --- a/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go +++ b/pkg/client/clientset_generated/internalclientset/fake/clientset_generated.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/componentstatus.go b/pkg/client/typed/generated/core/unversioned/componentstatus.go index 0ef0667dad1..a7cb903d49d 100644 --- a/pkg/client/typed/generated/core/unversioned/componentstatus.go +++ b/pkg/client/typed/generated/core/unversioned/componentstatus.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/configmap.go b/pkg/client/typed/generated/core/unversioned/configmap.go index b43e53d6c44..a92a83fb5e0 100644 --- a/pkg/client/typed/generated/core/unversioned/configmap.go +++ b/pkg/client/typed/generated/core/unversioned/configmap.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/core_client.go b/pkg/client/typed/generated/core/unversioned/core_client.go index dc3561c0b49..24bb50ad348 100644 --- a/pkg/client/typed/generated/core/unversioned/core_client.go +++ b/pkg/client/typed/generated/core/unversioned/core_client.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/doc.go b/pkg/client/typed/generated/core/unversioned/doc.go index 9300170400f..3c8dbaac6dc 100644 --- a/pkg/client/typed/generated/core/unversioned/doc.go +++ b/pkg/client/typed/generated/core/unversioned/doc.go @@ -14,5 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + // Package unversioned has the automatically generated clients for unversioned resources. package unversioned diff --git a/pkg/client/typed/generated/core/unversioned/endpoints.go b/pkg/client/typed/generated/core/unversioned/endpoints.go index 78e2a08783e..2906afcac22 100644 --- a/pkg/client/typed/generated/core/unversioned/endpoints.go +++ b/pkg/client/typed/generated/core/unversioned/endpoints.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/event.go b/pkg/client/typed/generated/core/unversioned/event.go index 5627690a6a5..76dac816057 100644 --- a/pkg/client/typed/generated/core/unversioned/event.go +++ b/pkg/client/typed/generated/core/unversioned/event.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/doc.go b/pkg/client/typed/generated/core/unversioned/fake/doc.go index dd6d4da715a..ea86647e278 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/doc.go +++ b/pkg/client/typed/generated/core/unversioned/fake/doc.go @@ -14,5 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_componentstatus.go b/pkg/client/typed/generated/core/unversioned/fake/fake_componentstatus.go index 478dd9dbf37..3166f3f1693 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_componentstatus.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_componentstatus.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_configmap.go b/pkg/client/typed/generated/core/unversioned/fake/fake_configmap.go index 34fa0b229bb..5e061886979 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_configmap.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_configmap.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_core_client.go b/pkg/client/typed/generated/core/unversioned/fake/fake_core_client.go index afc6cf6f902..79dcfa930b0 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_core_client.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_core_client.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_endpoints.go b/pkg/client/typed/generated/core/unversioned/fake/fake_endpoints.go index cc25b6e06cb..1ef9ad7271a 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_endpoints.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_endpoints.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_event.go b/pkg/client/typed/generated/core/unversioned/fake/fake_event.go index a9f88153bc7..13f9ecc13bc 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_event.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_event.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_limitrange.go b/pkg/client/typed/generated/core/unversioned/fake/fake_limitrange.go index cab44ce4ee3..f57b279ff5a 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_limitrange.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_limitrange.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_namespace.go b/pkg/client/typed/generated/core/unversioned/fake/fake_namespace.go index 78933814f7e..d1ba1d56d94 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_namespace.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_namespace.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_node.go b/pkg/client/typed/generated/core/unversioned/fake/fake_node.go index 8761c8772cc..631808aaf7b 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_node.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_node.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_persistentvolume.go b/pkg/client/typed/generated/core/unversioned/fake/fake_persistentvolume.go index d3d8c79f52d..c4a05fb642f 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_persistentvolume.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_persistentvolume.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_persistentvolumeclaim.go b/pkg/client/typed/generated/core/unversioned/fake/fake_persistentvolumeclaim.go index ba674f269af..e00d2ce0349 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_persistentvolumeclaim.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_persistentvolumeclaim.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_pod.go b/pkg/client/typed/generated/core/unversioned/fake/fake_pod.go index 6488c021d0a..096602f37d6 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_pod.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_pod.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_podtemplate.go b/pkg/client/typed/generated/core/unversioned/fake/fake_podtemplate.go index b900a113c60..9dd400aa6ce 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_podtemplate.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_podtemplate.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_replicationcontroller.go b/pkg/client/typed/generated/core/unversioned/fake/fake_replicationcontroller.go index 205f094565a..dd9ac1605a7 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_replicationcontroller.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_replicationcontroller.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_resourcequota.go b/pkg/client/typed/generated/core/unversioned/fake/fake_resourcequota.go index 056e61ed55e..663a884b6a9 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_resourcequota.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_resourcequota.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_secret.go b/pkg/client/typed/generated/core/unversioned/fake/fake_secret.go index 2f09be6e5e8..bf0b323b795 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_secret.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_secret.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_service.go b/pkg/client/typed/generated/core/unversioned/fake/fake_service.go index 2cf38901c5c..a8ab2d8a428 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_service.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_service.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/fake/fake_serviceaccount.go b/pkg/client/typed/generated/core/unversioned/fake/fake_serviceaccount.go index 61d7a04f5eb..db5672eaf25 100644 --- a/pkg/client/typed/generated/core/unversioned/fake/fake_serviceaccount.go +++ b/pkg/client/typed/generated/core/unversioned/fake/fake_serviceaccount.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/core/unversioned/limitrange.go b/pkg/client/typed/generated/core/unversioned/limitrange.go index 86cc9b07fa7..c1dde41093a 100644 --- a/pkg/client/typed/generated/core/unversioned/limitrange.go +++ b/pkg/client/typed/generated/core/unversioned/limitrange.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/namespace.go b/pkg/client/typed/generated/core/unversioned/namespace.go index c1c8b450693..f4f82889ef7 100644 --- a/pkg/client/typed/generated/core/unversioned/namespace.go +++ b/pkg/client/typed/generated/core/unversioned/namespace.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/node.go b/pkg/client/typed/generated/core/unversioned/node.go index b0c53ef1d4b..3e63de62e29 100644 --- a/pkg/client/typed/generated/core/unversioned/node.go +++ b/pkg/client/typed/generated/core/unversioned/node.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/persistentvolume.go b/pkg/client/typed/generated/core/unversioned/persistentvolume.go index 6b4d0f017fb..4093dd88f7d 100644 --- a/pkg/client/typed/generated/core/unversioned/persistentvolume.go +++ b/pkg/client/typed/generated/core/unversioned/persistentvolume.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/persistentvolumeclaim.go b/pkg/client/typed/generated/core/unversioned/persistentvolumeclaim.go index 2f5b1743736..cc90987890a 100644 --- a/pkg/client/typed/generated/core/unversioned/persistentvolumeclaim.go +++ b/pkg/client/typed/generated/core/unversioned/persistentvolumeclaim.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/pod.go b/pkg/client/typed/generated/core/unversioned/pod.go index 1cdfc8e714b..e84dad71719 100644 --- a/pkg/client/typed/generated/core/unversioned/pod.go +++ b/pkg/client/typed/generated/core/unversioned/pod.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/podtemplate.go b/pkg/client/typed/generated/core/unversioned/podtemplate.go index cccef29f718..426f2ff78f9 100644 --- a/pkg/client/typed/generated/core/unversioned/podtemplate.go +++ b/pkg/client/typed/generated/core/unversioned/podtemplate.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/replicationcontroller.go b/pkg/client/typed/generated/core/unversioned/replicationcontroller.go index 6f9f06625ad..1d4dd0f4ca7 100644 --- a/pkg/client/typed/generated/core/unversioned/replicationcontroller.go +++ b/pkg/client/typed/generated/core/unversioned/replicationcontroller.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/resourcequota.go b/pkg/client/typed/generated/core/unversioned/resourcequota.go index 2d0da73fb3a..7ccba4faff5 100644 --- a/pkg/client/typed/generated/core/unversioned/resourcequota.go +++ b/pkg/client/typed/generated/core/unversioned/resourcequota.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/secret.go b/pkg/client/typed/generated/core/unversioned/secret.go index 101fbdb54e5..c57374cf46f 100644 --- a/pkg/client/typed/generated/core/unversioned/secret.go +++ b/pkg/client/typed/generated/core/unversioned/secret.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/service.go b/pkg/client/typed/generated/core/unversioned/service.go index 006f601c271..6156418c70a 100644 --- a/pkg/client/typed/generated/core/unversioned/service.go +++ b/pkg/client/typed/generated/core/unversioned/service.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/core/unversioned/serviceaccount.go b/pkg/client/typed/generated/core/unversioned/serviceaccount.go index 65f7df2638e..26841f17d4d 100644 --- a/pkg/client/typed/generated/core/unversioned/serviceaccount.go +++ b/pkg/client/typed/generated/core/unversioned/serviceaccount.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/daemonset.go b/pkg/client/typed/generated/extensions/unversioned/daemonset.go index 96dae5835a2..cc9ac7922da 100644 --- a/pkg/client/typed/generated/extensions/unversioned/daemonset.go +++ b/pkg/client/typed/generated/extensions/unversioned/daemonset.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/deployment.go b/pkg/client/typed/generated/extensions/unversioned/deployment.go index 3b995c02161..7606a9e7955 100644 --- a/pkg/client/typed/generated/extensions/unversioned/deployment.go +++ b/pkg/client/typed/generated/extensions/unversioned/deployment.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/doc.go b/pkg/client/typed/generated/extensions/unversioned/doc.go index 9300170400f..3c8dbaac6dc 100644 --- a/pkg/client/typed/generated/extensions/unversioned/doc.go +++ b/pkg/client/typed/generated/extensions/unversioned/doc.go @@ -14,5 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + // Package unversioned has the automatically generated clients for unversioned resources. package unversioned diff --git a/pkg/client/typed/generated/extensions/unversioned/extensions_client.go b/pkg/client/typed/generated/extensions/unversioned/extensions_client.go index 220dd69b5cd..27ceffad23e 100644 --- a/pkg/client/typed/generated/extensions/unversioned/extensions_client.go +++ b/pkg/client/typed/generated/extensions/unversioned/extensions_client.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/doc.go b/pkg/client/typed/generated/extensions/unversioned/fake/doc.go index dd6d4da715a..ea86647e278 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/doc.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/doc.go @@ -14,5 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + // Package fake has the automatically generated clients. package fake diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/fake_daemonset.go b/pkg/client/typed/generated/extensions/unversioned/fake/fake_daemonset.go index 7de9f927f77..b7af8804fa0 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/fake_daemonset.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/fake_daemonset.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/fake_deployment.go b/pkg/client/typed/generated/extensions/unversioned/fake/fake_deployment.go index 748968a9dbf..6ce396e8d03 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/fake_deployment.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/fake_deployment.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/fake_extensions_client.go b/pkg/client/typed/generated/extensions/unversioned/fake/fake_extensions_client.go index 2f7fb042385..22a72069411 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/fake_extensions_client.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/fake_extensions_client.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/fake_horizontalpodautoscaler.go b/pkg/client/typed/generated/extensions/unversioned/fake/fake_horizontalpodautoscaler.go index 71b5cf322de..5384b69a874 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/fake_horizontalpodautoscaler.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/fake_horizontalpodautoscaler.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/fake_ingress.go b/pkg/client/typed/generated/extensions/unversioned/fake/fake_ingress.go index a331644e47c..2c2123aa671 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/fake_ingress.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/fake_ingress.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/fake_job.go b/pkg/client/typed/generated/extensions/unversioned/fake/fake_job.go index c1875c006be..2cd903d9cf6 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/fake_job.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/fake_job.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/fake_replicaset.go b/pkg/client/typed/generated/extensions/unversioned/fake/fake_replicaset.go index d861326b7c9..61280d18ae9 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/fake_replicaset.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/fake_replicaset.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/fake_scale.go b/pkg/client/typed/generated/extensions/unversioned/fake/fake_scale.go index d2cfc5f7b78..f22cfb656df 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/fake_scale.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/fake_scale.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake // FakeScales implements ScaleInterface diff --git a/pkg/client/typed/generated/extensions/unversioned/fake/fake_thirdpartyresource.go b/pkg/client/typed/generated/extensions/unversioned/fake/fake_thirdpartyresource.go index 9a005d57089..a18970fde5b 100644 --- a/pkg/client/typed/generated/extensions/unversioned/fake/fake_thirdpartyresource.go +++ b/pkg/client/typed/generated/extensions/unversioned/fake/fake_thirdpartyresource.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package fake import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go b/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go index 2cffcee4656..171ffde3c4b 100644 --- a/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go +++ b/pkg/client/typed/generated/extensions/unversioned/horizontalpodautoscaler.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/ingress.go b/pkg/client/typed/generated/extensions/unversioned/ingress.go index a9d950eae89..eb8896b17f2 100644 --- a/pkg/client/typed/generated/extensions/unversioned/ingress.go +++ b/pkg/client/typed/generated/extensions/unversioned/ingress.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/job.go b/pkg/client/typed/generated/extensions/unversioned/job.go index 04d0d128235..df88328dc83 100644 --- a/pkg/client/typed/generated/extensions/unversioned/job.go +++ b/pkg/client/typed/generated/extensions/unversioned/job.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/replicaset.go b/pkg/client/typed/generated/extensions/unversioned/replicaset.go index 6257fd8981e..a9ef43149ae 100644 --- a/pkg/client/typed/generated/extensions/unversioned/replicaset.go +++ b/pkg/client/typed/generated/extensions/unversioned/replicaset.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( diff --git a/pkg/client/typed/generated/extensions/unversioned/scale.go b/pkg/client/typed/generated/extensions/unversioned/scale.go index 7e54bc34743..e568ad48333 100644 --- a/pkg/client/typed/generated/extensions/unversioned/scale.go +++ b/pkg/client/typed/generated/extensions/unversioned/scale.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned // ScalesGetter has a method to return a ScaleInterface. diff --git a/pkg/client/typed/generated/extensions/unversioned/thirdpartyresource.go b/pkg/client/typed/generated/extensions/unversioned/thirdpartyresource.go index 0f1026fab52..9eaad859a9c 100644 --- a/pkg/client/typed/generated/extensions/unversioned/thirdpartyresource.go +++ b/pkg/client/typed/generated/extensions/unversioned/thirdpartyresource.go @@ -14,6 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. */ +// This file is generated by client-gen with the default arguments. + package unversioned import ( From f5ed9b3cd9a4e5c28fd0be56b6b4c59e535e9a1c Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Sun, 13 Mar 2016 18:31:05 -0700 Subject: [PATCH 3/3] ignore verify-only flag --- cmd/libs/go2idl/client-gen/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/libs/go2idl/client-gen/main.go b/cmd/libs/go2idl/client-gen/main.go index 9b9f0b63e89..3f1004aad9a 100644 --- a/cmd/libs/go2idl/client-gen/main.go +++ b/cmd/libs/go2idl/client-gen/main.go @@ -76,7 +76,7 @@ func main() { flag.Parse() var cmdArgs string flag.VisitAll(func(f *flag.Flag) { - if !f.Changed { + if !f.Changed || f.Name == "verify-only" { return } cmdArgs = cmdArgs + fmt.Sprintf("--%s=%s ", f.Name, f.Value)