From 9e11d64307aa0587172b44ed6aad874ae34411a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Mon, 29 Apr 2024 09:02:52 +0300 Subject: [PATCH 1/2] Switch cli image to RHEL9 base image --- .ci-operator.yaml | 2 +- images/cli/Dockerfile.rhel | 4 ++-- pkg/cli/debug/debug.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 38718883ba..a83f0f8430 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.21-openshift-4.16 + tag: rhel-9-release-golang-1.21-openshift-4.16 diff --git a/images/cli/Dockerfile.rhel b/images/cli/Dockerfile.rhel index c83c4aaac6..6a1c9a6c79 100644 --- a/images/cli/Dockerfile.rhel +++ b/images/cli/Dockerfile.rhel @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder WORKDIR /go/src/github.com/openshift/oc COPY . . RUN make build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/4.16:base +FROM registry.ci.openshift.org/ocp/4.16:base-rhel9 COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/ RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done LABEL io.k8s.display-name="OpenShift Client" \ diff --git a/pkg/cli/debug/debug.go b/pkg/cli/debug/debug.go index 9dea1951dc..d968e09785 100644 --- a/pkg/cli/debug/debug.go +++ b/pkg/cli/debug/debug.go @@ -1041,8 +1041,8 @@ func (o *DebugOptions) approximatePodTemplateForObject(object runtime.Object) (* } } if len(image) == 0 { - klog.V(2).Infof("Falling to 'registry.redhat.io/rhel8/support-tools' image") - image = "registry.redhat.io/rhel8/support-tools" + klog.V(2).Infof("Falling to 'registry.redhat.io/rhel9/support-tools' image") + image = "registry.redhat.io/rhel9/support-tools" } zero := int64(0) isTrue := true From 65c2c3d7a554de2027e2f5870c950aad6b879fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Fri, 3 May 2024 10:36:23 +0300 Subject: [PATCH 2/2] Switch cli-artifacts default oc to RHEL9 --- images/cli-artifacts/Dockerfile.rhel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/cli-artifacts/Dockerfile.rhel b/images/cli-artifacts/Dockerfile.rhel index 113cbf8e4f..06d97cde19 100644 --- a/images/cli-artifacts/Dockerfile.rhel +++ b/images/cli-artifacts/Dockerfile.rhel @@ -12,7 +12,7 @@ RUN make cross-build --warn-undefined-variables FROM registry.ci.openshift.org/ocp/4.16:cli -COPY --from=builder /go/src/github.com/openshift/oc/_output/bin/ /usr/share/openshift/ +COPY --from=builder-rhel-9 /go/src/github.com/openshift/oc/_output/bin/ /usr/share/openshift/ RUN cd /usr/share/openshift && \ ln -sf /usr/share/openshift/linux_$(uname -m | sed 's/aarch64/arm64/;s/x86_64/amd64/')/oc /usr/bin/oc && \