From 4b00632f8470fe84a9862903d84370a1c1390509 Mon Sep 17 00:00:00 2001 From: Eric Stroczynski Date: Mon, 9 Nov 2020 17:38:24 -0800 Subject: [PATCH] Revert ":warning: upgrade controller-tool dep from 0.3.0 to 0.4.0 (go/v3-alpha only)" --- pkg/plugin/v3/scaffolds/init.go | 2 +- testdata/project-v3-addon/Makefile | 2 +- testdata/project-v3-multigroup/Makefile | 2 +- testdata/project-v3/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/plugin/v3/scaffolds/init.go b/pkg/plugin/v3/scaffolds/init.go index c69d7ee6468..4e2aa9eafaa 100644 --- 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 index 32720a7a1ca..981f020fecc 100644 --- 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 index 32720a7a1ca..981f020fecc 100644 --- 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 index 32720a7a1ca..981f020fecc 100644 --- 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