diff --git a/.ci-operator.yaml b/.ci-operator.yaml index 810dbb5..9b97140 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-swift-operator.yaml b/.github/workflows/build-swift-operator.yaml index 97a6047..dd88e5b 100644 --- a/.github/workflows/build-swift-operator.yaml +++ b/.github/workflows/build-swift-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: swift - 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 4724e6c..07aa81a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -42,7 +42,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: ["-v"] diff --git a/Dockerfile b/Dockerfile index 7320526..f41b68c 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 961aa52..f1c5793 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ IMG ?= $(DEFAULT_IMG) ENVTEST_K8S_VERSION = 1.29.0 # Set minimum Go version -GOTOOLCHAIN_VERSION ?= go1.21.0 +GOTOOLCHAIN_VERSION ?= go1.22.0 GINKGO ?= $(LOCALBIN)/ginkgo @@ -121,9 +121,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 --verbose PROCS?=$(shell expr $(shell nproc --ignore 2) / 2) diff --git a/api/go.mod b/api/go.mod index 0ec2bd9..71fc654 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/swift-operator/api -go 1.21 +go 1.22 require ( github.com/onsi/ginkgo/v2 v2.20.1 diff --git a/controllers/swiftproxy_controller.go b/controllers/swiftproxy_controller.go index 091855d..331c50f 100644 --- a/controllers/swiftproxy_controller.go +++ b/controllers/swiftproxy_controller.go @@ -211,7 +211,7 @@ func (r *SwiftProxyReconciler) 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( @@ -236,7 +236,7 @@ func (r *SwiftProxyReconciler) Reconcile(ctx context.Context, req ctrl.Request) condition.TLSInputReadyCondition, condition.RequestedReason, condition.SeverityInfo, - fmt.Sprintf(condition.TLSInputReadyWaitingMessage, err.Error()))) + "%s", fmt.Sprintf(condition.TLSInputReadyWaitingMessage, err.Error()))) return ctrl.Result{}, nil } instance.Status.Conditions.Set(condition.FalseCondition( diff --git a/controllers/swiftring_controller.go b/controllers/swiftring_controller.go index a0e2350..f74ca7e 100644 --- a/controllers/swiftring_controller.go +++ b/controllers/swiftring_controller.go @@ -225,7 +225,7 @@ func (r *SwiftRingReconciler) reconcileNormal(ctx context.Context, instance *swi condition.ReadyCondition, condition.ErrorReason, condition.SeverityWarning, - err.Error())) + "%s", err.Error())) return ctrl.Result{}, err } diff --git a/go.mod b/go.mod index 15fbc7c..cc88f93 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/swift-operator -go 1.21 +go 1.22 require ( github.com/go-logr/logr v1.4.2 @@ -15,7 +15,6 @@ require ( github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250419062702-0acec6a591c8 github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250419062702-0acec6a591c8 github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240523121736-379011b2cfac - golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 k8s.io/api v0.29.15 k8s.io/apimachinery v0.29.15 k8s.io/client-go v0.29.15 @@ -61,6 +60,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/net v0.28.0 // indirect golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.23.0 // indirect diff --git a/pkg/swiftring/funcs.go b/pkg/swiftring/funcs.go index f018927..027efa0 100644 --- a/pkg/swiftring/funcs.go +++ b/pkg/swiftring/funcs.go @@ -20,11 +20,10 @@ import ( "encoding/json" "fmt" "path/filepath" + "slices" "sort" "strings" - "golang.org/x/exp/slices" - corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types"