Merge pull request #1807 from estroz/revert-1787-upgrade-controller-gen

k8s-ci-robot · web-flow · commit 7db6812e44e7 · 2020-11-09T20:10:40.000-08:00
🌱 Revert "⚠️ upgrade controller-tool dep from 0.3.0 to 0.4.0 (go/v3-alpha only)"
diff --git a/pkg/plugin/v3/scaffolds/init.go b/pkg/plugin/v3/scaffolds/init.go
@@ -39,7 +39,7 @@ const (
 	// ControllerRuntimeVersion is the kubernetes-sigs/controller-runtime version to be used in the project
 	ControllerRuntimeVersion = "v0.7.0-alpha.6"
 	// ControllerToolsVersion is the kubernetes-sigs/controller-tools version to be used in the project
-	ControllerToolsVersion = "v0.4.0"
+	ControllerToolsVersion = "v0.3.0"
 	// KustomizeVersion is the kubernetes-sigs/kustomize version to be used in the project
 	KustomizeVersion = "v3.5.4"
 
diff --git a/testdata/project-v3-addon/Makefile b/testdata/project-v3-addon/Makefile
@@ -78,7 +78,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.0 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
diff --git a/testdata/project-v3-multigroup/Makefile b/testdata/project-v3-multigroup/Makefile
@@ -78,7 +78,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.0 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
diff --git a/testdata/project-v3/Makefile b/testdata/project-v3/Makefile
@@ -78,7 +78,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.0 ;\
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ ifeq (, $(shell which controller-gen))`
`78`	`78`	`CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\`
`79`	`79`	`cd $$CONTROLLER_GEN_TMP_DIR ;\`
`80`	`80`	`go mod init tmp ;\`
`81`		`- go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.0 ;\`
	`81`	`+ go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\`
`82`	`82`	`rm -rf $$CONTROLLER_GEN_TMP_DIR ;\`
`83`	`83`	`}`
`84`	`84`	`CONTROLLER_GEN=$(GOBIN)/controller-gen`