Skip to content

WRKLDS-1251: Switch cli image to RHEL9 base image #1752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
May 4, 2024
Merged

WRKLDS-1251: Switch cli image to RHEL9 base image #1752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e11d64
Switch cli image to RHEL9 base image
ardaguclu Apr 29, 2024
65c2c3d
Switch cli-artifacts default oc to RHEL9
ardaguclu May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion images/cli-artifacts/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions images/cli/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" \
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/debug/debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down