github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Update code generators

Browse Source
This commit is contained in:
jennybuckley 2018-02-26 16:22:51 -08:00
parent bae03aefd7
commit 5dd19232a0
6 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
View File

@ -40,7 +40,7 @@ function cleanup {
trap cleanup EXIT trap cleanup EXIT
echo "Building client-gen" echo "Building client-gen"
CLIENTGEN="${PWD}/client-gen-binary" CLIENTGEN="${PWD}/client-gen"
go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen
PREFIX=k8s.io/apiextensions-apiserver/pkg/apis PREFIX=k8s.io/apiextensions-apiserver/pkg/apis

1
staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
View File

@ -193,7 +193,6 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
packages := generator.Packages{} packages := generator.Packages{}
header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...) header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
header = append(header, []byte("\n// This file was autogenerated by conversion-gen. Do not edit it manually!\n\n")...)
// Accumulate pre-existing conversion functions. // Accumulate pre-existing conversion functions.
// TODO: This is too ad-hoc. We need a better way. // TODO: This is too ad-hoc. We need a better way.

8
staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go
View File

@ -62,12 +62,6 @@ func DefaultNameSystem() string {
return "public" return "public"
} }
// generatedBy returns information about the arguments used to invoke
// lister-gen.
func generatedBy() string {
return fmt.Sprintf("\n// This file was automatically generated by informer-gen\n\n")
}
// objectMetaForPackage returns the type of ObjectMeta used by package p. // objectMetaForPackage returns the type of ObjectMeta used by package p.
func objectMetaForPackage(p *types.Package) (*types.Type, bool, error) { func objectMetaForPackage(p *types.Package) (*types.Type, bool, error) {
generatingForPackage := false generatingForPackage := false
@ -111,8 +105,6 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
glog.Fatalf("Failed loading boilerplate: %v", err) glog.Fatalf("Failed loading boilerplate: %v", err)
} }
boilerplate = append(boilerplate, []byte(generatedBy())...)
customArgs, ok := arguments.CustomArgs.(*informergenargs.CustomArgs) customArgs, ok := arguments.CustomArgs.(*informergenargs.CustomArgs)
if !ok { if !ok {
glog.Fatalf("Wrong CustomArgs type: %T", arguments.CustomArgs) glog.Fatalf("Wrong CustomArgs type: %T", arguments.CustomArgs)

8
staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go
View File

@ -62,12 +62,6 @@ func DefaultNameSystem() string {
return "public" return "public"
} }
// generatedBy returns information about the arguments used to invoke
// lister-gen.
func generatedBy() string {
return fmt.Sprintf("\n// This file was automatically generated by lister-gen\n\n")
}
// Packages makes the client package definition. // Packages makes the client package definition.
func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages { func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages {
boilerplate, err := arguments.LoadGoBoilerplate() boilerplate, err := arguments.LoadGoBoilerplate()
@ -75,8 +69,6 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
glog.Fatalf("Failed loading boilerplate: %v", err) glog.Fatalf("Failed loading boilerplate: %v", err)
} }
boilerplate = append(boilerplate, []byte(generatedBy())...)
var packageList generator.Packages var packageList generator.Packages
for _, inputDir := range arguments.InputDirs { for _, inputDir := range arguments.InputDirs {
p := context.Universe.Package(inputDir) p := context.Universe.Package(inputDir)

2
staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
View File

@ -40,7 +40,7 @@ function cleanup {
trap cleanup EXIT trap cleanup EXIT
echo "Building client-gen" echo "Building client-gen"
CLIENTGEN="${PWD}/client-gen-binary" CLIENTGEN="${PWD}/client-gen"
go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen

2
staging/src/k8s.io/metrics/hack/update-codegen.sh
View File

@ -29,7 +29,7 @@ function cleanup {
trap cleanup EXIT trap cleanup EXIT
echo "Building client-gen" echo "Building client-gen"
CLIENTGEN="${PWD}/client-gen-binary" CLIENTGEN="${PWD}/client-gen"
go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen
PREFIX=k8s.io/metrics/pkg/apis PREFIX=k8s.io/metrics/pkg/apis