From 1a5d7902d0d80a781d961858de2cbe9ab48734d8 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Wed, 16 Apr 2025 15:49:28 +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-nova-operator.yaml | 2 +- .pre-commit-config.yaml | 2 +- Dockerfile | 2 +- Makefile | 5 +++-- api/go.mod | 2 +- go.mod | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 810dbb511..9b97140cd 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-nova-operator.yaml b/.github/workflows/build-nova-operator.yaml index db20163f0..9607a422a 100644 --- a/.github/workflows/build-nova-operator.yaml +++ b/.github/workflows/build-nova-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: nova - 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 496fa30b0..a5b245da2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -77,7 +77,7 @@ repos: # E012: here doc didn't end before EOF - repo: https://github.com/golangci/golangci-lint - rev: v1.59.1 + rev: v1.63.4 hooks: - id: golangci-lint-full args: ["-v"] diff --git a/Dockerfile b/Dockerfile index 062e34f90..63550f05b 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 1f09beb8a..bc7e2811b 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,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 @@ -134,10 +134,11 @@ tidy: ## Run go mod tidy on every mod file in the repo go mod tidy cd ./api && go mod tidy +GOLANGCI_LINT_VERSION ?= v1.63.4 .PHONY: golangci-lint golangci-lint: # NOTE this will install golangci-lint in to local bin dir - test -s $(LOCALBIN)/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.59.1 + test -s $(LOCALBIN)/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s $(GOLANGCI_LINT_VERSION) $(LOCALBIN)/golangci-lint run --fix PROCS?=$(shell expr $(shell nproc --ignore 2) / 2) diff --git a/api/go.mod b/api/go.mod index 8579675a3..23f62aeb8 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/nova-operator/api -go 1.21 +go 1.22 require ( github.com/google/go-cmp v0.7.0 diff --git a/go.mod b/go.mod index bff99f884..ac4f42f4f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/nova-operator -go 1.21 +go 1.22 require ( github.com/go-logr/logr v1.4.2 From 0e2aba08dece5b43f136dbc4369be22627d10f98 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Wed, 16 Apr 2025 15:53:10 +0200 Subject: [PATCH 2/2] fix golangci reported issues Signed-off-by: Martin Schuppert --- controllers/common.go | 2 +- controllers/novaapi_controller.go | 4 ++-- controllers/novacompute_controller.go | 2 +- controllers/novaconductor_controller.go | 2 +- controllers/novametadata_controller.go | 4 ++-- controllers/novanovncproxy_controller.go | 6 +++--- controllers/novascheduler_controller.go | 2 +- test/functional/novacell_controller_test.go | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/controllers/common.go b/controllers/common.go index f4efae449..305e41c97 100644 --- a/controllers/common.go +++ b/controllers/common.go @@ -257,7 +257,7 @@ func ensureSecret( condition.InputReadyCondition, condition.RequestedReason, condition.SeverityInfo, - fmt.Sprintf(novav1.InputReadyWaitingMessage, "secret/"+secretName.Name))) + novav1.InputReadyWaitingMessage, "secret/"+secretName.Name)) return "", ctrl.Result{RequeueAfter: requeueTimeout}, *secret, diff --git a/controllers/novaapi_controller.go b/controllers/novaapi_controller.go index 4495b6994..b88b220f2 100644 --- a/controllers/novaapi_controller.go +++ b/controllers/novaapi_controller.go @@ -254,7 +254,7 @@ func (r *NovaAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re 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( @@ -279,7 +279,7 @@ func (r *NovaAPIReconciler) Reconcile(ctx context.Context, req ctrl.Request) (re 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( diff --git a/controllers/novacompute_controller.go b/controllers/novacompute_controller.go index 231875407..a3f511b7b 100644 --- a/controllers/novacompute_controller.go +++ b/controllers/novacompute_controller.go @@ -192,7 +192,7 @@ func (r *NovaComputeReconciler) 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( diff --git a/controllers/novaconductor_controller.go b/controllers/novaconductor_controller.go index 65108a283..dff77e4a2 100644 --- a/controllers/novaconductor_controller.go +++ b/controllers/novaconductor_controller.go @@ -216,7 +216,7 @@ func (r *NovaConductorReconciler) Reconcile(ctx context.Context, req ctrl.Reques 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( diff --git a/controllers/novametadata_controller.go b/controllers/novametadata_controller.go index df6607051..e6782ab49 100644 --- a/controllers/novametadata_controller.go +++ b/controllers/novametadata_controller.go @@ -232,7 +232,7 @@ func (r *NovaMetadataReconciler) 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( @@ -258,7 +258,7 @@ func (r *NovaMetadataReconciler) 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( diff --git a/controllers/novanovncproxy_controller.go b/controllers/novanovncproxy_controller.go index b31796d44..3b0ae29b6 100644 --- a/controllers/novanovncproxy_controller.go +++ b/controllers/novanovncproxy_controller.go @@ -210,7 +210,7 @@ func (r *NovaNoVNCProxyReconciler) Reconcile(ctx context.Context, req ctrl.Reque 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( @@ -236,7 +236,7 @@ func (r *NovaNoVNCProxyReconciler) Reconcile(ctx context.Context, req ctrl.Reque 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( @@ -259,7 +259,7 @@ func (r *NovaNoVNCProxyReconciler) Reconcile(ctx context.Context, req ctrl.Reque 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( diff --git a/controllers/novascheduler_controller.go b/controllers/novascheduler_controller.go index 7a880ba44..96dd8ed44 100644 --- a/controllers/novascheduler_controller.go +++ b/controllers/novascheduler_controller.go @@ -214,7 +214,7 @@ func (r *NovaSchedulerReconciler) Reconcile(ctx context.Context, req ctrl.Reques 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( diff --git a/test/functional/novacell_controller_test.go b/test/functional/novacell_controller_test.go index bfaaafb7a..780750682 100644 --- a/test/functional/novacell_controller_test.go +++ b/test/functional/novacell_controller_test.go @@ -99,7 +99,7 @@ var _ = Describe("NovaCell controller", func() { Expect(instance.Status.ConductorServiceReadyCount).To(Equal(int32(0))) Expect(instance.Status.MetadataServiceReadyCount).To(Equal(int32(0))) Expect(instance.Status.NoVNCPRoxyServiceReadyCount).To(Equal(int32(0))) - Expect(instance.Status.NovaComputesStatus).To(HaveLen(int(0))) + Expect(instance.Status.NovaComputesStatus).To(BeEmpty()) }) })