From 4fa18d0735c58b8c16a79431a17e0ba38c818a0e Mon Sep 17 00:00:00 2001 From: Joel Smith Date: Tue, 29 Oct 2024 18:13:18 -0600 Subject: [PATCH] UPSTREAM: : Update VPA dockerfiles --- vertical-pod-autoscaler/Dockerfile.openshift | 4 ++-- vertical-pod-autoscaler/Dockerfile.rhel | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vertical-pod-autoscaler/Dockerfile.openshift b/vertical-pod-autoscaler/Dockerfile.openshift index eb13568ada3c..281af300364c 100644 --- a/vertical-pod-autoscaler/Dockerfile.openshift +++ b/vertical-pod-autoscaler/Dockerfile.openshift @@ -1,11 +1,11 @@ -FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.17 AS builder +FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.18 AS builder WORKDIR /go/src/k8s.io/autoscaler/vertical-pod-autoscaler COPY . . RUN go build ./pkg/admission-controller RUN go build ./pkg/updater RUN go build ./pkg/recommender -FROM registry.ci.openshift.org/ocp/4.17:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 COPY --from=builder \ /go/src/k8s.io/autoscaler/vertical-pod-autoscaler/admission-controller \ /go/src/k8s.io/autoscaler/vertical-pod-autoscaler/updater \ diff --git a/vertical-pod-autoscaler/Dockerfile.rhel b/vertical-pod-autoscaler/Dockerfile.rhel index 734aea649f02..3d137fd09d37 100644 --- a/vertical-pod-autoscaler/Dockerfile.rhel +++ b/vertical-pod-autoscaler/Dockerfile.rhel @@ -1,11 +1,11 @@ -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/k8s.io/autoscaler/vertical-pod-autoscaler COPY . . RUN go build ./pkg/admission-controller RUN go build ./pkg/updater RUN go build ./pkg/recommender -FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 COPY --from=builder \ /go/src/k8s.io/autoscaler/vertical-pod-autoscaler/admission-controller \ /go/src/k8s.io/autoscaler/vertical-pod-autoscaler/updater \