From 6ecade9694ed13f9f5139273366c651c1c89c765 Mon Sep 17 00:00:00 2001 From: Damiano Donati Date: Tue, 18 Nov 2025 10:16:03 +0100 Subject: [PATCH] bump k8s 1.34: bump Makefile and Dockerfile --- Dockerfile | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a65a0de2e..fa7c6e86c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder WORKDIR /go/src/github.com/openshift/machine-api-provider-aws COPY . . # VERSION env gets set in the openshift/release image and refers to the golang version, which interfers with our own diff --git a/Makefile b/Makefile index c215975cb..fb159aea4 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # limitations under the License. # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -ENVTEST_K8S_VERSION = 1.33.2 +ENVTEST_K8S_VERSION = 1.34.1 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST)))) ENVTEST = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-runtime/tools/setup-envtest @@ -39,7 +39,7 @@ REPO_PATH ?= github.com/openshift/machine-api-provider-aws LD_FLAGS ?= -X $(REPO_PATH)/pkg/version.Raw=$(VERSION) -extldflags "-static" MUTABLE_TAG ?= latest IMAGE = origin-aws-machine-controllers -BUILD_IMAGE ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 +BUILD_IMAGE ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 # race tests need CGO_ENABLED, everything else should have it disabled CGO_ENABLED = 0