From 8540c2f9a92033bcef9359654bd20936bf57cc32 Mon Sep 17 00:00:00 2001 From: Michal Jura Date: Wed, 16 Aug 2023 10:32:08 +0200 Subject: [PATCH] Bump go version to 1.20 --- .github/workflows/apidiff.yaml | 4 ++-- .github/workflows/build.yaml | 4 ++-- .github/workflows/lint.yaml | 4 ++-- .github/workflows/update-rancher-dep.yaml | 2 +- .github/workflows/verify.yaml | 4 ++-- .golangci.yml | 4 ++-- Dockerfile.dapper | 2 +- go.mod | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/apidiff.yaml b/.github/workflows/apidiff.yaml index d933aff5..b56d7d83 100644 --- a/.github/workflows/apidiff.yaml +++ b/.github/workflows/apidiff.yaml @@ -10,5 +10,5 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v4 with: - go-version: 1.19 - - uses: joelanford/go-apidiff@main \ No newline at end of file + go-version: 1.20 + - uses: joelanford/go-apidiff@main diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5393db58..d045a6b3 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: 1.19.x + go-version: 1.20.x - uses: actions/cache@v3.3.1 with: path: | @@ -23,4 +23,4 @@ jobs: restore-keys: | ${{ runner.os }}-build-go-${{ hashFiles('**/go.sum') }} - name: Build GKE operator binary - run: make operator \ No newline at end of file + run: make operator diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index c14f8d21..83dd2107 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -15,8 +15,8 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: 1.19.x + go-version: 1.20.x - name: Analysis uses: golangci/golangci-lint-action@v3 with: - args: -v \ No newline at end of file + args: -v diff --git a/.github/workflows/update-rancher-dep.yaml b/.github/workflows/update-rancher-dep.yaml index c07b170e..95f9acc4 100644 --- a/.github/workflows/update-rancher-dep.yaml +++ b/.github/workflows/update-rancher-dep.yaml @@ -22,7 +22,7 @@ on: env: GOARCH: amd64 CGO_ENABLED: 0 - SETUP_GO_VERSION: '1.19.*' + SETUP_GO_VERSION: '1.20.*' jobs: create-rancher-pr: diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml index ab9fc073..eb2b6840 100644 --- a/.github/workflows/verify.yaml +++ b/.github/workflows/verify.yaml @@ -12,7 +12,7 @@ jobs: - name: Install Go uses: actions/setup-go@v4 with: - go-version: 1.19.x + go-version: 1.20.x - uses: actions/cache@v3.3.1 with: path: | @@ -23,4 +23,4 @@ jobs: ${{ runner.os }}-test-go-${{ hashFiles('**/go.sum') }} - name: Run make verify run: | - make verify \ No newline at end of file + make verify diff --git a/.golangci.yml b/.golangci.yml index 74b8a51c..2b9f8ea8 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ run: timeout: 5m - go: "1.19" + go: "1.20" skip-files: - "zz_generated_*" skip-dirs: @@ -87,4 +87,4 @@ issues: - linters: - revive text: "var-naming: don't use an underscore in package name" - path: 'mock(\w+)/doc.go$' \ No newline at end of file + path: 'mock(\w+)/doc.go$' diff --git a/Dockerfile.dapper b/Dockerfile.dapper index aa30fd13..e5e366fa 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -8,7 +8,7 @@ RUN zypper -n update && \ ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash -RUN curl -sLf https://storage.googleapis.com/golang/go1.19.3.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/ +RUN curl -sLf https://go.dev/dl/go1.20.7.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/ # workaround for https://bugzilla.suse.com/show_bug.cgi?id=1183043 RUN if [ "${ARCH}" == "arm64" ]; then \ zypper -n install binutils-gold ; \ diff --git a/go.mod b/go.mod index b40799af..36b7fa4b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/rancher/gke-operator -go 1.19 +go 1.20 replace k8s.io/client-go => k8s.io/client-go v0.25.4