Merge branch 'openstack-k8s-operators:main' into main

Author: stuggi

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: tools
   namespace: openstack-k8s-operators
-  tag: ci-build-root-golang-1.24-sdk-1.41.1
+  tag: ci-build-root-golang-1.26-sdk-1.42.3

.github/workflows/build-openstack-operator.yaml

@@ -13,8 +13,8 @@ jobs:
     uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/reusable-build-operator.yaml@main
     with:
       operator_name: openstack
-      go_version: 1.24.x
-      operator_sdk_version: 1.41.1
+      go_version: 1.26.x
+      operator_sdk_version: 1.42.3
       bundle_dockerfile: ./bundle.Dockerfile
       operator_version: 0.7.0
     secrets:

.github/workflows/docs.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3
         with:
-          go-version: 1.24.x
+          go-version: 1.26.x
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           # this fetches all branches. Needed because we need gh-pages branch for deploy to work

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

@@ -9,6 +9,6 @@ jobs:
     with:
       operator_name: openstack
       branch_name: ${{ github.ref_name }}
-      custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.41.1
+      custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.26-sdk-1.42.3
     secrets:
       FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}

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

@@ -10,6 +10,6 @@ jobs:
     uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/force-bump-branches.yaml@main
     with:
       operator_name: openstack
-      custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.24-sdk-1.41.1
+      custom_image: quay.io/openstack-k8s-operators/openstack-k8s-operators-ci-build-tools:golang-1.26-sdk-1.42.3
     secrets:
       FORCE_BUMP_PULL_REQUEST_PAT: ${{ secrets.FORCE_BUMP_PULL_REQUEST_PAT }}

.github/workflows/kustom.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3
         with:
-          go-version: 1.24.x
+          go-version: 1.26.x
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           # this fetches all branches. Needed because we need gh-pages branch for deploy to work

.golangci.yaml

@@ -8,6 +8,11 @@ linters:
     - revive
     - ginkgolinter
     - govet
+  settings:
+    govet:
+      disable:
+        # TODO: re-enable once golangci-lint supports Go 1.26 inlining of generics
+        - inline
 
 formatters:
   enable:

.pre-commit-config.yaml

@@ -70,7 +70,7 @@ repos:
       entry: bashate --error . --ignore=E006,E040,E011,E020,E012
 
 - repo: https://github.com/golangci/golangci-lint
-  rev: v2.7.2
+  rev: v2.12.2
   hooks:
     - id: golangci-lint-full
       args: ["-v"]

Dockerfile

@@ -1,6 +1,6 @@
 # TODO(amoralej) go-toolset image pinned until a fix is provided for
 # https://issues.redhat.com/browse/RHEL-128838
-ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.24.6-1762230058
+ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.26
 ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:9.6
 # Build the manager binary
 FROM $GOLANG_BUILDER AS builder

Makefile

@@ -54,7 +54,7 @@ REPLACES ?=
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
-OPERATOR_SDK_VERSION ?= v1.41.1
+OPERATOR_SDK_VERSION ?= v1.42.3
 
 # Image URL to use all building/pushing image targets
 DEFAULT_IMG ?= quay.io/openstack-k8s-operators/openstack-operator:latest
@@ -197,10 +197,10 @@ tidy: ## Run go mod tidy on every mod file in the repo
 	go mod tidy
 	cd ./api && go mod tidy
 
-GOLANGCI_LINT_VERSION ?= v2.7.2
+GOLANGCI_LINT_VERSION ?= v2.12.2
 .PHONY: golangci-lint
 golangci-lint:
-	test -s $(LOCALBIN)/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
+	test -s $(LOCALBIN)/golangci-lint || curl -sSfL https://golangci-lint.run/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
 	$(LOCALBIN)/golangci-lint run --fix
 
 MAX_PROCS := 5
@@ -331,7 +331,7 @@ KUSTOMIZE_VERSION ?= v5.6.0 #(dprince: bumped to aquire new features like --load
 CONTROLLER_TOOLS_VERSION ?= v0.18.0
 CRD_MARKDOWN_VERSION ?= v0.0.3
 KUTTL_VERSION ?= 0.17.0
-GOTOOLCHAIN_VERSION ?= go1.24.0
+GOTOOLCHAIN_VERSION ?= go1.26.0
 OC_VERSION ?= 4.16.0
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"