Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename kube-gen to code-generator for syncs and picks #16288

Merged
merged 3 commits into from
Sep 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion hack/update-generated-clientsets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
2 changes: 1 addition & 1 deletion hack/update-generated-informers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
2 changes: 1 addition & 1 deletion hack/update-generated-listers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
2 changes: 1 addition & 1 deletion hack/update-generated-protobuf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" "$@"
174 changes: 87 additions & 87 deletions pkg/openapi/zz_generated.openapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion tools/genconversion/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion tools/genopenapi/openapi.go
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion tools/genprotobuf/protobuf.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
1 change: 1 addition & 0 deletions vendor/k8s.io/code-generator

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/k8s.io/kube-gen

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/k8s.io/kubernetes/pkg/generated/openapi/BUILD

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/k8s.io/kubernetes/pkg/generated/openapi/def.bzl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/k8s.io/kubernetes/staging/prime-apimachinery.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading