From 890f708020c31cf42eb544afc95f85a5f8672420 Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Thu, 7 May 2026 10:51:08 -0400 Subject: [PATCH 1/2] images: bump UPI image dependencies to 4.22 Bump source image dependencies to 4.22. This is particularly important for the oc cli as the latest 4.22 version contains a bug fix for filtering tech preview manifests. --- images/installer/Dockerfile.upi.ci | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index 899ef68fedb..7d5e384ffc6 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -3,8 +3,8 @@ # It also contains the `upi` directory that contains various terraform and cloud formation templates that are used to create infrastructure resources. # We copy from the -artifacts images because they are statically linked -FROM registry.ci.openshift.org/ocp/4.17:installer-kube-apiserver-artifacts AS kas-artifacts -FROM registry.ci.openshift.org/ocp/4.17:installer-etcd-artifacts AS etcd-artifacts +FROM registry.ci.openshift.org/ocp/4.22:installer-kube-apiserver-artifacts AS kas-artifacts +FROM registry.ci.openshift.org/ocp/4.22:installer-etcd-artifacts AS etcd-artifacts FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder # FIPS support is offered via the baremetal-installer image @@ -19,13 +19,13 @@ RUN mkdir -p cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH) && \ mv cluster-api/bin/$(go env GOOS)/$(go env GOHOSTARCH)/* -t cluster-api/bin/$(go env GOOS)_$(go env GOHOSTARCH)/ RUN DEFAULT_ARCH="$(go env GOHOSTARCH)" hack/build.sh -FROM registry.ci.openshift.org/ocp/4.17:cli as cli +FROM registry.ci.openshift.org/ocp/4.22:cli as cli FROM quay.io/ocp-splat/govc:v0.30.7 as govc FROM quay.io/ocp-splat/pwsh:latest as pwsh FROM quay.io/multi-arch/yq:3.3.0 as yq3 FROM quay.io/multi-arch/yq:4.30.5 as yq4 -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 COPY --from=cli /usr/bin/oc /bin/oc COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install /bin/openshift-install COPY --from=builder /go/src/github.com/openshift/installer/upi /var/lib/openshift-install/upi From 1bbdd732785fb4f3dc231134bf963756c92a708b Mon Sep 17 00:00:00 2001 From: Patrick Dillon Date: Mon, 11 May 2026 15:49:45 -0400 Subject: [PATCH 2/2] images: remove bind-utils from UPI image Don't install bind-utils package because it already exists in the base image. --- images/installer/Dockerfile.upi.ci | 1 - 1 file changed, 1 deletion(-) diff --git a/images/installer/Dockerfile.upi.ci b/images/installer/Dockerfile.upi.ci index 7d5e384ffc6..0bf93e697db 100644 --- a/images/installer/Dockerfile.upi.ci +++ b/images/installer/Dockerfile.upi.ci @@ -61,7 +61,6 @@ RUN yum update -y && \ openssl \ python3-pip \ python3-pyyaml \ - bind-utils \ util-linux \ xz \ qemu-img && \