chore: bump Golang to 1.18.6 (kedacore#3653)

rickbrouwer · Sep 9, 2022 · ef84e3e · ef84e3e
1 parent df36d7a
commit ef84e3e
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 192 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM golang:1.17.13
+FROM golang:1.18.6
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -50,8 +50,8 @@ RUN apt-get update \
         golang.org/x/tools/cmd/goimports \
         golang.org/x/lint/golint \
         github.com/alecthomas/gometalinter 2>&1 \
-        # github.com/mgechev/revive \  # This pkg deps use generics, we cannot use it till we use go 1.18
-        # github.com/derekparker/delve/cmd/dlv 2>&1 \ # This pkg deps use generics, we cannot use it till we use go 1.18
+        github.com/mgechev/revive \
+        github.com/derekparker/delve/cmd/dlv 2>&1 \
     && go install honnef.co/go/tools/cmd/staticcheck@latest \
     && go install golang.org/x/tools/gopls@latest \
     # Protocol Buffer Compiler
@@ -61,7 +61,7 @@ RUN apt-get update \
     && mv $HOME/.local/bin/protoc /usr/local/bin/protoc \
     && mv $HOME/.local/include/ /usr/local/bin/include/ \
     # Install golangci-lint
-    && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2 \
+    && curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0 \
     #
     # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
     && groupadd --gid $USER_GID $USERNAME \

diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
       - run: go version
       - uses: fossas/fossa-action@main
         name: Scanning with FOSSA

diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
@@ -13,7 +13,7 @@ jobs:
       id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**
 
     # build-tools is built from ../../tools/build-tools.Dockerfile
-    container: ghcr.io/kedacore/build-tools:1.17.13
+    container: ghcr.io/kedacore/build-tools:1.18.6
     steps:
       - name: Check out code
         uses: actions/checkout@v3
@@ -41,7 +41,7 @@ jobs:
           key: ${{ runner.os }}-go-build-cache-${{ hashFiles('**/go.sum') }}
 
       - name: Go modules sync
-        run: go mod tidy -compat=1.17
+        run: go mod tidy -compat=1.18
 
       - name: Test
         run: make test

diff --git a/.github/workflows/pr-e2e.yml b/.github/workflows/pr-e2e.yml
@@ -55,7 +55,7 @@ jobs:
     needs: triage
     runs-on: ubuntu-latest
     name: Build images
-    container: ghcr.io/kedacore/build-tools:1.17.13
+    container: ghcr.io/kedacore/build-tools:1.18.6
     if: needs.triage.outputs.run-e2e == 'true'
     steps:
       - name: Set status in-progress
@@ -98,7 +98,7 @@ jobs:
     needs: [triage, build-test-images]
     runs-on: e2e
     name: Execute e2e tests
-    container: ghcr.io/kedacore/build-tools:1.17.13
+    container: ghcr.io/kedacore/build-tools:1.18.6
     if: needs.triage.outputs.run-e2e == 'true'
     steps:
       - name: Set status in-progress

diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
@@ -5,7 +5,7 @@ jobs:
   validate:
     name: validate - ${{ matrix.name }}
     runs-on: ${{ matrix.runner }}
-    container: ghcr.io/kedacore/build-tools:1.17.13
+    container: ghcr.io/kedacore/build-tools:1.18.6
     strategy:
       matrix:
         include:
@@ -45,7 +45,7 @@ jobs:
           key: ${{ runner.os }}-go-build-cache-${{ hashFiles('**/go.sum') }}
 
       - name: Go modules sync
-        run: go mod tidy -compat=1.17
+        run: go mod tidy -compat=1.18
 
       - name: Verify Generated clientset is up to date
         run: make clientset-verify
@@ -65,7 +65,7 @@ jobs:
   validate-dockerfiles:
     name: validate-dockerfiles - ${{ matrix.name }}
     runs-on: ${{ matrix.runner }}
-    container: ghcr.io/kedacore/build-tools:1.17.13
+    container: ghcr.io/kedacore/build-tools:1.18.6
     strategy:
        matrix:
         include:
@@ -96,7 +96,7 @@ jobs:
   validate-build-tools:
     name: Validate build-tools - ${{ matrix.name }}
     runs-on: ${{ matrix.runner }}
-    container: ghcr.io/kedacore/build-tools:1.17.13
+    container: ghcr.io/kedacore/build-tools:1.18.6
     strategy:
        matrix:
         include:
@@ -133,7 +133,7 @@ jobs:
   validate-dev-container:
     name: Validate dev-container - ${{ matrix.name }}
     runs-on: ${{ matrix.runner }}
-    container: ghcr.io/kedacore/build-tools:1.17.13
+    container: ghcr.io/kedacore/build-tools:1.18.6
     strategy:
        matrix:
         include:
@@ -168,9 +168,9 @@ jobs:
           python-version: 3.x
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Get golangci
-        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.46.2
+        run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.49.0
       - uses: pre-commit/action@v3.0.0
 
   codeScanning:

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -13,7 +13,7 @@ jobs:
       id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**
 
     # build-tools is built from ../../tools/build-tools.Dockerfile
-    container: ghcr.io/kedacore/build-tools:1.17.13
+    container: ghcr.io/kedacore/build-tools:1.18.6
     steps:
       - name: Check out code
         uses: actions/checkout@v3
@@ -41,7 +41,7 @@ jobs:
           key: ${{ runner.os }}-go-build-cache-${{ hashFiles('**/go.sum') }}
 
       - name: Go modules sync
-        run: go mod tidy -compat=1.17
+        run: go mod tidy -compat=1.18
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2

diff --git a/.github/workflows/template-main-e2e-test.yml b/.github/workflows/template-main-e2e-test.yml
@@ -8,7 +8,7 @@ jobs:
     name: Run e2e test
     runs-on: ubuntu-latest
     # build-tools is built from ../../tools/build-tools.Dockerfile
-    container: ghcr.io/kedacore/build-tools:1.17.13
+    container: ghcr.io/kedacore/build-tools:1.18.6
     concurrency: e2e-tests
     steps:
       - name: Check out code

diff --git a/.github/workflows/template-smoke-tests.yml b/.github/workflows/template-smoke-tests.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - name: Install prerequisites
         run: |

diff --git a/.golangci.yml b/.golangci.yml
@@ -17,7 +17,7 @@ linters:
     - goprintffuncname
     - govet
     - nolintlint
-    - rowserrcheck
+    #- rowserrcheck
     - gofmt
     - revive
     - goimports
@@ -27,8 +27,6 @@ linters:
     - ineffassign
     - staticcheck
     - exportloopref
-    - structcheck
-    - deadcode
     - depguard
     - dogsled
     - errcheck
@@ -40,7 +38,6 @@ linters:
     - gosimple
     - stylecheck
     - unused
-    - varcheck
     - unparam
     - unconvert
     - whitespace
@@ -80,7 +77,7 @@ issues:
   # We need to use Golang 1.18 before update the SDK due to it's a prerrequisite
     - linters:
        - staticcheck
-      text: "SA1019: package github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights"
+      text: "SA1019: \"github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights"
   # Exclude for stan_scaler and nats_jetstream_scaler, reason:
   # pkg/scalers/nats_jetstream_scaler.go:109: 109-153 lines are duplicate of `pkg/scalers/stan_scaler.go:83-127` (dupl)
     - path: nats_jetstream_scaler.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -62,7 +62,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
 
 ### Other
 
-- TODO ([#XXX](https://github.com/kedacore/keda/issue/XXX))
+- **General**: Bump Golang to 1.18.6 ([#3205](https://github.com/kedacore/keda/issues/3205))
 
 ## v2.8.1
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM --platform=$BUILDPLATFORM golang:1.17.13 AS builder
+FROM --platform=$BUILDPLATFORM golang:1.18.6 AS builder
 
 ARG BUILD_VERSION=main
 ARG GIT_COMMIT=HEAD

diff --git a/Dockerfile.adapter b/Dockerfile.adapter
@@ -1,5 +1,5 @@
 # Build the adapter binary
-FROM --platform=$BUILDPLATFORM golang:1.17.13 as builder
+FROM --platform=$BUILDPLATFORM golang:1.18.6 as builder
 
 ARG BUILD_VERSION=main
 ARG GIT_COMMIT=HEAD

diff --git a/controllers/keda/suite_test.go b/controllers/keda/suite_test.go
@@ -34,7 +34,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	kedav1alpha1 "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
-	//nolint:gci
 	// +kubebuilder:scaffold:imports
 )
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/kedacore/keda/v2
 
-go 1.17
+go 1.18
 
 require (
 	cloud.google.com/go/compute v1.9.0