Skip to content

Commit

Permalink
handle kube-gen rename
Browse files Browse the repository at this point in the history
  • Loading branch information
deads2k committed Sep 11, 2017
1 parent 04d6301 commit 467b512
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 29 deletions.
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" "$@"
14 changes: 7 additions & 7 deletions pkg/openapi/zz_generated.openapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -12948,7 +12948,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
},
Dependencies: []string{},
},
"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestType": {
"k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestType": {
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Properties: map[string]spec.Schema{
Expand All @@ -12968,16 +12968,16 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
},
"status": {
SchemaProps: spec.SchemaProps{
Ref: ref("k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus"),
Ref: ref("k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus"),
},
},
},
},
},
Dependencies: []string{
"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus"},
"k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus"},
},
"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestTypeList": {
"k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestTypeList": {
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Properties: map[string]spec.Schema{
Expand Down Expand Up @@ -13006,7 +13006,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
Items: &spec.SchemaOrArray{
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Ref: ref("k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestType"),
Ref: ref("k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestType"),
},
},
},
Expand All @@ -13017,9 +13017,9 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
},
},
Dependencies: []string{
"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestType"},
"k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta", "k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestType"},
},
"k8s.io/kube-gen/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus": {
"k8s.io/code-generator/cmd/client-gen/test_apis/testgroup/v1.TestTypeStatus": {
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Properties: map[string]spec.Schema{
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

0 comments on commit 467b512

Please sign in to comment.