Skip to content

Commit 800c337

Browse files
author
AOS Automation Release Team
committed
UPSTREAM: <carry>: Updating kube-proxy-container image to be consistent with ART for 5.0
Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/782b03567cac0085e0d8aaa346e382a3abc2d435/images/kube-proxy.yml
1 parent 872bd37 commit 800c337

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.25-openshift-4.22
4+
tag: rhel-9-release-golang-1.26-openshift-5.0

openshift-hack/images/kube-proxy/Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder
22
WORKDIR /go/src/k8s.io/kubernetes
33
COPY . .
44
RUN make WHAT='cmd/kube-proxy' && \
55
mkdir -p /tmp/build && \
66
cp /go/src/k8s.io/kubernetes/_output/local/bin/linux/$(go env GOARCH)/kube-proxy /tmp/build
77

8-
FROM registry.ci.openshift.org/ocp/4.22:base-rhel9
8+
FROM registry.ci.openshift.org/ocp/5.0:base-rhel9
99
RUN INSTALL_PKGS="conntrack-tools iptables nftables" && \
1010
yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
1111
yum clean all && rm -rf /var/cache/*

0 commit comments

Comments
 (0)