Skip to content

Commit 63a3ccf

Browse files
author
AOS Automation Release Team
committed
UPSTREAM: <carry>: Updating kube-proxy-container image to be consistent with ART for 4.21
Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/kube-proxy.yml
1 parent 5c9df33 commit 63a3ccf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.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.24-openshift-4.20
4+
tag: rhel-9-release-golang-1.24-openshift-4.21

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.24-openshift-4.20 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 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.20:base-rhel9
8+
FROM registry.ci.openshift.org/ocp/4.21: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)