chore: Upgrade golang (argoproj#2160)

* Upgrade golang Signed-off-by: zachaller <[email protected]> * upgrade golang to 1.18 for e2e Signed-off-by: zachaller <[email protected]> * Fix deps Signed-off-by: zachaller <[email protected]> * Update build action Signed-off-by: zachaller <[email protected]> * Upgrade push action Signed-off-by: zachaller <[email protected]> * Update docker file Signed-off-by: zachaller <[email protected]> * Bump golang lint to match Signed-off-by: zachaller <[email protected]> * fix go.mod Signed-off-by: zachaller <[email protected]>
jenciso · Oct 25, 2022 · d36e273 · d36e273
1 parent f73a897
commit d36e273
Show file tree

Hide file tree

Showing 12 changed files with 61 additions and 49 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -21,7 +21,7 @@ jobs:
         uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           config-inline: |
             [worker.oci]
@@ -79,14 +79,14 @@ jobs:
           echo "::set-output name=platform-matrix::$PLATFORM_MATRIX"
 
       - name: Build and push (controller-image)
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           platforms: ${{ steps.platform-matrix.outputs.platform-matrix }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.controller-meta.outputs.tags }}
 
       - name: Build and push (plugin-image)
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           target: kubectl-argo-rollouts
           platforms: ${{ steps.platform-matrix.outputs.platform-matrix }}

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -37,7 +37,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       - uses: actions/checkout@v2
       - name: Setup k3s
         run: |

diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: build
         run: |
           pip install mkdocs mkdocs_material

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -9,7 +9,7 @@ on:
       - "master"
 env:
   # Golang version to use across CI steps
-  GOLANG_VERSION: '1.17'
+  GOLANG_VERSION: '1.18'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -38,7 +38,7 @@ jobs:
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.45.2
+          version: v1.47.2
           args: --timeout 5m
   build:
     name: Build

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -106,7 +106,7 @@ jobs:
       - name: Setup Golang
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - name: Generate release artifacts
         run: |

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@
 # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
 # Also used as the image in CI jobs so needs all dependencies
 ####################################################################################################
-FROM --platform=$BUILDPLATFORM golang:1.17 as builder
+FROM --platform=$BUILDPLATFORM golang:1.18 as builder
 
 RUN apt-get update && apt-get install -y \
     wget \
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install golangci-lint
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.44.0 && \
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.47.2 && \
     golangci-lint linters
 
 COPY .golangci.yml ${GOPATH}/src/dummy/.golangci.yml
@@ -40,7 +40,7 @@ RUN NODE_ENV='production' yarn build
 ####################################################################################################
 # Rollout Controller Build stage which performs the actual build of argo-rollouts binaries
 ####################################################################################################
-FROM --platform=$BUILDPLATFORM golang:1.17 as argo-rollouts-build
+FROM --platform=$BUILDPLATFORM golang:1.18 as argo-rollouts-build
 
 WORKDIR /go/src/github.com/argoproj/argo-rollouts
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/argoproj/argo-rollouts
 
-go 1.17
+go 1.18
 
 require (
 	github.com/antonmedv/expr v1.9.0

diff --git a/go.sum b/go.sum
diff --git a/hack/installers/install-codegen-go-tools.sh b/hack/installers/install-codegen-go-tools.sh
@@ -54,4 +54,4 @@ go install github.com/go-swagger/go-swagger/cmd/[email protected]
 go install golang.org/x/tools/cmd/[email protected]
 
 # mockery is used for generating mock
-go install github.com/vektra/mockery/v2@v2.6.0
+go install github.com/vektra/mockery/v2@v2.14.0
diff --git a/metricproviders/mocks/Provider.go b/metricproviders/mocks/Provider.go
diff --git a/rollout/mocks/TrafficRoutingReconciler.go b/rollout/mocks/TrafficRoutingReconciler.go
diff --git a/utils/aws/mocks/ELBv2APIClient.go b/utils/aws/mocks/ELBv2APIClient.go