From 89d5cb089b658c63dae4e5e35153ec90f7bc0f9d Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Fri, 8 Sep 2023 14:48:00 +0000 Subject: [PATCH] Updating atomic-openshift-descheduler images to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/ed337d94faaaa3782fcccf3a54d9a2256ba2aa9b/images/atomic-openshift-descheduler.yml --- .ci-operator.yaml | 2 +- images/descheduler/Dockerfile.rhel7 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 844f0d26ad..7cd14bfef5 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.20-openshift-4.14 + tag: rhel-8-release-golang-1.20-openshift-4.15 diff --git a/images/descheduler/Dockerfile.rhel7 b/images/descheduler/Dockerfile.rhel7 index 4c3cb06a28..4f0dc5f54b 100644 --- a/images/descheduler/Dockerfile.rhel7 +++ b/images/descheduler/Dockerfile.rhel7 @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.15 AS builder WORKDIR /go/src/sigs.k8s.io/descheduler COPY . . ARG prefix=sigs.k8s.io/descheduler/pkg/version RUN go build -ldflags "-X ${prefix}.version=${OS_GIT_VERSION} -X ${prefix}.buildDate=${BUILD_RELEASE} -X ${prefix}.gitsha1=${SOURCE_GIT_COMMIT}" -o descheduler ./cmd/descheduler -FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.14 +FROM registry.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.15 COPY --from=builder /go/src/sigs.k8s.io/descheduler/descheduler /usr/bin/ CMD ["/usr/bin/descheduler"]