Merge branch 'main' into server-side-apply-status

Makefile

@@ -30,14 +30,14 @@ HELM_CHART_URL ?= https://raw.githubusercontent.com/dapr/helm-charts/master/dapr
 OPENSHIFT_VERSIONS ?= v4.12
 
 ## Tool Versions
-CODEGEN_VERSION ?= v0.30.3
-KUSTOMIZE_VERSION ?= v5.4.2
-CONTROLLER_TOOLS_VERSION ?= v0.16.0
-KIND_VERSION ?= v0.23.0
+CODEGEN_VERSION ?= v0.30.5
+KUSTOMIZE_VERSION ?= v5.4.3
+CONTROLLER_TOOLS_VERSION ?= v0.16.3
+KIND_VERSION ?= v0.24.0
 KIND_IMAGE_VERSION ?= v1.30.4
-LINTER_VERSION ?= v1.60.2
-OPERATOR_SDK_VERSION ?= v1.36.1
-OPM_VERSION ?= v1.45.0
+LINTER_VERSION ?= v1.61.0
+OPERATOR_SDK_VERSION ?= v1.37.0
+OPM_VERSION ?= v1.47.0
 GOVULNCHECK_VERSION ?= latest
 KO_VERSION ?= latest
 

api/operator/v1alpha1/zz_generated.deepcopy.go

@@ -21,7 +21,7 @@ limitations under the License.
 package v1alpha1
 
 import (
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 

config/crd/bases/operator.dapr.io_daprcontrolplanes.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.0
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: daprcontrolplanes.operator.dapr.io
 spec:
   group: operator.dapr.io

config/crd/bases/operator.dapr.io_daprcruiscontrols.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.0
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: daprcruiscontrols.operator.dapr.io
 spec:
   group: operator.dapr.io

config/crd/bases/operator.dapr.io_daprinstances.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.16.0
+    controller-gen.kubebuilder.io/version: v0.16.3
   name: daprinstances.operator.dapr.io
 spec:
   group: operator.dapr.io