From 19b2c608f66b9079fc0e21745143414d8030dc62 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Tue, 3 Sep 2024 18:30:52 +0000 Subject: [PATCH] Updating kube-proxy-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/kube-proxy.yml --- .ci-operator.yaml | 2 +- images/kube-proxy/Dockerfile.rhel | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 1e59c02c2..64887a08b 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.22-openshift-4.17 + tag: rhel-9-release-golang-1.22-openshift-4.18 diff --git a/images/kube-proxy/Dockerfile.rhel b/images/kube-proxy/Dockerfile.rhel index 81ebc2181..598870cbd 100644 --- a/images/kube-proxy/Dockerfile.rhel +++ b/images/kube-proxy/Dockerfile.rhel @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder WORKDIR /go/src/github.com/openshift/sdn COPY . . RUN make build GO_BUILD_PACKAGES=./vendor/k8s.io/kubernetes/cmd/kube-proxy --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 RUN INSTALL_PKGS="conntrack-tools iptables nftables" && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ yum clean all && rm -rf /var/cache/*