From 5bb42550806c19b8017ff73ab3520983ba18eab0 Mon Sep 17 00:00:00 2001 From: Florian Bergmann Date: Tue, 16 Dec 2025 09:51:28 +0100 Subject: [PATCH 1/4] Update minimal go version to fix stdlib CVEs --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9676e0d3..4eaa14f3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/backplane-cli -go 1.24.4 +go 1.24.11 require ( github.com/Masterminds/semver v1.5.0 From 46dc94ad9b883db1db2c59fd1eed5efd447b0bea Mon Sep 17 00:00:00 2001 From: Florian Bergmann Date: Tue, 16 Dec 2025 10:54:08 +0100 Subject: [PATCH 2/4] Update ci image to 1.24 and Dockerfile. --- .ci-operator.yaml | 2 +- Dockerfile | 7 ++----- Makefile | 8 +++++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 521c4f16..3e1fd768 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: builder namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.16 + tag: rhel-9-golang-1.24-openshift-4.21 diff --git a/Dockerfile b/Dockerfile index 8ff5bf17..612fabbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,12 +15,12 @@ FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 # Configure the env -RUN go env -w GOTOOLCHAIN=go1.24.4+auto #Environment variables ENV GOOS=linux GO111MODULE=on GOPROXY=https://proxy.golang.org ENV GOBIN=/gobin GOPATH=/usr/src/go CGO_ENABLED=0 -ENV GOTOOLCHAIN=go1.24.4+auto +ENV GOTOOLCHAIN=go1.24.11+auto +RUN go env -w GOTOOLCHAIN=$GOTOOLCHAIN # Directory for the binary RUN mkdir /out @@ -37,9 +37,6 @@ RUN chmod -R +x /out ### Build dependencies FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as dep-builder -# Ensure we can use Go 1.24.4 -ENV GOTOOLCHAIN=go1.24.4+auto - ARG GITHUB_URL="https://api.github.com" ARG GITHUB_TOKEN="" diff --git a/Makefile b/Makefile index 31ae40f0..51dedc77 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ GO_BUILD_FLAGS_LINUX_CROSS :=-tags 'include_gcs include_oss containers_image_ope GOLANGCI_LINT_VERSION=v2.5.0 GORELEASER_VERSION=v1.14.1 GOVULNCHECK_VERSION=v1.0.1 +export GOTOOLCHAIN=go1.24.11+auto TESTOPTS ?= @@ -49,13 +50,14 @@ OUTPUT_DIR :=_output CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin build: clean - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.4+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 + go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 build-static: clean - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.4+auto go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 + go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 install: - GOTOOLCHAIN=go1.24.4+auto go install ./cmd/ocm-backplane + @echo $(GOTOOLCHAIN) + go install ./cmd/ocm-backplane clean: rm -f ocm-backplane From 03462e06c2b3c05f1ef4ca197b600c00e1afbff7 Mon Sep 17 00:00:00 2001 From: Florian Bergmann Date: Tue, 16 Dec 2025 11:25:04 +0100 Subject: [PATCH 3/4] Test with explicit setting. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 51dedc77..f78dc374 100644 --- a/Makefile +++ b/Makefile @@ -50,13 +50,12 @@ OUTPUT_DIR :=_output CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin build: clean - go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 + env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.11+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 build-static: clean go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 install: - @echo $(GOTOOLCHAIN) go install ./cmd/ocm-backplane clean: From 4d089e3cb9614a8b4f3979438f0820d3a55da72b Mon Sep 17 00:00:00 2001 From: Florian Bergmann Date: Tue, 16 Dec 2025 12:00:21 +0100 Subject: [PATCH 4/4] TEst 1.25 --- .ci-operator.yaml | 2 +- Dockerfile | 6 +++--- Makefile | 12 ++++++------ go.mod | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 3e1fd768..b000a0e8 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: builder namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.21 + tag: rhel-9-golang-1.25-openshift-4.21 diff --git a/Dockerfile b/Dockerfile index 612fabbb..8127bc1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN yum --assumeyes install \ && yum clean all; ### Build backplane-cli -FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as bp-cli-builder +FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_10_golang_1.25 as bp-cli-builder # Configure the env @@ -19,7 +19,7 @@ FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 #Environment variables ENV GOOS=linux GO111MODULE=on GOPROXY=https://proxy.golang.org ENV GOBIN=/gobin GOPATH=/usr/src/go CGO_ENABLED=0 -ENV GOTOOLCHAIN=go1.24.11+auto +ENV GOTOOLCHAIN=go1.25.5+auto RUN go env -w GOTOOLCHAIN=$GOTOOLCHAIN # Directory for the binary @@ -35,7 +35,7 @@ RUN cp ./ocm-backplane /out RUN chmod -R +x /out ### Build dependencies -FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as dep-builder +FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_10_golang_1.25 as dep-builder ARG GITHUB_URL="https://api.github.com" ARG GITHUB_TOKEN="" diff --git a/Makefile b/Makefile index f78dc374..93899f47 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ GO_BUILD_FLAGS_LINUX_CROSS :=-tags 'include_gcs include_oss containers_image_ope GOLANGCI_LINT_VERSION=v2.5.0 GORELEASER_VERSION=v1.14.1 GOVULNCHECK_VERSION=v1.0.1 -export GOTOOLCHAIN=go1.24.11+auto +export GOTOOLCHAIN=go1.25.5+auto TESTOPTS ?= @@ -50,7 +50,7 @@ OUTPUT_DIR :=_output CROSS_BUILD_BINDIR :=$(OUTPUT_DIR)/bin build: clean - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.11+auto go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 + go build -o ocm-backplane ./cmd/ocm-backplane || exit 1 build-static: clean go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ocm-backplane ./cmd/ocm-backplane || exit 1 @@ -83,18 +83,18 @@ release-with-note: ensure-goreleaser goreleaser release --rm-dist --release-notes="$(NOTE)" test: - env -u GOTOOLCHAIN GOTOOLCHAIN=go1.24.4+auto go test -v $(TESTOPTS) ./... + go test -v $(TESTOPTS) ./... .PHONY: coverage coverage: hack/codecov.sh cross-build-darwin-amd64: - +@GOOS=darwin GOARCH=amd64 GOTOOLCHAIN=go1.24.4+auto go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane + +@GOOS=darwin GOARCH=amd64 go build $(GO_BUILD_FLAGS_DARWIN) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_darwin_amd64 ./cmd/ocm-backplane .PHONY: cross-build-darwin-amd64 cross-build-linux-amd64: - +@GOOS=linux GOARCH=amd64 GOTOOLCHAIN=go1.24.4+auto go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane + +@GOOS=linux GOARCH=amd64 go build $(GO_BUILD_FLAGS_LINUX_CROSS) -o $(CROSS_BUILD_BINDIR)/ocm-backplane_linux_amd64 ./cmd/ocm-backplane .PHONY: cross-build-linux-amd64 cross-build: cross-build-darwin-amd64 cross-build-linux-amd64 @@ -107,7 +107,7 @@ clean-cross-build: .PHONY: generate generate: - GOTOOLCHAIN=go1.24.4+auto go generate ./... + go generate ./... .PHONY: mock-gen mock-gen: diff --git a/go.mod b/go.mod index 4eaa14f3..1403f3f2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/backplane-cli -go 1.24.11 +go 1.25.5 require ( github.com/Masterminds/semver v1.5.0