From 3b0c3a3989d945b2e4b2b83a8f5d8e5139167e3e Mon Sep 17 00:00:00 2001 From: Marvin Beckers Date: Tue, 12 Dec 2023 12:44:06 +0100 Subject: [PATCH] [release/v1.58] Update Prow jobs to build image with Go 1.21.5 (#1747) * [release/v1.58] Update Prow jobs to build image with Go 1.21.5 Signed-off-by: Marvin Beckers * [release/v1.58] Also update Dockerfile and Makefile Signed-off-by: Marvin Beckers * [release/v1.58] Use stable OSM release Signed-off-by: Marvin Beckers * [release/v1.58] Update to fixed build image Signed-off-by: Marvin Beckers --------- Signed-off-by: Marvin Beckers --- .prow/e2e-features.yaml | 8 ++++---- .prow/postsubmits.yaml | 4 ++-- .prow/provider-alibaba.yaml | 2 +- .prow/provider-anexia.yaml | 2 +- .prow/provider-aws.yaml | 16 ++++++++-------- .prow/provider-azure.yaml | 6 +++--- .prow/provider-digitalocean.yaml | 2 +- .prow/provider-equinix-metal.yaml | 2 +- .prow/provider-gcp.yaml | 2 +- .prow/provider-hetzner.yaml | 2 +- .prow/provider-kubevirt.yaml | 2 +- .prow/provider-linode.yaml | 2 +- .prow/provider-nutanix.yaml | 2 +- .prow/provider-openstack.yaml | 4 ++-- .prow/provider-scaleway.yaml | 2 +- .prow/provider-vmware-cloud-director.yaml | 2 +- .prow/provider-vsphere.yaml | 8 ++++---- .prow/verify.yaml | 8 ++++---- Dockerfile | 2 +- Makefile | 2 +- examples/operating-system-manager.yaml | 2 +- hack/update-fixtures.sh | 2 +- hack/verify-licenses.sh | 2 +- 23 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.prow/e2e-features.yaml b/.prow/e2e-features.yaml index 202605728..fe59ab740 100644 --- a/.prow/e2e-features.yaml +++ b/.prow/e2e-features.yaml @@ -34,7 +34,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -63,7 +63,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -92,7 +92,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -119,7 +119,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/postsubmits.yaml b/.prow/postsubmits.yaml index dfd7fc12c..68d162289 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.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - /bin/bash - -c @@ -54,7 +54,7 @@ postsubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/upload-gocache.sh" resources: diff --git a/.prow/provider-alibaba.yaml b/.prow/provider-alibaba.yaml index a6942daf6..d3462ad51 100644 --- a/.prow/provider-alibaba.yaml +++ b/.prow/provider-alibaba.yaml @@ -29,7 +29,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-anexia.yaml b/.prow/provider-anexia.yaml index b57d81f39..2c6896ceb 100644 --- a/.prow/provider-anexia.yaml +++ b/.prow/provider-anexia.yaml @@ -31,7 +31,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-aws.yaml b/.prow/provider-aws.yaml index ee89f3037..9adfb1063 100644 --- a/.prow/provider-aws.yaml +++ b/.prow/provider-aws.yaml @@ -28,7 +28,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -60,7 +60,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 env: - name: OPERATING_SYSTEM_MANAGER value: "false" @@ -93,7 +93,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -124,7 +124,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -156,7 +156,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -187,7 +187,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -218,7 +218,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -249,7 +249,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-azure.yaml b/.prow/provider-azure.yaml index dcbb400ae..a055a5b3f 100644 --- a/.prow/provider-azure.yaml +++ b/.prow/provider-azure.yaml @@ -28,7 +28,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -60,7 +60,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -93,7 +93,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-digitalocean.yaml b/.prow/provider-digitalocean.yaml index be4145ff2..393ef95fd 100644 --- a/.prow/provider-digitalocean.yaml +++ b/.prow/provider-digitalocean.yaml @@ -27,7 +27,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-equinix-metal.yaml b/.prow/provider-equinix-metal.yaml index fae3c5e7d..0e4888a7a 100644 --- a/.prow/provider-equinix-metal.yaml +++ b/.prow/provider-equinix-metal.yaml @@ -28,7 +28,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-gcp.yaml b/.prow/provider-gcp.yaml index f09cb7cca..592af7d08 100644 --- a/.prow/provider-gcp.yaml +++ b/.prow/provider-gcp.yaml @@ -28,7 +28,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-hetzner.yaml b/.prow/provider-hetzner.yaml index 23e7079f1..204cfba35 100644 --- a/.prow/provider-hetzner.yaml +++ b/.prow/provider-hetzner.yaml @@ -26,7 +26,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-kubevirt.yaml b/.prow/provider-kubevirt.yaml index e77547e49..a6f1204ce 100644 --- a/.prow/provider-kubevirt.yaml +++ b/.prow/provider-kubevirt.yaml @@ -29,7 +29,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-linode.yaml b/.prow/provider-linode.yaml index b9a2817a1..dc900ef89 100644 --- a/.prow/provider-linode.yaml +++ b/.prow/provider-linode.yaml @@ -28,7 +28,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-nutanix.yaml b/.prow/provider-nutanix.yaml index d4412e694..bf40ac5a2 100644 --- a/.prow/provider-nutanix.yaml +++ b/.prow/provider-nutanix.yaml @@ -27,7 +27,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-openstack.yaml b/.prow/provider-openstack.yaml index 59a72b046..c32083ad7 100644 --- a/.prow/provider-openstack.yaml +++ b/.prow/provider-openstack.yaml @@ -29,7 +29,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -62,7 +62,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-scaleway.yaml b/.prow/provider-scaleway.yaml index 58f98244f..42eb04cd7 100644 --- a/.prow/provider-scaleway.yaml +++ b/.prow/provider-scaleway.yaml @@ -27,7 +27,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-vmware-cloud-director.yaml b/.prow/provider-vmware-cloud-director.yaml index 16a89ecb0..e0abf8433 100644 --- a/.prow/provider-vmware-cloud-director.yaml +++ b/.prow/provider-vmware-cloud-director.yaml @@ -29,7 +29,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/provider-vsphere.yaml b/.prow/provider-vsphere.yaml index f3be1bd70..8af222d88 100644 --- a/.prow/provider-vsphere.yaml +++ b/.prow/provider-vsphere.yaml @@ -28,7 +28,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -60,7 +60,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -92,7 +92,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: @@ -124,7 +124,7 @@ presubmits: preset-kubeconfig-ci: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - "./hack/ci/run-e2e-tests.sh" args: diff --git a/.prow/verify.yaml b/.prow/verify.yaml index da46a158e..261ba1c32 100644 --- a/.prow/verify.yaml +++ b/.prow/verify.yaml @@ -21,7 +21,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: golang:1.21.3 + - image: golang:1.21.5 command: - make args: @@ -42,7 +42,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: golang:1.21.3 + - image: golang:1.21.5 command: - make args: @@ -149,7 +149,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-6 + - image: quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 command: - ./hack/verify-licenses.sh resources: @@ -165,7 +165,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: golang:1.21.3 + - image: golang:1.21.5 command: - make args: diff --git a/Dockerfile b/Dockerfile index 04ad940d3..eb4168adb 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.21.0 +ARG GO_VERSION=1.21.5 FROM docker.io/golang:${GO_VERSION} AS builder WORKDIR /go/src/github.com/kubermatic/machine-controller COPY . . diff --git a/Makefile b/Makefile index 1697eb852..82350088c 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ SHELL = /bin/bash -eu -o pipefail -GO_VERSION ?= 1.21.0 +GO_VERSION ?= 1.21.5 GOOS ?= $(shell go env GOOS) diff --git a/examples/operating-system-manager.yaml b/examples/operating-system-manager.yaml index 7fc7a471e..4f6ef9943 100644 --- a/examples/operating-system-manager.yaml +++ b/examples/operating-system-manager.yaml @@ -990,7 +990,7 @@ spec: spec: serviceAccountName: operating-system-manager-webhook containers: - - image: quay.io/kubermatic/operating-system-manager:latest + - image: quay.io/kubermatic/operating-system-manager:v1.4.0 imagePullPolicy: Always name: webhook command: diff --git a/hack/update-fixtures.sh b/hack/update-fixtures.sh index eb150e4b3..0afcaa361 100755 --- a/hack/update-fixtures.sh +++ b/hack/update-fixtures.sh @@ -19,7 +19,7 @@ set -euo pipefail cd $(dirname $0)/.. source hack/lib.sh -CONTAINERIZE_IMAGE=golang:1.21.3 containerize ./hack/update-fixtures.sh +CONTAINERIZE_IMAGE=golang:1.21.5 containerize ./hack/update-fixtures.sh go test ./... -v -update || go test ./... diff --git a/hack/verify-licenses.sh b/hack/verify-licenses.sh index 6a43c150e..cb13ab003 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.21-node-18-kind-0.20-6 containerize ./hack/verify-licenses.sh +CONTAINERIZE_IMAGE=quay.io/kubermatic/build:go-1.21-node-18-kind-0.20-9 containerize ./hack/verify-licenses.sh go mod vendor