From d6ebac0a28f33f5278aed7ec1e3336c826d34583 Mon Sep 17 00:00:00 2001 From: David Eads Date: Mon, 11 Sep 2017 15:46:18 -0400 Subject: [PATCH] handle kube-gen rename --- Godeps/Godeps.json | 30 ++--- hack/update-generated-clientsets.sh | 2 +- hack/update-generated-informers.sh | 2 +- hack/update-generated-listers.sh | 2 +- hack/update-generated-protobuf.sh | 2 +- pkg/openapi/zz_generated.openapi.go | 174 ++++++++++++++-------------- tools/genconversion/conversion.go | 2 +- tools/genopenapi/openapi.go | 2 +- tools/genprotobuf/protobuf.go | 2 +- 9 files changed, 109 insertions(+), 109 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 526a09982563..4cd76bcf84dd 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -7,8 +7,8 @@ "github.com/golang/mock/gomock", "github.com/containernetworking/cni/plugins/ipam/host-local", "github.com/containernetworking/cni/plugins/main/loopback", - "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo", - "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/client-gen", + "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo", + "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen", "k8s.io/kubernetes/pkg/api/testing/compat", "k8s.io/kubernetes/test/e2e/generated", "github.com/onsi/ginkgo/ginkgo", @@ -5813,67 +5813,67 @@ "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/client-gen", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/client-gen/args", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/args", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/client-gen/generators", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/generators", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/fake", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/scheme", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/generators/scheme", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/client-gen/path", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/path", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/client-gen/types", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/types", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/conversion-gen/generators", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/conversion-gen/generators", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protobuf", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/go-to-protobuf/protoc-gen-gogo", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protoc-gen-gogo", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/informer-gen/generators", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/informer-gen/generators", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/lister-gen/generators", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, { - "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/kube-gen/cmd/openapi-gen/generators", + "ImportPath": "k8s.io/kubernetes/staging/src/k8s.io/code-generator/cmd/openapi-gen/generators", "Comment": "v1.7.0-144-g80709908fd", "Rev": "930b5c4b2db777e7ece981d84e9430808feceb4c" }, diff --git a/hack/update-generated-clientsets.sh b/hack/update-generated-clientsets.sh index 135e26fe05ac..11e7cbb79fb5 100755 --- 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 index 5f7175639ed1..5e91f810ee8c 100755 --- 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 index 12e9ef4638cd..a406c908a5ca 100755 --- 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 index ff94893f0380..8f42587e6b6b 100755 --- 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 index f2a292322201..caedf7ea1747 100644 --- 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 index 02a7c4cfd5a2..bf9699777562 100644 --- 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 index 93729d10d265..6c560e1b882c 100644 --- 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 index 9b02604712cf..26d1e601e74c 100644 --- 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" )