From 9b8adb1a460d27f843d6794c8d959882a93977b8 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Wed, 16 Apr 2025 12:36:07 +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-designate-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 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-designate-operator.yaml b/.github/workflows/build-designate-operator.yaml index 7a6ac2bc..b46b74fc 100644 --- a/.github/workflows/build-designate-operator.yaml +++ b/.github/workflows/build-designate-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: designate - 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 5cecc353..4797493b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -63,7 +63,7 @@ repos: entry: bashate --error . --ignore=E006,E040,E011,E020,E012 - 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 61ab7347..53672025 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 6aeecd57..f4563a72 100644 --- a/Makefile +++ b/Makefile @@ -116,9 +116,10 @@ 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: - 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 --timeout=5m .PHONY: test @@ -189,7 +190,7 @@ GINKGO ?= $(LOCALBIN)/ginkgo KUSTOMIZE_VERSION ?= v3.8.7 CONTROLLER_TOOLS_VERSION ?= v0.14.0 OPERATOR_SDK_VERSION ?= v1.31.0 -GOTOOLCHAIN_VERSION ?= go1.21.0 +GOTOOLCHAIN_VERSION ?= go1.22.0 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/api/go.mod b/api/go.mod index 74a5b479..3a0cb619 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/designate-operator/api -go 1.21 +go 1.22 require ( github.com/onsi/ginkgo/v2 v2.20.1 diff --git a/go.mod b/go.mod index 5834c95f..66d1c086 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/designate-operator -go 1.21 +go 1.22 require ( github.com/go-logr/logr v1.4.2 From ce0d887df29b3ec20115332ce50926be9ccb1895 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Wed, 16 Apr 2025 12:38:30 +0200 Subject: [PATCH 2/2] fix golangci reported issues Signed-off-by: Martin Schuppert --- controllers/designateapi_controller.go | 4 ++-- controllers/designatecentral_controller.go | 2 +- controllers/designatemdns_controller.go | 2 +- controllers/designateproducer_controller.go | 2 +- controllers/designateunbound_controller.go | 7 ------- controllers/designateworker_controller.go | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/controllers/designateapi_controller.go b/controllers/designateapi_controller.go index 963593ae..2e9139f8 100644 --- a/controllers/designateapi_controller.go +++ b/controllers/designateapi_controller.go @@ -708,7 +708,7 @@ func (r *DesignateAPIReconciler) reconcileNormal(ctx context.Context, instance * 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( @@ -732,7 +732,7 @@ func (r *DesignateAPIReconciler) reconcileNormal(ctx context.Context, instance * 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/designatecentral_controller.go b/controllers/designatecentral_controller.go index eeb228a5..2df3ad4e 100644 --- a/controllers/designatecentral_controller.go +++ b/controllers/designatecentral_controller.go @@ -483,7 +483,7 @@ func (r *DesignateCentralReconciler) reconcileNormal(ctx context.Context, instan 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/designatemdns_controller.go b/controllers/designatemdns_controller.go index da904c5c..4ba18182 100644 --- a/controllers/designatemdns_controller.go +++ b/controllers/designatemdns_controller.go @@ -473,7 +473,7 @@ func (r *DesignateMdnsReconciler) reconcileNormal(ctx context.Context, instance 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/designateproducer_controller.go b/controllers/designateproducer_controller.go index a177d59b..e98bd7cd 100644 --- a/controllers/designateproducer_controller.go +++ b/controllers/designateproducer_controller.go @@ -483,7 +483,7 @@ func (r *DesignateProducerReconciler) reconcileNormal(ctx context.Context, insta 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/designateunbound_controller.go b/controllers/designateunbound_controller.go index d914e7f0..7d94872b 100644 --- a/controllers/designateunbound_controller.go +++ b/controllers/designateunbound_controller.go @@ -62,13 +62,6 @@ type UnboundReconciler struct { Scheme *runtime.Scheme } -func min(i int, j int) int { - if i < j { - return i - } - return j -} - //+kubebuilder:rbac:groups=designate.openstack.org,resources=designateunbounds,verbs=get;list;watch;create;update;patch;delete //+kubebuilder:rbac:groups=designate.openstack.org,resources=designateunbounds/status,verbs=get;update;patch //+kubebuilder:rbac:groups=designate.openstack.org,resources=designateunbounds/finalizers,verbs=update;patch diff --git a/controllers/designateworker_controller.go b/controllers/designateworker_controller.go index 44943602..3b800dda 100644 --- a/controllers/designateworker_controller.go +++ b/controllers/designateworker_controller.go @@ -480,7 +480,7 @@ func (r *DesignateWorkerReconciler) reconcileNormal(ctx context.Context, instanc 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(