Skip to content

Commit

Permalink
Upgrade to Go 1.22
Browse files Browse the repository at this point in the history
Signed-off-by: Waleed Malik <[email protected]>
  • Loading branch information
ahmedwaleedmalik committed Feb 9, 2024
1 parent 3f02ef6 commit 8648ea9
Show file tree
Hide file tree
Showing 24 changed files with 80 additions and 82 deletions.
8 changes: 4 additions & 4 deletions .prow/e2e-features.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -63,7 +63,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -92,7 +92,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand All @@ -119,7 +119,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
4 changes: 2 additions & 2 deletions .prow/postsubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ postsubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- /bin/bash
- -c
Expand Down Expand Up @@ -54,7 +54,7 @@ postsubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/upload-gocache.sh"
resources:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-alibaba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-anexia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
16 changes: 8 additions & 8 deletions .prow/provider-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -60,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
env:
- name: OPERATING_SYSTEM_MANAGER
value: "false"
Expand Down Expand Up @@ -93,7 +93,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -124,7 +124,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -156,7 +156,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -187,7 +187,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -218,7 +218,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -249,7 +249,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
6 changes: 3 additions & 3 deletions .prow/provider-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -60,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -93,7 +93,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-digitalocean.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-equinix-metal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-hetzner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-kubevirt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-linode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-nutanix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
4 changes: 2 additions & 2 deletions .prow/provider-openstack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -62,7 +62,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-scaleway.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
2 changes: 1 addition & 1 deletion .prow/provider-vmware-cloud-director.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
8 changes: 4 additions & 4 deletions .prow/provider-vsphere.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -60,7 +60,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -92,7 +92,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down Expand Up @@ -124,7 +124,7 @@ presubmits:
preset-kubeconfig-ci: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- "./hack/ci/run-e2e-tests.sh"
args:
Expand Down
10 changes: 5 additions & 5 deletions .prow/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: golang:1.21.5
- image: golang:1.22.0
command:
- make
args:
Expand All @@ -42,7 +42,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: golang:1.21.5
- image: golang:1.22.0
command:
- make
args:
Expand All @@ -63,7 +63,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: golangci/golangci-lint:v1.54.1
- image: golangci/golangci-lint:v1.56.0
command:
- make
args:
Expand Down Expand Up @@ -149,7 +149,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9
- image: quay.io/kubermatic/build:go-1.22-node-18-kind-0.21-2
command:
- ./hack/verify-licenses.sh
resources:
Expand All @@ -165,7 +165,7 @@ presubmits:
preset-goproxy: "true"
spec:
containers:
- image: golang:1.21.5
- image: golang:1.22.0
command:
- make
args:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG GO_VERSION=1.21.5
ARG GO_VERSION=1.22.0
FROM docker.io/golang:${GO_VERSION} AS builder
WORKDIR /go/src/github.com/kubermatic/machine-controller
COPY . .
RUN make all

FROM alpine:3.17
FROM alpine:3.19

RUN apk add --no-cache ca-certificates cdrkit

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

SHELL = /bin/bash -eu -o pipefail

GO_VERSION ?= 1.21.5
GO_VERSION ?= 1.22.0

GOOS ?= $(shell go env GOOS)

Expand Down
Loading

0 comments on commit 8648ea9

Please sign in to comment.