Merge pull request #16288 from deads2k/client-03-generator

Automatic merge from submit-queue rename kube-gen to code-generator for syncs and picks kube-gen got renamed upstead to code-generator and we need to match to make picks work and to push out to a sync repo, which I need for client-go generation.
openshift · Sep 12, 2017 · 3d2f5f8 · 3d2f5f8
2 parents 6cec671 + d6ebac0
commit 3d2f5f8
Show file tree

Hide file tree

Showing 112 changed files with 200 additions and 200 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/hack/update-generated-clientsets.sh b/hack/update-generated-clientsets.sh
@@ -3,7 +3,7 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
 os::build::setup_env
 
-os::util::ensure::built_binary_exists 'client-gen' 'vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/client-gen'
+os::util::ensure::built_binary_exists 'client-gen' 'vendor/k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen'
 
 # list of package to generate client set for
 packages=(

diff --git a/hack/update-generated-informers.sh b/hack/update-generated-informers.sh
@@ -3,7 +3,7 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
 os::build::setup_env
 
-os::util::ensure::built_binary_exists 'informer-gen' 'vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/informer-gen'
+os::util::ensure::built_binary_exists 'informer-gen' 'vendor/k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/informer-gen'
 
 # list of package to generate informers for
 packages=(

diff --git a/hack/update-generated-listers.sh b/hack/update-generated-listers.sh
@@ -3,7 +3,7 @@ source "$(dirname "${BASH_SOURCE}")/lib/init.sh"
 
 os::build::setup_env
 
-os::util::ensure::built_binary_exists 'lister-gen' 'vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/lister-gen'
+os::util::ensure::built_binary_exists 'lister-gen' 'vendor/k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/lister-gen'
 
 # list of package to generate listers for
 packages=(

diff --git a/hack/update-generated-protobuf.sh b/hack/update-generated-protobuf.sh
@@ -20,6 +20,6 @@ os::util::ensure::gopath_binary_exists 'goimports'
 os::build::setup_env
 
 os::util::ensure::built_binary_exists 'genprotobuf'
-os::util::ensure::built_binary_exists 'protoc-gen-gogo' vendor/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo
+os::util::ensure::built_binary_exists 'protoc-gen-gogo' vendor/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo
 
 genprotobuf --output-base="${GOPATH}/src" "$@"
diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go
@@ -12704,6 +12704,93 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
 			Dependencies: []string{
 				"k8s.io/apiserver/pkg/apis/audit/v1alpha1.GroupResources"},
 		},
+		"k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestType": {
+			Schema: spec.Schema{
+				SchemaProps: spec.SchemaProps{
+					Properties: map[string]spec.Schema{
+						"kind": {
+							SchemaProps: spec.SchemaProps{
+								Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds",
+								Type:        []string{"string"},
+								Format:      "",
+							},
+						},
+						"apiVersion": {
+							SchemaProps: spec.SchemaProps{
+								Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
+								Type:        []string{"string"},
+								Format:      "",
+							},
+						},
+						"status": {
+							SchemaProps: spec.SchemaProps{
+								Ref: ref("k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus"),
+							},
+						},
+					},
+				},
+			},
+			Dependencies: []string{
+				"k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus"},
+		},
+		"k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestTypeList": {
+			Schema: spec.Schema{
+				SchemaProps: spec.SchemaProps{
+					Properties: map[string]spec.Schema{
+						"kind": {
+							SchemaProps: spec.SchemaProps{
+								Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds",
+								Type:        []string{"string"},
+								Format:      "",
+							},
+						},
+						"apiVersion": {
+							SchemaProps: spec.SchemaProps{
+								Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
+								Type:        []string{"string"},
+								Format:      "",
+							},
+						},
+						"metadata": {
+							SchemaProps: spec.SchemaProps{
+								Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
+							},
+						},
+						"items": {
+							SchemaProps: spec.SchemaProps{
+								Type: []string{"array"},
+								Items: &spec.SchemaOrArray{
+									Schema: &spec.Schema{
+										SchemaProps: spec.SchemaProps{
+											Ref: ref("k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestType"),
+										},
+									},
+								},
+							},
+						},
+					},
+					Required: []string{"items"},
+				},
+			},
+			Dependencies: []string{
+				"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestType"},
+		},
+		"k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus": {
+			Schema: spec.Schema{
+				SchemaProps: spec.SchemaProps{
+					Properties: map[string]spec.Schema{
+						"Blah": {
+							SchemaProps: spec.SchemaProps{
+								Type:   []string{"string"},
+								Format: "",
+							},
+						},
+					},
+					Required: []string{"Blah"},
+				},
+			},
+			Dependencies: []string{},
+		},
 		"k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1.APIService": {
 			Schema: spec.Schema{
 				SchemaProps: spec.SchemaProps{
@@ -12948,93 +13035,6 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
 			},
 			Dependencies: []string{},
 		},
-		"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestType": {
-			Schema: spec.Schema{
-				SchemaProps: spec.SchemaProps{
-					Properties: map[string]spec.Schema{
-						"kind": {
-							SchemaProps: spec.SchemaProps{
-								Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds",
-								Type:        []string{"string"},
-								Format:      "",
-							},
-						},
-						"apiVersion": {
-							SchemaProps: spec.SchemaProps{
-								Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
-								Type:        []string{"string"},
-								Format:      "",
-							},
-						},
-						"status": {
-							SchemaProps: spec.SchemaProps{
-								Ref: ref("k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus"),
-							},
-						},
-					},
-				},
-			},
-			Dependencies: []string{
-				"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus"},
-		},
-		"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestTypeList": {
-			Schema: spec.Schema{
-				SchemaProps: spec.SchemaProps{
-					Properties: map[string]spec.Schema{
-						"kind": {
-							SchemaProps: spec.SchemaProps{
-								Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds",
-								Type:        []string{"string"},
-								Format:      "",
-							},
-						},
-						"apiVersion": {
-							SchemaProps: spec.SchemaProps{
-								Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
-								Type:        []string{"string"},
-								Format:      "",
-							},
-						},
-						"metadata": {
-							SchemaProps: spec.SchemaProps{
-								Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"),
-							},
-						},
-						"items": {
-							SchemaProps: spec.SchemaProps{
-								Type: []string{"array"},
-								Items: &spec.SchemaOrArray{
-									Schema: &spec.Schema{
-										SchemaProps: spec.SchemaProps{
-											Ref: ref("k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestType"),
-										},
-									},
-								},
-							},
-						},
-					},
-					Required: []string{"items"},
-				},
-			},
-			Dependencies: []string{
-				"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestType"},
-		},
-		"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus": {
-			Schema: spec.Schema{
-				SchemaProps: spec.SchemaProps{
-					Properties: map[string]spec.Schema{
-						"Blah": {
-							SchemaProps: spec.SchemaProps{
-								Type:   []string{"string"},
-								Format: "",
-							},
-						},
-					},
-					Required: []string{"Blah"},
-				},
-			},
-			Dependencies: []string{},
-		},
 		"k8s.io/kubernetes/federation/apis/federation/v1beta1.Cluster": {
 			Schema: spec.Schema{
 				SchemaProps: spec.SchemaProps{

diff --git a/tools/genconversion/conversion.go b/tools/genconversion/conversion.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/gengo/args"
 	"k8s.io/gengo/generator"
 
-	"k8s.io/kube-gen/cmd/conversion-gen/generators"
+	"k8s.io/code-generator/cmd/conversion-gen/generators"
 )
 
 func main() {

diff --git a/tools/genopenapi/openapi.go b/tools/genopenapi/openapi.go
@@ -1,8 +1,8 @@
 package main
 
 import (
+	"k8s.io/code-generator/cmd/openapi-gen/generators"
 	"k8s.io/gengo/args"
-	"k8s.io/kube-gen/cmd/openapi-gen/generators"
 
 	"github.com/golang/glog"
 )

diff --git a/tools/genprotobuf/protobuf.go b/tools/genprotobuf/protobuf.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"k8s.io/code-generator/cmd/go-to-protobuf/protobuf"
 	"k8s.io/gengo/args"
-	"k8s.io/kube-gen/cmd/go-to-protobuf/protobuf"
 
 	flag "github.com/spf13/pflag"
 )

diff --git a/vendor/k8s.io/code-generator b/vendor/k8s.io/code-generator
diff --git a/vendor/k8s.io/kube-gen b/vendor/k8s.io/kube-gen
diff --git a/vendor/k8s.io/kubernetes/pkg/generated/openapi/BUILD b/vendor/k8s.io/kubernetes/pkg/generated/openapi/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/generated/openapi/def.bzl b/vendor/k8s.io/kubernetes/pkg/generated/openapi/def.bzl
diff --git a/vendor/k8s.io/kubernetes/staging/prime-apimachinery.sh b/vendor/k8s.io/kubernetes/staging/prime-apimachinery.sh
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh