put go generate into code template

kubernetes-sigs · Sep 24, 2019 · 9b43f22 · 9b43f22
1 parent c7e28b7
commit 9b43f22
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/cmd/apiserver-boot/boot/create/group.go b/cmd/apiserver-boot/boot/create/group.go
@@ -92,8 +92,8 @@ var groupTemplate = `
 {{.BoilerPlate}}
 
 
-//go:generate go run ../../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i . -h ../../../hack/boilerplate.go.txt
-//go:generate go run ../../../vendor/k8s.io/code-generator/cmd/defaulter-gen/main.go -O zz_generated.defaults -i . -h ../../../hack/boilerplate.go.txt
+//go:generate go run ../../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i . -h ../../../boilerplate.go.txt
+//go:generate go run ../../../vendor/k8s.io/code-generator/cmd/defaulter-gen/main.go -O zz_generated.defaults -i . -h ../../../boilerplate.go.txt
 
 // +k8s:deepcopy-gen=package,register
 // +groupName={{.Name}}.{{.Domain}}

diff --git a/cmd/apiserver-boot/boot/create/version.go b/cmd/apiserver-boot/boot/create/version.go
@@ -109,9 +109,9 @@ var versionTemplate = `
 // backward compatibility by support multiple concurrent versions
 // of the same resource
 
-//go:generate go run ../../../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i . -h ../../../../hack/boilerplate.go.txt
-//go:generate go run ../../../../vendor/k8s.io/code-generator/cmd/defaulter-gen/main.go -O zz_generated.defaults -i . -h ../../../../hack/boilerplate.go.txt
-//go:generate go run ../../../../vendor/k8s.io/code-generator/cmd/conversion-gen/main.go -O zz_generated.conversion -i . -h ../../../../hack/boilerplate.go.txt
+//go:generate go run ../../../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i . -h ../../../../boilerplate.go.txt
+//go:generate go run ../../../../vendor/k8s.io/code-generator/cmd/defaulter-gen/main.go -O zz_generated.defaults -i . -h ../../../../boilerplate.go.txt
+//go:generate go run ../../../../vendor/k8s.io/code-generator/cmd/conversion-gen/main.go -O zz_generated.conversion -i . -h ../../../../boilerplate.go.txt
 
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register

diff --git a/cmd/apiserver-boot/boot/init_repo/repo.go b/cmd/apiserver-boot/boot/init_repo/repo.go
@@ -72,8 +72,8 @@ func RunInitRepo(cmd *cobra.Command, args []string) {
 		"-o . " +
 		"--output-package ../../pkg/openapi " +
 		"--report-filename violations.report " +
-		"-i ../../pkg/apis/...,../../vendor/k8s.io/api/...,../../vendor/k8s.io/apimachinery/pkg/... " +
-		"-h ../../hack/boilerplate.go.txt")
+		"-i ../../pkg/apis/...,../../vendor/k8s.io/api/core/v1,../../vendor/k8s.io/apimachinery/pkg/apis/meta/v1 " +
+		"-h ../../boilerplate.go.txt")
 
 	os.MkdirAll("bin", 0700)
 
@@ -238,7 +238,7 @@ var apisDocTemplate = `
 {{.BoilerPlate}}
 
 
-//go:generate go run ../../vendor/sigs.k8s.io/apiserver-builder-alpha/cmd/apiregister-gen/main.go --input-dirs ./...
+//go:generate go run ../../vendor/sigs.k8s.io/apiserver-builder-alpha/cmd/apiregister-gen/main.go --input-dirs ./... -h ../../boilerplate.go.txt
 
 //
 // +domain={{.Domain}}

diff --git a/cmd/apiserver-builder-release/main.go b/cmd/apiserver-builder-release/main.go
@@ -455,6 +455,11 @@ func BuildLocalVendor(tooldir string) {
 		filepath.Join("pkg"),
 		filepath.Join(tooldir, "src", "vendor", "sigs.k8s.io", "apiserver-builder-alpha", "pkg"))
 	RunCmd(c, "")
+	os.MkdirAll(filepath.Join(tooldir, "src", "vendor", "sigs.k8s.io", "apiserver-builder-alpha", "cmd"), 0700)
+	c = exec.Command("cp", "-R", "-H",
+		filepath.Join("cmd", "apiregister-gen"),
+		filepath.Join(tooldir, "src", "vendor", "sigs.k8s.io", "apiserver-builder-alpha", "cmd", "apiregister-gen"))
+	RunCmd(c, "")
 
 	c = exec.Command("bash", "-c",
 		fmt.Sprintf("find %s -name BUILD.bazel| xargs sed -i='' s'|//pkg|//vendor/sigs.k8s.io/apiserver-builder-alpha/pkg|g'",