From ae0ea27f60d02423dcef28ad3be35d7ee922748c Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Mon, 8 Jun 2026 04:54:30 +0000 Subject: [PATCH 1/4] Updating ose-cli-artifacts-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/af322abdd1a4d7d0161a69a16369a0ab1748515a/images/ose-cli-artifacts.yml --- .ci-operator.yaml | 2 +- images/cli-artifacts/Dockerfile.rhel | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a3628cf240..1d88a59fdf 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.25-openshift-4.22 + tag: rhel-9-release-golang-1.26-openshift-5.0 diff --git a/images/cli-artifacts/Dockerfile.rhel b/images/cli-artifacts/Dockerfile.rhel index 9d6188d092..d3ae460032 100644 --- a/images/cli-artifacts/Dockerfile.rhel +++ b/images/cli-artifacts/Dockerfile.rhel @@ -1,16 +1,16 @@ # This Dockerfile builds an image containing the Mac and Windows version of oc # layered on top of the Linux cli image. -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-4.22 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.26-openshift-5.0 AS builder WORKDIR /go/src/github.com/openshift/oc COPY . . RUN make cross-build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder-rhel-9 +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder-rhel-9 WORKDIR /go/src/github.com/openshift/oc COPY . . RUN make cross-build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/4.22:cli +FROM registry.ci.openshift.org/ocp/5.0:cli COPY --from=builder-rhel-9 /go/src/github.com/openshift/oc/_output/bin/ /usr/share/openshift/ From e95e32f344ebb218c0e66316f40e7445f4dbb9c7 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 6 Jun 2026 19:27:57 +0000 Subject: [PATCH 2/4] Updating ose-tools-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/7691ed4dc0b6585b358f9e73fb736ace9a48a286/images/ose-tools.yml --- images/tools/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/tools/Dockerfile b/images/tools/Dockerfile index 90ceedd216..635e9caf80 100644 --- a/images/tools/Dockerfile +++ b/images/tools/Dockerfile @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder WORKDIR /go/src/github.com/openshift/oc COPY . . RUN make build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 +FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/ COPY --from=builder /go/src/github.com/openshift/oc/images/tools/sos.conf /etc/sos/ 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 From ca9900019687a8d951cfd82592ea6d0d1ab6b7a7 Mon Sep 17 00:00:00 2001 From: AOS Automation Release Team Date: Sat, 6 Jun 2026 11:14:48 +0000 Subject: [PATCH 3/4] Updating openshift-enterprise-cli-container image to be consistent with ART for 5.0 Reconciling with https://github.com/openshift-eng/ocp-build-data/tree/7691ed4dc0b6585b358f9e73fb736ace9a48a286/images/openshift-enterprise-cli.yml --- images/cli/Dockerfile.rhel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/cli/Dockerfile.rhel b/images/cli/Dockerfile.rhel index 50d12a82a0..93e3cde7a8 100644 --- a/images/cli/Dockerfile.rhel +++ b/images/cli/Dockerfile.rhel @@ -1,10 +1,10 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-5.0 AS builder WORKDIR /go/src/github.com/openshift/oc COPY . . RUN make build --warn-undefined-variables \ && gzip oc-tests-ext -FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 +FROM registry.ci.openshift.org/ocp/5.0:base-rhel9 COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/ COPY --from=builder /go/src/github.com/openshift/oc/oc-tests-ext.gz /usr/bin/oc-tests-ext.gz RUN dnf install -y subscription-manager && dnf clean all && rm -rf /var/cache/dnf/* From dd91d4723eae71f329194188af58700890faa78c Mon Sep 17 00:00:00 2001 From: Ondra Kupka Date: Fri, 26 Jun 2026 11:04:27 +0200 Subject: [PATCH 4/4] go.mod: Use Go 1.26.0 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8704f801b4..d8e672c4ae 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/oc -go 1.25.6 +go 1.26.0 require ( al.essio.dev/pkg/shellescape v1.6.0