Merge pull request #491 from yue9944882/chore/go-generate-from-gobin

Refactor go:generated from GOBIN
kubernetes-sigs · Mar 30, 2020 · 944c347 · 944c347
2 parents c5cdcc2 + ffa10fd
commit 944c347
Show file tree

Hide file tree

Showing 15 changed files with 381 additions and 37 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 ../../../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 deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../boilerplate.go.txt
+//go:generate defaulter-gen -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 ../../../../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
+//go:generate deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../../boilerplate.go.txt
+//go:generate defaulter-gen -O zz_generated.defaults -i . -h ../../../../boilerplate.go.txt
+//go:generate conversion-gen -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
@@ -65,7 +65,7 @@ func RunInitRepo(cmd *cobra.Command, args []string) {
 	createPackage(cr, filepath.Join("pkg"), "")
 	createPackage(cr, filepath.Join("pkg", "controller"), "")
 	createPackage(cr, filepath.Join("pkg", "openapi"), "//go:generate "+
-		"go run ../../vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go "+
+		"openapi-gen"+
 		"-o . "+
 		"--output-package ../../pkg/openapi "+
 		"--report-filename violations.report "+
@@ -262,7 +262,7 @@ var apisDocTemplate = `
 {{.BoilerPlate}}
 
 
-//go:generate go run ../../vendor/sigs.k8s.io/apiserver-builder-alpha/cmd/apiregister-gen/main.go --input-dirs ./... -h ../../boilerplate.go.txt
+//go:generate apiregister-gen --input-dirs ./... -h ../../boilerplate.go.txt
 
 //
 // +domain={{.Domain}}

diff --git a/example/basic/go.sum b/example/basic/go.sum
diff --git a/example/basic/pkg/apis/doc.go b/example/basic/pkg/apis/doc.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//go:generate go run ../../vendor/sigs.k8s.io/apiserver-builder-alpha/cmd/apiregister-gen/main.go --input-dirs ./... -h ../../boilerplate.go.txt
+//go:generate apiregister-gen --input-dirs ./... -h ../../boilerplate.go.txt
 
 // +domain=k8s.io
 

diff --git a/example/basic/pkg/apis/innsmouth/doc.go b/example/basic/pkg/apis/innsmouth/doc.go
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//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 deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../boilerplate.go.txt
+//go:generate defaulter-gen -O zz_generated.defaults -i . -h ../../../boilerplate.go.txt
 
 // +k8s:deepcopy-gen=package,register
 // +groupName=innsmouth.k8s.io

diff --git a/example/basic/pkg/apis/innsmouth/v1/doc.go b/example/basic/pkg/apis/innsmouth/v1/doc.go
@@ -18,9 +18,9 @@ limitations under the License.
 // 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 ../../../../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
+//go:generate deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../../boilerplate.go.txt
+//go:generate defaulter-gen -O zz_generated.defaults -i . -h ../../../../boilerplate.go.txt
+//go:generate conversion-gen -O zz_generated.conversion -i . -h ../../../../boilerplate.go.txt
 
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register

diff --git a/example/basic/pkg/apis/kingsport/doc.go b/example/basic/pkg/apis/kingsport/doc.go
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//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 deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../boilerplate.go.txt
+//go:generate defaulter-gen -O zz_generated.defaults -i . -h ../../../boilerplate.go.txt
 
 // +k8s:deepcopy-gen=package,register
 // +groupName=kingsport.k8s.io

diff --git a/example/basic/pkg/apis/kingsport/v1/doc.go b/example/basic/pkg/apis/kingsport/v1/doc.go
@@ -18,9 +18,9 @@ limitations under the License.
 // 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 ../../../../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
+//go:generate deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../../boilerplate.go.txt
+//go:generate defaulter-gen -O zz_generated.defaults -i . -h ../../../../boilerplate.go.txt
+//go:generate conversion-gen -O zz_generated.conversion -i . -h ../../../../boilerplate.go.txt
 
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register

diff --git a/example/basic/pkg/apis/miskatonic/doc.go b/example/basic/pkg/apis/miskatonic/doc.go
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//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 deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../boilerplate.go.txt
+//go:generate defaulter-gen -O zz_generated.defaults -i . -h ../../../boilerplate.go.txt
 
 // +k8s:deepcopy-gen=package,register
 // +groupName=miskatonic.k8s.io

diff --git a/example/basic/pkg/apis/miskatonic/v1beta1/doc.go b/example/basic/pkg/apis/miskatonic/v1beta1/doc.go
@@ -18,9 +18,9 @@ limitations under the License.
 // 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 ../../../../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
+//go:generate deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../../boilerplate.go.txt
+//go:generate defaulter-gen -O zz_generated.defaults -i . -h ../../../../boilerplate.go.txt
+//go:generate conversion-gen -O zz_generated.conversion -i . -h ../../../../boilerplate.go.txt
 
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register

diff --git a/example/basic/pkg/apis/olympus/doc.go b/example/basic/pkg/apis/olympus/doc.go
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//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 deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../boilerplate.go.txt
+//go:generate defaulter-gen -O zz_generated.defaults -i . -h ../../../boilerplate.go.txt
 
 // +k8s:deepcopy-gen=package,register
 // +groupName=olympus.k8s.io

diff --git a/example/basic/pkg/apis/olympus/v1beta1/doc.go b/example/basic/pkg/apis/olympus/v1beta1/doc.go
@@ -18,9 +18,9 @@ limitations under the License.
 // 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 ../../../../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
+//go:generate deepcopy-gen -O zz_generated.deepcopy -i . -h ../../../../boilerplate.go.txt
+//go:generate defaulter-gen -O zz_generated.defaults -i . -h ../../../../boilerplate.go.txt
+//go:generate conversion-gen -O zz_generated.conversion -i . -h ../../../../boilerplate.go.txt
 
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register

diff --git a/example/basic/pkg/openapi/doc.go b/example/basic/pkg/openapi/doc.go
@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//go:generate go run ../../vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go -o . --output-package ../../pkg/openapi --report-filename violations.report -i ../../pkg/apis/...,../../vendor/k8s.io/api/core/v1,../../vendor/k8s.io/apimachinery/pkg/apis/meta/v1 -h ../../boilerplate.go.txt
+//go:generate openapi-gen -o . --output-package ../../pkg/openapi --report-filename violations.report -i ../../pkg/apis/...,../../vendor/k8s.io/api/core/v1,../../vendor/k8s.io/apimachinery/pkg/apis/meta/v1 -h ../../boilerplate.go.txt
 
 // Package openapi exists to hold generated openapi code
 package openapi
diff --git a/repos.bzl b/repos.bzl
@@ -861,6 +861,7 @@ def go_repositories():
         build_file_generation = "on",
         build_file_proto_mode = "disable",
         importpath = "sigs.k8s.io/structured-merge-diff",
+        replace = "sigs.k8s.io/structured-merge-diff",
         sum = "h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU=",
         version = "v1.0.1-0.20191108220359-b1b620dd3f06",
     )
@@ -1697,14 +1698,7 @@ def go_repositories():
         sum = "h1:5fh1gzTFhfae06u3hzHYO9xe3l3v3nW5Pwt3naLTP5g=",
         version = "v1.0.4",
     )
-    go_repository(
-        name = "io_k8s_sigs_structured_merge_diff_v3",
-        build_file_generation = "on",
-        build_file_proto_mode = "disable",
-        importpath = "sigs.k8s.io/structured-merge-diff/v3",
-        sum = "h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=",
-        version = "v3.0.0",
-    )
+
     go_repository(
         name = "com_github_kubernetes_incubator_reference_docs",
         build_file_generation = "on",