Only bump the version for v3 and not v2

kubernetes-sigs · Oct 14, 2020 · 9c62d77 · 9c62d77
1 parent ab77d54
commit 9c62d77
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/pkg/plugin/internal/util/go_version.go b/pkg/plugin/internal/util/go_version.go
@@ -51,6 +51,8 @@ func fetchAndCheckGoVersion() error {
 	return nil
 }
 
+// checkGoVersion should only ever check if the Go version >= 1.13, since the kubebuilder binary only cares
+// that the go binary supports go modules which were stabilized in that version (i.e. in go 1.13) by default
 func checkGoVersion(verStr string) error {
 	goVerRegex := `^go?([0-9]+)\.([0-9]+)([\.0-9A-Za-z\-]+)?$`
 	m := regexp.MustCompile(goVerRegex).FindStringSubmatch(verStr)
@@ -69,7 +71,7 @@ func checkGoVersion(verStr string) error {
 	}
 
 	if major < 1 || minor < 13 {
-		return fmt.Errorf("requires version >= 1.15")
+		return fmt.Errorf("requires version >= 1.13")
 	}
 
 	return nil

diff --git a/pkg/plugin/v2/scaffolds/internal/templates/dockerfile.go b/pkg/plugin/v2/scaffolds/internal/templates/dockerfile.go
@@ -39,7 +39,7 @@ func (f *Dockerfile) SetTemplateDefaults() error {
 }
 
 const dockerfileTemplate = `# Build the manager binary
-FROM golang:1.15 as builder
+FROM golang:1.13 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/pkg/plugin/v2/scaffolds/internal/templates/gomod.go b/pkg/plugin/v2/scaffolds/internal/templates/gomod.go
@@ -46,7 +46,7 @@ func (f *GoMod) SetTemplateDefaults() error {
 const goModTemplate = `
 module {{ .Repo }}
 
-go 1.15
+go 1.13
 
 require (
 	sigs.k8s.io/controller-runtime {{ .ControllerRuntimeVersion }}

diff --git a/testdata/project-v2-addon/Dockerfile b/testdata/project-v2-addon/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.15 as builder
+FROM golang:1.13 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/testdata/project-v2-addon/go.mod b/testdata/project-v2-addon/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kubebuilder/testdata/project-v2-addon
 
-go 1.15
+go 1.13
 
 require (
 	github.com/go-logr/logr v0.1.0

diff --git a/testdata/project-v2-multigroup/Dockerfile b/testdata/project-v2-multigroup/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.15 as builder
+FROM golang:1.13 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/testdata/project-v2-multigroup/go.mod b/testdata/project-v2-multigroup/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kubebuilder/testdata/project-v2-multigroup
 
-go 1.15
+go 1.13
 
 require (
 	github.com/go-logr/logr v0.1.0

diff --git a/testdata/project-v2/Dockerfile b/testdata/project-v2/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.15 as builder
+FROM golang:1.13 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/testdata/project-v2/go.mod b/testdata/project-v2/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kubebuilder/testdata/project-v2
 
-go 1.15
+go 1.13
 
 require (
 	github.com/go-logr/logr v0.1.0