Skip to content

Commit 1f2407a

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #464 from stuggi/go-1.26.3-bump
Bump Go to 1.26.3
2 parents 5dddcc5 + e06e6e9 commit 1f2407a

14 files changed

Lines changed: 114 additions & 96 deletions

‎.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: tools
33
namespace: openstack-k8s-operators
4-
tag: ci-build-root-golang-1.24-sdk-1.41.1
4+
tag: ci-build-root-golang-1.26-sdk-1.42.3

‎.github/workflows/build-test-operator.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- name: Install Go
6868
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6
6969
with:
70-
go-version: 1.24.x
70+
go-version: 1.26.x
7171

7272
- name: Checkout test-operator repository
7373
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
@@ -76,7 +76,7 @@ jobs:
7676
uses: redhat-actions/openshift-tools-installer@144527c7d98999f2652264c048c7a9bd103f8a82 # v1
7777
with:
7878
source: github
79-
operator-sdk: '1.41.1'
79+
operator-sdk: '1.42.3'
8080

8181
- name: Log in to Quay Registry
8282
uses: redhat-actions/podman-login@4934294ad0449894bcd1e9f191899d7292469603 # v1

‎.github/workflows/force-bump-pr-manual.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
with:
1010
operator_name: test
1111
branch_name: ${{ github.ref_name }}
12-
custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.41.1
12+
custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.26-sdk-1.42.3
1313
secrets:
1414
FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}

‎.github/workflows/force-bump-pr-scheduled.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/force-bump-branches.yaml@main
1111
with:
1212
operator_name: test
13-
custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.41.1
13+
custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.26-sdk-1.42.3
1414
secrets:
1515
FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}

‎.github/workflows/lints.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Lints
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
check-go-mod-replace-lines:
7+
name: check for replace lines in go.mod files
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout project code
11+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
12+
- name: check for replace lines in go.mod files
13+
run: |
14+
! egrep --invert-match -e '^replace.*/api => \./api|^replace.*//allow-merging$' `find . -name 'go.mod'` | egrep -e 'go.mod:replace'

‎.golangci.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ linters:
1111
- gosec
1212
- errname
1313
- err113
14+
settings:
15+
govet:
16+
disable:
17+
# TODO: re-enable once golangci-lint supports Go 1.26 inlining of generics
18+
- inline
1419

1520
formatters:
1621
enable:

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ repos:
6262
entry: bashate --error . --ignore=E006,E040,E011,E020,E012
6363

6464
- repo: https://github.com/golangci/golangci-lint
65-
rev: v2.7.2
65+
rev: v2.12.2
6666
hooks:
6767
- id: golangci-lint-full
6868
args: ["-v"]

‎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-
ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.24
2+
ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.26
33
ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.6
44

55
FROM $GOLANG_BUILDER AS builder

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ endif
4848

4949
# Set the Operator SDK version to use. By default, what is installed on the system is used.
5050
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
51-
OPERATOR_SDK_VERSION ?= v1.41.1
51+
OPERATOR_SDK_VERSION ?= v1.42.3
5252

5353
# Image URL to use all building/pushing image targets
5454
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/test-operator:latest
@@ -114,10 +114,10 @@ tidy: ## Run go mod tidy on every mod file in the repo
114114
go mod tidy
115115
cd ./api && go mod tidy
116116

117-
GOLANGCI_LINT_VERSION ?= v2.7.2
117+
GOLANGCI_LINT_VERSION ?= v2.12.2
118118
.PHONY: golangci-lint
119119
golangci-lint:
120-
test -s $(LOCALBIN)/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
120+
test -s $(LOCALBIN)/golangci-lint || curl -sSfL https://golangci-lint.run/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
121121
$(LOCALBIN)/golangci-lint run --fix
122122

123123
PROCS?=$(shell expr $(shell nproc --ignore 2) / 2)
@@ -205,7 +205,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo
205205
## Tool Versions
206206
KUSTOMIZE_VERSION ?= v5.6.0
207207
CONTROLLER_TOOLS_VERSION ?= v0.18.0
208-
GOTOOLCHAIN_VERSION ?= go1.24.0
208+
GOTOOLCHAIN_VERSION ?= go1.26.0
209209

210210
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
211211
.PHONY: kustomize

‎api/go.mod‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module github.com/openstack-k8s-operators/test-operator/api
22

3-
go 1.24.4
3+
go 1.26.3
44

55
require (
66
github.com/google/go-cmp v0.7.0
7-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260711071627-1e31c2f6b982
8-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260711071627-1e31c2f6b982
7+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260713090837-13a3b65580c3
8+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260713090837-13a3b65580c3
99
k8s.io/api v0.31.14
1010
k8s.io/apimachinery v0.31.14
1111
sigs.k8s.io/controller-runtime v0.19.7
@@ -40,13 +40,12 @@ require (
4040
github.com/prometheus/client_model v0.6.1 // indirect
4141
github.com/prometheus/common v0.55.0 // indirect
4242
github.com/prometheus/procfs v0.15.1 // indirect
43-
github.com/rogpeppe/go-internal v1.13.1 // indirect
4443
github.com/x448/float16 v0.8.4 // indirect
45-
golang.org/x/net v0.49.0 // indirect
44+
golang.org/x/net v0.56.0 // indirect
4645
golang.org/x/oauth2 v0.23.0 // indirect
47-
golang.org/x/sys v0.40.0 // indirect
48-
golang.org/x/term v0.39.0 // indirect
49-
golang.org/x/text v0.33.0 // indirect
46+
golang.org/x/sys v0.46.0 // indirect
47+
golang.org/x/term v0.44.0 // indirect
48+
golang.org/x/text v0.38.0 // indirect
5049
golang.org/x/time v0.6.0 // indirect
5150
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
5251
google.golang.org/protobuf v1.36.7 // indirect

0 commit comments

Comments
 (0)