From e602a80170dbc7911e4e2a7d699a5476f3596cec Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Fri, 19 Dec 2025 17:31:16 +0000 Subject: [PATCH] UPSTREAM: : Updating kube-proxy-container image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/kube-proxy.yml --- .ci-operator.yaml | 2 +- openshift-hack/images/kube-proxy/Dockerfile.rhel | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index e307e5af6628b..284a910090b7a 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.24-openshift-4.21 + tag: rhel-9-release-golang-1.24-openshift-4.22 diff --git a/openshift-hack/images/kube-proxy/Dockerfile.rhel b/openshift-hack/images/kube-proxy/Dockerfile.rhel index e1e7f5d18f777..291ffe9cd2d52 100644 --- a/openshift-hack/images/kube-proxy/Dockerfile.rhel +++ b/openshift-hack/images/kube-proxy/Dockerfile.rhel @@ -1,11 +1,11 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder WORKDIR /go/src/k8s.io/kubernetes COPY . . RUN make WHAT='cmd/kube-proxy' && \ mkdir -p /tmp/build && \ cp /go/src/k8s.io/kubernetes/_output/local/bin/linux/$(go env GOARCH)/kube-proxy /tmp/build -FROM registry.ci.openshift.org/ocp/4.21:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 RUN INSTALL_PKGS="conntrack-tools iptables nftables" && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ yum clean all && rm -rf /var/cache/*