Golang 1.18 (#3508)

* Update Golang to 1.18 * Update GitHub workflows to use Go 1.18 * Update zz_generated.bindata.go * Update Docker files to use Go 1.18 * More GitHub workflow updates * Update Makefile environment file * Update test task for capabilities
vmware-tanzu · Oct 5, 2022 · b6bc162 · b6bc162
1 parent 4f21910
commit b6bc162
Show file tree

Hide file tree

Showing 69 changed files with 447 additions and 451 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -13,7 +13,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: 1.18
       id: go
 
     - name: Use Node 16.x
@@ -116,7 +116,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: 1.18
       id: go
 
     - name: go cache

diff --git a/.github/workflows/package_integration_test.yaml b/.github/workflows/package_integration_test.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: 1.18
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.github/workflows/plugin_tests.yaml b/.github/workflows/plugin_tests.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: "1.17"
+          go-version: 1.18
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/.github/workflows/providers.yaml b/.github/workflows/providers.yaml
@@ -28,7 +28,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: 1.18
       id: go
 
     - name: go cache

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,7 +18,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: 1.18
       id: go
 
     - name: Use Node 16.x

diff --git a/.github/workflows/release_staging.yaml b/.github/workflows/release_staging.yaml
@@ -14,7 +14,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: 1.18
       id: go
 
     - name: Use Node 16.x

diff --git a/.github/workflows/security_codeql.yaml b/.github/workflows/security_codeql.yaml
@@ -13,7 +13,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: 1.18
       id: go
 
     - name: Use Node 16.x

diff --git a/.github/workflows/tkg_integration_tests.yaml b/.github/workflows/tkg_integration_tests.yaml
@@ -30,7 +30,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: 1.18
       id: go
 
     - name: Check out code into the Go module directory
@@ -114,7 +114,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v3
       with:
-        go-version: '1.17'
+        go-version: 1.18
       id: go
 
     - name: Check out code into the Go module directory

diff --git a/.github/workflows/tkg_integration_tests_clusterclass.yaml b/.github/workflows/tkg_integration_tests_clusterclass.yaml
@@ -122,7 +122,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: '1.17'
+        go-version: 1.18
       id: go
 
     - name: Check out code into the Go module directory
@@ -209,7 +209,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
+          go-version: 1.18
         id: go
 
       - name: Check out code into the Go module directory
@@ -285,7 +285,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: 1.18
         id: go
 
       - name: Check out code into the Go module directory

diff --git a/addons/Dockerfile b/addons/Dockerfile
@@ -3,7 +3,7 @@
 
 # Build from publicly reachable source by default, but allow people to re-build images on
 # top of their own trusted images.
-ARG BUILDER_BASE_IMAGE=golang:1.17
+ARG BUILDER_BASE_IMAGE=golang:1.18
 
 # Build the manager binary
 FROM $BUILDER_BASE_IMAGE as builder

diff --git a/addons/go.mod b/addons/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/addons
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs => ./../apis/addonconfigs

diff --git a/addons/hack/tools/go.mod b/addons/hack/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/addons/hack/tools
 
-go 1.17
+go 1.18
 
 require github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0
 

diff --git a/apis/addonconfigs/go.mod b/apis/addonconfigs/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/apis/addonconfigs
 
-go 1.17
+go 1.18
 
 require (
 	k8s.io/api v0.23.5

diff --git a/apis/cli/go.mod b/apis/cli/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/apis/cli
 
-go 1.17
+go 1.18
 
 replace github.com/vmware-tanzu/tanzu-framework/apis/config => ../../apis/config
 

diff --git a/apis/config/go.mod b/apis/config/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/apis/config
 
-go 1.17
+go 1.18
 
 require (
 	github.com/google/go-cmp v0.5.8

diff --git a/apis/core/go.mod b/apis/core/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/apis/core
 
-go 1.17
+go 1.18
 
 require (
 	k8s.io/api v0.23.5

diff --git a/apis/run/go.mod b/apis/run/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/apis/run
 
-go 1.17
+go 1.18
 
 require (
 	github.com/google/go-cmp v0.5.6

diff --git a/capabilities/Makefile b/capabilities/Makefile
@@ -20,7 +20,7 @@ CRD_OPTIONS ?= "crd"
 all: manager
 
 # Run tests
-test: fmt vet manifests
+test: fmt vet
 	cd client && go test ./... -coverprofile cover.out
 	cd controller && go test ./... -coverprofile cover.out
 

diff --git a/capabilities/client/go.mod b/capabilities/client/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/capabilities/client
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/run => ../../apis/run

diff --git a/capabilities/controller/Dockerfile b/capabilities/controller/Dockerfile
@@ -3,7 +3,7 @@
 
 # Build from publicly reachable source by default, but allow people to re-build images on
 # top of their own trusted images.
-ARG BUILDER_BASE_IMAGE=golang:1.17
+ARG BUILDER_BASE_IMAGE=golang:1.18
 
 # Build the manager binary
 FROM $BUILDER_BASE_IMAGE as builder

diff --git a/capabilities/controller/go.mod b/capabilities/controller/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/capabilities/controller
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/core => ../../apis/core

diff --git a/cli/core/go.mod b/cli/core/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/cli/core
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ./../../apis/cli

diff --git a/cli/core/hack/tools/go.mod b/cli/core/hack/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/cli/core/hack/tools
 
-go 1.17
+go 1.18
 
 require golang.org/x/tools v0.1.12
 

diff --git a/cli/runtime/go.mod b/cli/runtime/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/cli/runtime
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../apis/cli

diff --git a/cli/runtime/hack/tools/go.mod b/cli/runtime/hack/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/cli/runtime/hack/tools
 
-go 1.17
+go 1.18
 
 require (
 	golang.org/x/tools v0.1.12

diff --git a/cmd/cli/plugin-admin/builder/go.mod b/cmd/cli/plugin-admin/builder/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/plugin/builder
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../../../apis/cli

diff --git a/cmd/cli/plugin-admin/builder/template/plugintemplates/github_workflow_release.yaml.tmpl b/cmd/cli/plugin-admin/builder/template/plugintemplates/github_workflow_release.yaml.tmpl
@@ -16,7 +16,7 @@ jobs:
   - name: Set up Go 1.x
     uses: actions/setup-go@v2
     with:
-      go-version: ^1.17
+      go-version: ^1.18
       id: go
 
   - name: Check out code into the Go module directory

diff --git a/cmd/cli/plugin-admin/builder/template/plugintemplates/gitlab-ci.yaml.tmpl b/cmd/cli/plugin-admin/builder/template/plugintemplates/gitlab-ci.yaml.tmpl
@@ -2,7 +2,7 @@ buildpush:
   only:
     - master
 stage: deploy
-image: golang:1.17.6
+image: golang:1.18
 script:
   # Note: this is all one step because the artifacts were too large to copy over.
   - make

diff --git a/cmd/cli/plugin-admin/builder/template/plugintemplates/gomod.tmpl b/cmd/cli/plugin-admin/builder/template/plugintemplates/gomod.tmpl
@@ -1,6 +1,6 @@
 module {{ .RepositoryName }}
 
-go 1.17
+go 1.18
 
 require (
 	github.com/aunum/log v0.0.0-20200821225356-38d2e2c8b489

diff --git a/cmd/cli/plugin-admin/codegen/go.mod b/cmd/cli/plugin-admin/codegen/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/codegen/plugin
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../../../apis/cli

diff --git a/cmd/cli/plugin-admin/test/go.mod b/cmd/cli/plugin-admin/test/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/plugin/test
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../../../apis/cli

diff --git a/cmd/cli/plugin/feature/go.mod b/cmd/cli/plugin/feature/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/featuregate/plugin
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ./../../../../apis/cli

diff --git a/cmd/cli/plugin/login/go.mod b/cmd/cli/plugin/login/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/plugin/login
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../../../apis/cli

diff --git a/cmd/cli/plugin/package/go.mod b/cmd/cli/plugin/package/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/cmd/cli/plugin/package
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../../../apis/cli

diff --git a/cmd/cli/plugin/pinniped-auth/go.mod b/cmd/cli/plugin/pinniped-auth/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/plugin/pinniped-auth
 
-go 1.17
+go 1.18
 
 replace github.com/vmware-tanzu/tanzu-framework/cli/runtime => ../../../../cli/runtime
 

diff --git a/cmd/cli/plugin/secret/go.mod b/cmd/cli/plugin/secret/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/cmd/cli/plugin/secret
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../../../apis/cli

diff --git a/common.mk b/common.mk
@@ -5,7 +5,7 @@ GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 GOHOSTOS ?= $(shell go env GOHOSTOS)
 GOHOSTARCH ?= $(shell go env GOHOSTARCH)
-GOVERSION ?= 1.17
+GOVERSION ?= 1.18
 
 ROOT_DIR := $(shell git rev-parse --show-toplevel)
 RELATIVE_ROOT ?= .

diff --git a/featuregates/client/go.mod b/featuregates/client/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/featuregates/client
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework => ../../

diff --git a/featuregates/controller/Dockerfile b/featuregates/controller/Dockerfile
@@ -3,7 +3,7 @@
 
 # Build from publicly reachable source by default, but allow people to re-build images on
 # top of their own trusted images.
-ARG BUILDER_BASE_IMAGE=golang:1.17
+ARG BUILDER_BASE_IMAGE=golang:1.18
 
 # Build the manager binary
 FROM $BUILDER_BASE_IMAGE as builder

diff --git a/featuregates/controller/go.mod b/featuregates/controller/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/featuregates/controller
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ../../apis/cli

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework
 
-go 1.17
+go 1.18
 
 replace (
 	github.com/vmware-tanzu/tanzu-framework/apis/cli => ./apis/cli

diff --git a/hack/packages/kbld-image-replace/go.mod b/hack/packages/kbld-image-replace/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/hack/packages
 
-go 1.17
+go 1.18
 
 require (
 	github.com/k14s/kbld v0.32.0

diff --git a/hack/packages/package-tools/go.mod b/hack/packages/package-tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/tanzu-framework/hack/packages/package-tools
 
-go 1.17
+go 1.18
 
 require (
 	github.com/spf13/cobra v1.3.0