From 816dfd4101bb5283b38ab2173e9e1feeb32b7110 Mon Sep 17 00:00:00 2001 From: Akash Gautam Date: Wed, 10 Apr 2024 19:29:33 +0530 Subject: [PATCH] Update golang to 1.22.2 (#374) * update golang to 1.22.2 Signed-off-by: Akash Gautam * fix lint test failures port golang 1.22.2 upgrade Signed-off-by: Akash Gautam --------- Signed-off-by: Akash Gautam --- .golangci.yml | 12 ++++++------ .prow/postsubmits.yaml | 4 ++-- .prow/verify.yaml | 18 +++++++++--------- Dockerfile | 2 +- Makefile | 2 +- hack/update-codegen.sh | 2 +- hack/update-crds-openapi.sh | 2 +- hack/verify-licenses.sh | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 9cb3be00..f097b20d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -12,13 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. run: - deadline: 20m + timeout: 20m issues-exit-code: 1 - skip-dirs: - - hack - - vendor - skip-files: - - zz_generated.*.go linters: enable: @@ -78,3 +73,8 @@ linters-settings: issues: exclude: - "cyclomatic complexity 32 of func `GenerateOperatingSystemConfig` is high" + exclude-dirs: + - hack + - vendor + exclude-files: + - zz_generated.*.go diff --git a/.prow/postsubmits.yaml b/.prow/postsubmits.yaml index 9f8fde8e..4c5d37ec 100644 --- a/.prow/postsubmits.yaml +++ b/.prow/postsubmits.yaml @@ -26,7 +26,7 @@ postsubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.22-3 command: - /bin/bash - -c @@ -53,7 +53,7 @@ postsubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.22-3 command: - "./hack/ci/upload-gocache.sh" resources: diff --git a/.prow/verify.yaml b/.prow/verify.yaml index c01faf73..f91f88a2 100644 --- a/.prow/verify.yaml +++ b/.prow/verify.yaml @@ -21,7 +21,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-3 command: - make args: @@ -36,7 +36,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-3 command: - make args: @@ -58,7 +58,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-3 command: - make args: @@ -79,7 +79,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-3 command: - ./hack/verify-licenses.sh resources: @@ -95,7 +95,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-3 command: - make args: @@ -115,7 +115,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-3 command: - make args: @@ -130,7 +130,7 @@ presubmits: clone_uri: "ssh://git@github.com/kubermatic/operating-system-manager.git" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-3 command: - shfmt args: @@ -161,7 +161,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-3 command: - make args: @@ -182,7 +182,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.22-5 + - image: quay.io/kubermatic/build:go-1.22-node-20-kind-0.22-3 command: - "./hack/ci/run-e2e-tests.sh" resources: diff --git a/Dockerfile b/Dockerfile index 1f522941..039abdd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG GO_VERSION=1.22.1 +ARG GO_VERSION=1.22.2 FROM golang:${GO_VERSION} AS builder WORKDIR /go/src/k8c.io/operating-system-manager COPY . . diff --git a/Makefile b/Makefile index 078864ed..f1d216da 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ export GO111MODULE=on export GOFLAGS?=-mod=readonly -trimpath export GIT_TAG ?= $(shell git tag --points-at HEAD) -GO_VERSION = 1.22.1 +GO_VERSION = 1.22.2 CMD = $(notdir $(wildcard ./cmd/*)) BUILD_DEST ?= _build diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index fecfece5..9c80a34f 100755 --- a/hack/update-codegen.sh +++ b/hack/update-codegen.sh @@ -19,7 +19,7 @@ set -euo pipefail cd $(dirname $0)/.. source hack/lib.sh -CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-18-5 containerize ./hack/update-codegen.sh +CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-20-3 containerize ./hack/update-codegen.sh SCRIPT_ROOT=$(dirname "${BASH_SOURCE}") sed="sed" diff --git a/hack/update-crds-openapi.sh b/hack/update-crds-openapi.sh index ae7639a2..634fd90e 100755 --- a/hack/update-crds-openapi.sh +++ b/hack/update-crds-openapi.sh @@ -19,7 +19,7 @@ set -euo pipefail cd $(dirname $0)/.. source hack/lib.sh -CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-18-5 containerize ./hack/update-crds-openapi.sh +CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-20-3 containerize ./hack/update-crds-openapi.sh SCRIPT_ROOT=$(dirname "${BASH_SOURCE}") echodate "Creating vendor directory" diff --git a/hack/verify-licenses.sh b/hack/verify-licenses.sh index 73d43bdd..e2eb518d 100755 --- a/hack/verify-licenses.sh +++ b/hack/verify-licenses.sh @@ -19,7 +19,7 @@ set -euo pipefail cd $(dirname $0)/.. source hack/lib.sh -CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-18-5 containerize ./hack/verify-licenses.sh +CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.22-node-20-3 containerize ./hack/verify-licenses.sh go mod vendor