Update tools and remove unused code/deps

.golangci.yml

@@ -20,6 +20,10 @@ linters-settings:
     line-length: 170
   goconst:
     ignore-tests: true
+  revive:
+    rules:
+      - name: dot-imports
+        disabled: true
 linters:
   enable-all: true
   disable:
@@ -67,3 +71,5 @@ linters:
     - varcheck
     - deadcode
     - ifshort
+    - inamedparam
+    - depguard

Makefile

@@ -26,13 +26,13 @@ HELM_CHART_VERSION ?= 1.12.0
 HELM_CHART_URL ?= https://raw.githubusercontent.com/dapr/helm-charts/master/dapr-$(HELM_CHART_VERSION).tgz
 
 ## Tool Versions
-CODEGEN_VERSION ?= v0.27.4
-KUSTOMIZE_VERSION ?= v5.0.1
-CONTROLLER_TOOLS_VERSION ?= v0.12.1
+CODEGEN_VERSION ?= v0.28.3
+KUSTOMIZE_VERSION ?= v5.2.1
+CONTROLLER_TOOLS_VERSION ?= v0.13.0
 KIND_VERSION ?= v0.20.0
-LINTER_VERSION ?= v1.52.2
-OPERATOR_SDK_VERSION ?= v1.31.0
-OPM_VERSION ?= v1.28.0
+LINTER_VERSION ?= v1.55.1
+OPERATOR_SDK_VERSION ?= v1.32.0
+OPM_VERSION ?= v1.30.1
 GOVULNCHECK_VERSION ?= latest
 
 ## Tool Binaries

cmd/run/run.go

@@ -3,7 +3,6 @@ package run
 import (
 	"fmt"
 
-	routev1 "github.com/openshift/api/route/v1"
 	"github.com/spf13/cobra"
 	admregv1 "k8s.io/api/admissionregistration/v1"
 	appsv1 "k8s.io/api/apps/v1"
@@ -22,7 +21,6 @@ import (
 
 func init() {
 	utilruntime.Must(daprApi.AddToScheme(controller.Scheme))
-	utilruntime.Must(routev1.Install(controller.Scheme))
 }
 
 func NewRunCmd() *cobra.Command {

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.12.1
+    controller-gen.kubebuilder.io/version: v0.13.0
   name: daprcontrolplanes.operator.dapr.io
 spec:
   group: operator.dapr.io

go.mod

@@ -3,17 +3,13 @@ module github.com/dapr-sandbox/dapr-kubernetes-operator
 go 1.21
 
 require (
-	github.com/anthhub/forwarder v1.1.1-0.20230315114022-63dcf7b46a1a
-	github.com/evanphx/json-patch v5.7.0+incompatible
 	github.com/go-logr/logr v1.2.4
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/onsi/gomega v1.28.1
-	github.com/openshift/api v0.0.0-20230816181854-a7ca92db022a
 	github.com/operator-framework/api v0.18.0
 	github.com/operator-framework/operator-lifecycle-manager v0.22.0
 	github.com/rs/xid v1.5.0
 	github.com/spf13/cobra v1.7.0
-	github.com/stretchr/testify v1.8.4
 	github.com/wI2L/jsondiff v0.4.0
 	golang.org/x/time v0.3.0
 	gopkg.in/yaml.v3 v3.0.1
@@ -23,7 +19,7 @@ require (
 	k8s.io/client-go v0.28.3
 	k8s.io/klog/v2 v2.100.1
 	sigs.k8s.io/controller-runtime v0.16.3
-	sigs.k8s.io/structured-merge-diff/v4 v4.3.0
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.3
 )
 
 require (
@@ -52,6 +48,7 @@ require (
 	github.com/docker/go-metrics v0.0.1 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
 	github.com/fatih/color v1.13.0 // indirect
@@ -109,7 +106,6 @@ require (
 	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect

test/support/test.go

@@ -10,9 +10,6 @@ import (
 
 	"github.com/hashicorp/go-cleanhttp"
 
-	"github.com/anthhub/forwarder"
-	"k8s.io/client-go/tools/portforward"
-
 	"github.com/rs/xid"
 	netv1 "k8s.io/api/networking/v1"
 
@@ -42,7 +39,6 @@ type Test interface {
 	NewNamespacedNameDaprControlPlane(types.NamespacedName, *daprAc.DaprControlPlaneSpecApplyConfiguration) *v1alpha1.DaprControlPlane
 	InstallChart(string, ...helm.InstallOption)
 	SetUpIngress(string, netv1.HTTPIngressPath) *netv1.Ingress
-	Forward(string, string, int) (*forwarder.Result, [][]portforward.ForwardedPort, error)
 
 	GET(string) func(g gomega.Gomega) (*http.Response, error)
 	POST(string, string, []byte) func(g gomega.Gomega) (*http.Response, error)
@@ -259,26 +255,6 @@ func (t *T) SetUpIngress(
 	return ing
 }
 
-func (t *T) Forward(service string, namespace string, remotePort int) (*forwarder.Result, [][]portforward.ForwardedPort, error) {
-	options := []*forwarder.Option{{
-		RemotePort:  remotePort,
-		ServiceName: service,
-		Namespace:   namespace,
-	}}
-
-	ret, err := forwarder.WithRestConfig(t.Ctx(), options, t.Client().config)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	ports, err := ret.Ready()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return ret, ports, nil
-}
-
 func (t *T) GET(url string) func(g gomega.Gomega) (*http.Response, error) {
 	return func(g gomega.Gomega) (*http.Response, error) {
 		req, err := http.NewRequestWithContext(t.Ctx(), http.MethodGet, url, nil)