✨ add support to go 1.18

kubernetes-sigs · Jun 7, 2022 · 40d534d · 40d534d
1 parent bb28de3
commit 40d534d
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 26 deletions.
diff --git a/.github/workflows/apidiff.yml b/.github/workflows/apidiff.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       - name: Execute go-apidiff
         uses: joelanford/go-apidiff@v0.2.0
         with:

diff --git a/.github/workflows/testdata.yml b/.github/workflows/testdata.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - name: Remove pre-installed kustomize
         # This step is needed as the following one tries to remove
         # kustomize for each test but has no permission to do so

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       # This step is needed as the following one tries to remove
       # kustomize for each test but has no permission to do so
       - name: Remove pre-installed kustomize
@@ -71,7 +71,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.17"
+          go-version: "1.18"
       - name: Generate the coverage output
         run: make test-coverage
       - name: Send the coverage output

diff --git a/build/.goreleaser.yml b/build/.goreleaser.yml
@@ -44,7 +44,7 @@ builds:
       - darwin_amd64
       - darwin_arm64
     env:
-      - KUBERNETES_VERSION=1.23.5
+      - KUBERNETES_VERSION=1.24.1
       - CGO_ENABLED=0
 
 # Only binaries of the form "kubebuilder_${goos}_${goarch}" will be released.

diff --git a/build/cloudbuild.yaml b/build/cloudbuild.yaml
@@ -38,7 +38,7 @@ steps:
     git checkout $${BRANCH_NAME}
     git branch --set-upstream-to=origin/$${BRANCH_NAME}
     git tag -d ${TAG_NAME}
-- name: "goreleaser/goreleaser:v1.8.3"
+- name: "goreleaser/goreleaser:v1.9.2"
   entrypoint: "bash"
   args: ["build/build_kubebuilder.sh"]
   secretEnv: ["GITHUB_TOKEN"]

diff --git a/build/cloudbuild_local.yaml b/build/cloudbuild_local.yaml
@@ -19,7 +19,7 @@
 # Release tar will be in ./cloudbuild
 
 steps:
-- name: "goreleaser/goreleaser:v1.8.3"
+- name: "goreleaser/goreleaser:v1.9.2"
   entrypoint: "bash"
   env: ["SNAPSHOT=1"]
   args: ["build/build_kubebuilder.sh"]
diff --git a/build/cloudbuild_snapshot.yaml b/build/cloudbuild_snapshot.yaml
@@ -19,7 +19,7 @@
 # Release tar will be in ./cloudbuild
 
 steps:
-- name: "goreleaser/goreleaser:v1.8.3"
+- name: "goreleaser/goreleaser:v1.9.2"
   entrypoint: "bash"
   env: ["SNAPSHOT=1"]
   args: ["build/build_kubebuilder.sh"]

diff --git a/docs/book/src/quick-start.md b/docs/book/src/quick-start.md
@@ -11,7 +11,8 @@ This Quick Start guide will cover:
 
 - [go](https://golang.org/dl/) version v1.15+ (kubebuilder v3.0 < v3.1).
 - [go](https://golang.org/dl/) version v1.16+ (kubebuilder v3.1 < v3.3).
-- [go](https://golang.org/dl/) version v1.17+ < v1.18 (kubebuilder v3.3+).
+- [go](https://golang.org/dl/) version v1.17+ < v1.18 (kubebuilder v3.4.1).
+- [go](https://golang.org/dl/) version v1.17.9+ (kubebuilder v3.5+).
 - [docker](https://docs.docker.com/install/) version 17.03+.
 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) version v1.11.3+.
 - Access to a Kubernetes v1.11.3+ cluster.

diff --git a/pkg/cli/alpha/config-gen/testdata/go.mod b/pkg/cli/alpha/config-gen/testdata/go.mod
@@ -1,6 +1,6 @@
 module config-gen/testdata
 
-go 1.17
+go 1.18
 
 require (
 	k8s.io/apimachinery v0.23.5

diff --git a/pkg/plugins/golang/go_version_test.go b/pkg/plugins/golang/go_version_test.go
@@ -195,6 +195,7 @@ var _ = Describe("checkGoVersion", func() {
 		Entry("for go 1.17.3", "go1.17.3"),
 		Entry("for go 1.17.4", "go1.17.4"),
 		Entry("for go 1.17.5", "go1.17.5"),
+		Entry("for go 1.18.1", "go1.18.1"),
 	)
 
 	DescribeTable("should return an error for non-supported go versions",

diff --git a/pkg/plugins/golang/v3/init.go b/pkg/plugins/golang/v3/init.go
@@ -35,7 +35,7 @@ import (
 
 // Variables and function to check Go version requirements.
 var (
-	goVerMin = golang.MustParse("go1.17")
+	goVerMin = golang.MustParse("go1.17.9")
 	goVerMax = golang.MustParse("go2.0alpha1")
 )
 

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

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

diff --git a/test/common.sh b/test/common.sh
@@ -26,6 +26,7 @@ function convert_to_tools_ver {
   "1.20"|"1.21") echo "1.19.2";;
   "1.22") echo "1.22.1";;
   "1.23") echo "1.23.3";;
+  "1.24") echo "1.24.1";;
   *)
     echo "k8s version $k8s_ver not supported"
     exit 1
@@ -45,7 +46,7 @@ if [ -n "$TRACE" ]; then
   set -x
 fi
 
-export KIND_K8S_VERSION="${KIND_K8S_VERSION:-"v1.23.3"}"
+export KIND_K8S_VERSION="${KIND_K8S_VERSION:-"v1.24.1"}"
 tools_k8s_version=$(convert_to_tools_ver "${KIND_K8S_VERSION#v*}")
 kind_version=0.11.1
 goarch=amd64

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

diff --git a/testdata/project-v3-addon/go.mod b/testdata/project-v3-addon/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kubebuilder/testdata/project-v3-addon
 
-go 1.17
+go 1.18
 
 require (
 	github.com/go-logr/logr v1.2.0

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

diff --git a/testdata/project-v3-config/go.mod b/testdata/project-v3-config/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kubebuilder/testdata/project-v3-config
 
-go 1.17
+go 1.18
 
 require (
 	github.com/onsi/ginkgo v1.16.5

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

diff --git a/testdata/project-v3-multigroup/go.mod b/testdata/project-v3-multigroup/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kubebuilder/testdata/project-v3-multigroup
 
-go 1.17
+go 1.18
 
 require (
 	github.com/onsi/ginkgo v1.16.5

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

diff --git a/testdata/project-v3-v1beta1/go.mod b/testdata/project-v3-v1beta1/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kubebuilder/testdata/project-v3-v1beta1
 
-go 1.17
+go 1.18
 
 require (
 	github.com/onsi/ginkgo v1.16.4

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

diff --git a/testdata/project-v3-with-kustomize-v2/go.mod b/testdata/project-v3-with-kustomize-v2/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kubebuilder/testdata/project-v3-with-kustomize-v2
 
-go 1.17
+go 1.18
 
 require (
 	github.com/onsi/ginkgo v1.16.5

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

diff --git a/testdata/project-v3/go.mod b/testdata/project-v3/go.mod
@@ -1,6 +1,6 @@
 module sigs.k8s.io/kubebuilder/testdata/project-v3
 
-go 1.17
+go 1.18
 
 require (
 	github.com/onsi/ginkgo v1.16.5