Skip to content

Commit 3329626

Browse files
authored
chore: Upgrade golang (#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]>
1 parent 0b022ee commit 3329626

File tree

12 files changed

+61
-49
lines changed

12 files changed

+61
-49
lines changed

.github/workflows/docker-publish.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: docker/setup-qemu-action@v1
2222

2323
- name: Set up Docker Buildx
24-
uses: docker/setup-buildx-action@v1
24+
uses: docker/setup-buildx-action@v2
2525
with:
2626
config-inline: |
2727
[worker.oci]
@@ -79,14 +79,14 @@ jobs:
7979
echo "::set-output name=platform-matrix::$PLATFORM_MATRIX"
8080
8181
- name: Build and push (controller-image)
82-
uses: docker/build-push-action@v2
82+
uses: docker/build-push-action@v3
8383
with:
8484
platforms: ${{ steps.platform-matrix.outputs.platform-matrix }}
8585
push: ${{ github.event_name != 'pull_request' }}
8686
tags: ${{ steps.controller-meta.outputs.tags }}
8787

8888
- name: Build and push (plugin-image)
89-
uses: docker/build-push-action@v2
89+
uses: docker/build-push-action@v3
9090
with:
9191
target: kubectl-argo-rollouts
9292
platforms: ${{ steps.platform-matrix.outputs.platform-matrix }}

.github/workflows/e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Set up Go
3838
uses: actions/setup-go@v2
3939
with:
40-
go-version: 1.17
40+
go-version: 1.18
4141
- uses: actions/checkout@v2
4242
- name: Setup k3s
4343
run: |

.github/workflows/gh-pages.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Set up Go
2222
uses: actions/setup-go@v2
2323
with:
24-
go-version: 1.17
24+
go-version: 1.18
2525
- name: build
2626
run: |
2727
pip install mkdocs mkdocs_material

.github/workflows/go.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- "master"
1010
env:
1111
# Golang version to use across CI steps
12-
GOLANG_VERSION: '1.17'
12+
GOLANG_VERSION: '1.18'
1313

1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.ref }}
@@ -38,7 +38,7 @@ jobs:
3838
- name: Run golangci-lint
3939
uses: golangci/golangci-lint-action@v3
4040
with:
41-
version: v1.45.2
41+
version: v1.47.2
4242
args: --timeout 5m
4343
build:
4444
name: Build

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
- name: Setup Golang
107107
uses: actions/setup-go@v2
108108
with:
109-
go-version: 1.17
109+
go-version: 1.18
110110

111111
- name: Generate release artifacts
112112
run: |

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image
44
# Also used as the image in CI jobs so needs all dependencies
55
####################################################################################################
6-
FROM --platform=$BUILDPLATFORM golang:1.17 as builder
6+
FROM --platform=$BUILDPLATFORM golang:1.18 as builder
77

88
RUN apt-get update && apt-get install -y \
99
wget \
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
1212
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1313

1414
# Install golangci-lint
15-
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.44.0 && \
15+
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.47.2 && \
1616
golangci-lint linters
1717

1818
COPY .golangci.yml ${GOPATH}/src/dummy/.golangci.yml
@@ -40,7 +40,7 @@ RUN NODE_ENV='production' yarn build
4040
####################################################################################################
4141
# Rollout Controller Build stage which performs the actual build of argo-rollouts binaries
4242
####################################################################################################
43-
FROM --platform=$BUILDPLATFORM golang:1.17 as argo-rollouts-build
43+
FROM --platform=$BUILDPLATFORM golang:1.18 as argo-rollouts-build
4444

4545
WORKDIR /go/src/github.com/argoproj/argo-rollouts
4646

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/argoproj/argo-rollouts
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/antonmedv/expr v1.9.0

go.sum

-33
Large diffs are not rendered by default.

hack/installers/install-codegen-go-tools.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ go install github.com/go-swagger/go-swagger/cmd/[email protected]
5454
go install golang.org/x/tools/cmd/[email protected]
5555

5656
# mockery is used for generating mock
57-
go install github.com/vektra/mockery/v2@v2.6.0
57+
go install github.com/vektra/mockery/v2@v2.14.0

metricproviders/mocks/Provider.go

+16-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rollout/mocks/TrafficRoutingReconciler.go

+16-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

utils/aws/mocks/ELBv2APIClient.go

+16-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)