From 9617c446a8cae5da9cb6f56bea64d30180274c7b Mon Sep 17 00:00:00 2001 From: Venkata Charan Sunku Date: Tue, 23 Jun 2026 15:27:42 +0530 Subject: [PATCH] chore: Syncing CI Build Root image and dockerfile base image tags and go version in go.mod with ART 4.22 stream Signed-off-by: Venkata Charan Sunku --- .ci-operator.yaml | 2 +- Dockerfile.openshift | 8 ++++---- go.mod | 4 +--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 461415cbc..a3628cf24 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.24-openshift-4.20 + tag: rhel-9-release-golang-1.25-openshift-4.22 diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 27f812dfd..18fd5ffcd 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS rhel9 +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS rhel9 ADD . /go/src/github.com/openshift/whereabouts WORKDIR /go/src/github.com/openshift/whereabouts ENV CGO_ENABLED=1 @@ -8,7 +8,7 @@ RUN go build -mod vendor -o bin/ip-control-loop cmd/controlloop/controlloop.go RUN go build -mod vendor -o bin/node-slice-controller cmd/nodeslicecontroller/node_slice_controller.go WORKDIR / -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.20 AS rhel8 +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-4.22 AS rhel8 ADD . /go/src/github.com/openshift/whereabouts WORKDIR /go/src/github.com/openshift/whereabouts ENV CGO_ENABLED=1 @@ -18,7 +18,7 @@ RUN go build -mod vendor -o bin/ip-control-loop cmd/controlloop/controlloop.go RUN go build -mod vendor -o bin/node-slice-controller cmd/nodeslicecontroller/node_slice_controller.go WORKDIR / -FROM registry.ci.openshift.org/ocp/4.20:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.22:base-rhel9 RUN mkdir -p /usr/src/whereabouts/images && \ mkdir -p /usr/src/whereabouts/bin && \ mkdir -p /usr/src/whereabouts/rhel9/bin && \ @@ -38,4 +38,4 @@ LABEL org.opencontainers.image.source https://github.com/openshift/whereabouts LABEL io.k8s.display-name="Whereabouts CNI" \ io.k8s.description="This is a component of OpenShift Container Platform and provides a cluster-wide IPAM CNI plugin." \ io.openshift.tags="openshift" \ - maintainer="CTO Networking " \ No newline at end of file + maintainer="CTO Networking " diff --git a/go.mod b/go.mod index 284b3be5d..cdf02af1f 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/k8snetworkplumbingwg/whereabouts -go 1.24.2 - -toolchain go1.24.6 +go 1.25.9 require ( github.com/blang/semver v3.5.1+incompatible