Skip to content

Commit 5f08414

Browse files
authored
MGMT-24456: upgrade to golang 1.26 (#1017)
1 parent f46caad commit 5f08414

5 files changed

Lines changed: 7 additions & 5 deletions

File tree

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.25-openshift-4.22
4+
tag: rhel-9-release-golang-1.26-openshift-5.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM registry.access.redhat.com/ubi9/go-toolset:1.25 AS builder
2+
FROM registry.access.redhat.com/ubi9/go-toolset:1.26 AS builder
33

44
USER 0
55

Dockerfile.rhtap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 as builder
2+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.26 as builder
33

44
WORKDIR /workspace
55
COPY . .

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ mockgen: ## Download mockgen locally if necessary.
163163

164164
GOLINT = $(shell pwd)/bin/golangci-lint
165165
golint: ## Download golangci-lint locally if necessary.
166-
$(call go-get-tool,$(GOLINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.6.2)
166+
$(call go-get-tool,$(GOLINT),github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.11.4)
167167

168168
# go-get-tool will 'go get' any package $2 and install it to $1.
169169
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/openshift/cluster-api-provider-agent
22

3-
go 1.25.7
3+
go 1.26.0
4+
5+
toolchain go1.26.2
46

57
// Versions to be held for v1beta1
68
// sigs.k8s.io/controller-runtime on v0.11.x

0 commit comments

Comments
 (0)