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-ovn-operator.yaml b/.github/workflows/build-ovn-operator.yaml index 13709e5b..8cc97b21 100644 --- a/.github/workflows/build-ovn-operator.yaml +++ b/.github/workflows/build-ovn-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: ovn - 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 ce571656..493fc0db 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -79,7 +79,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 cce32560..650a3e97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -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 FROM $GOLANG_BUILDER AS builder diff --git a/Makefile b/Makefile index 4c2f03ce..d68873af 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ SHELL = /usr/bin/env bash -o pipefail # Extra vars which will be passed to the Docker-build DOCKER_BUILD_ARGS ?= -GOTOOLCHAIN_VERSION ?= go1.21.0 +GOTOOLCHAIN_VERSION ?= go1.22.0 .PHONY: all all: build @@ -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 PROCS?=$(shell expr $(shell nproc --ignore 2) / 2) diff --git a/api/go.mod b/api/go.mod index 1836094c..9e95d23b 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/ovn-operator/api -go 1.21 +go 1.22 require ( github.com/go-logr/logr v1.4.2 diff --git a/controllers/ovncontroller_controller.go b/controllers/ovncontroller_controller.go index f2421fc4..679f901e 100644 --- a/controllers/ovncontroller_controller.go +++ b/controllers/ovncontroller_controller.go @@ -395,7 +395,7 @@ func (r *OVNControllerReconciler) 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( @@ -421,7 +421,7 @@ func (r *OVNControllerReconciler) 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/ovndbcluster_controller.go b/controllers/ovndbcluster_controller.go index 3204eae3..3d789595 100644 --- a/controllers/ovndbcluster_controller.go +++ b/controllers/ovndbcluster_controller.go @@ -458,7 +458,7 @@ func (r *OVNDBClusterReconciler) 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( @@ -484,7 +484,7 @@ func (r *OVNDBClusterReconciler) 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( @@ -877,8 +877,7 @@ func (r *OVNDBClusterReconciler) reconcileServices( // get it automatically registered in DNS. if instance.Spec.NetworkAttachment != "" && ssvc.GetServiceType() != corev1.ServiceTypeLoadBalancer { var dnsIPsList []string - // TODO(averdagu): use built in Min once go1.21 is used - minLen := ovn_common.Min(len(podList.Items), int(*(instance.Spec.Replicas))) + minLen := min(len(podList.Items), int(*(instance.Spec.Replicas))) for _, ovnPod := range podList.Items[:minLen] { svc, err = service.GetServiceWithName( ctx, diff --git a/controllers/ovnnorthd_controller.go b/controllers/ovnnorthd_controller.go index d1b89283..fee32d5b 100644 --- a/controllers/ovnnorthd_controller.go +++ b/controllers/ovnnorthd_controller.go @@ -398,7 +398,7 @@ func (r *OVNNorthdReconciler) reconcileNormal(ctx context.Context, instance *ovn 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( @@ -424,7 +424,7 @@ func (r *OVNNorthdReconciler) reconcileNormal(ctx context.Context, instance *ovn 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/go.mod b/go.mod index 531b9a9f..2884927f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openstack-k8s-operators/ovn-operator -go 1.21 +go 1.22 require ( github.com/go-logr/logr v1.4.2 diff --git a/pkg/common/utils.go b/pkg/common/utils.go index 5ccaf2dc..f03ed366 100644 --- a/pkg/common/utils.go +++ b/pkg/common/utils.go @@ -11,12 +11,3 @@ limitations under the License. */ package common - -// Helper function while can't use buildin min -// TOOD(averdagu) remove when using go1.21.0 -func Min(x, y int) int { - if x < y { - return x - } - return y -}