From bd219df9e8629e4793ed5a5becf19c5642db9be9 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Wed, 16 Apr 2025 16:15:00 +0200 Subject: [PATCH 1/2] bump to golang 1.22 * bump in go.mod (base and api) * bump go-toolset in Dockerfile * bump in github jobs ('.github/workflows') * Bump the golangci-lint version in the .pre-commit-config.yaml to v1.63.4 * Bump build_root_image in .ci-operator.yaml to ci-build-root-golang-1.22-sdk-1.31 Jira: OSPRH-12935 Signed-off-by: Martin Schuppert --- .ci-operator.yaml | 2 +- .github/workflows/build-placement-operator.yaml | 2 +- .pre-commit-config.yaml | 2 +- Dockerfile | 2 +- Makefile | 2 +- api/go.mod | 2 +- go.mod | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 810dbb51..9b97140c 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: tools namespace: openstack-k8s-operators - tag: ci-build-root-golang-1.21-sdk-1.31 + tag: ci-build-root-golang-1.22-sdk-1.31 diff --git a/.github/workflows/build-placement-operator.yaml b/.github/workflows/build-placement-operator.yaml index a2ed41f5..62229ec7 100644 --- a/.github/workflows/build-placement-operator.yaml +++ b/.github/workflows/build-placement-operator.yaml @@ -15,7 +15,7 @@ jobs: uses: openstack-k8s-operators/openstack-k8s-operators-ci/.github/workflows/reusable-build-operator.yaml@main with: operator_name: placement - go_version: 1.21.x + go_version: 1.22.x operator_sdk_version: 1.31.0 secrets: IMAGENAMESPACE: ${{ secrets.IMAGENAMESPACE }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 86943f25..f365a090 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -38,7 +38,7 @@ repos: - id: go-mod-tidy - repo: https://github.com/golangci/golangci-lint - rev: v1.59.1 + rev: v1.63.4 hooks: - id: golangci-lint-full args: ["--verbose"] diff --git a/Dockerfile b/Dockerfile index f4e14a50..ad1c3c5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.21 +ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.22 ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest # Build the manager binary diff --git a/Makefile b/Makefile index e0bb6dc2..ec01738a 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ endif SHELL = /usr/bin/env bash -o pipefail .SHELLFLAGS = -ec -GOTOOLCHAIN_VERSION ?= go1.21.0 +GOTOOLCHAIN_VERSION ?= go1.22.0 .PHONY: all all: build diff --git a/api/go.mod b/api/go.mod index a75ec422..0b32ce71 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/placement-operator/api -go 1.21 +go 1.22 require ( github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250416140801-46d35b7999b2 diff --git a/go.mod b/go.mod index e39d0856..4aef01a1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/placement-operator -go 1.21 +go 1.22 require ( github.com/go-logr/logr v1.4.2 From 823df06b789174fd0264d63d192181314b2cac11 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Wed, 16 Apr 2025 16:16:13 +0200 Subject: [PATCH 2/2] fix golangci reported issues Signed-off-by: Martin Schuppert --- controllers/placementapi_controller.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/placementapi_controller.go b/controllers/placementapi_controller.go index 57b278c1..d057808c 100644 --- a/controllers/placementapi_controller.go +++ b/controllers/placementapi_controller.go @@ -93,7 +93,7 @@ func ensureSecret( condition.InputReadyCondition, condition.RequestedReason, condition.SeverityInfo, - fmt.Sprintf("Input data resources missing: %s", "secret/"+secretName.Name))) + "%s", fmt.Sprintf("Input data resources missing: %s", "secret/"+secretName.Name))) return "", ctrl.Result{}, *secret, @@ -381,7 +381,7 @@ func (r *PlacementAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request condition.TLSInputReadyCondition, condition.RequestedReason, condition.SeverityInfo, - fmt.Sprintf(condition.TLSInputReadyWaitingMessage, instance.Spec.TLS.CaBundleSecretName))) + condition.TLSInputReadyWaitingMessage, instance.Spec.TLS.CaBundleSecretName)) return ctrl.Result{}, nil } instance.Status.Conditions.Set(condition.FalseCondition( @@ -406,7 +406,7 @@ func (r *PlacementAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request condition.TLSInputReadyCondition, condition.RequestedReason, condition.SeverityInfo, - fmt.Sprintf(condition.TLSInputReadyWaitingMessage, err.Error()))) + condition.TLSInputReadyWaitingMessage, err.Error())) return ctrl.Result{}, nil } instance.Status.Conditions.Set(condition.FalseCondition(