Changes required after a rebase.

Kuadrant · Jun 5, 2024 · a7eb7fc · a7eb7fc
1 parent e540b07
commit a7eb7fc
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 18 deletions.
diff --git a/controllers/authpolicy_controller.go b/controllers/authpolicy_controller.go
@@ -278,12 +278,12 @@ func (r *AuthPolicyReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&authorinoapi.AuthConfig{}).
 		Watches(
 			&gatewayapiv1.HTTPRoute{},
-			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
+			handler.EnqueueRequestsFromMapFunc(func(_ context.Context, object client.Object) []reconcile.Request {
 				return httpRouteEventMapper.MapToPolicy(object, &api.AuthPolicy{})
 			}),
 		).
 		Watches(&gatewayapiv1.Gateway{},
-			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
+			handler.EnqueueRequestsFromMapFunc(func(_ context.Context, object client.Object) []reconcile.Request {
 				return gatewayEventMapper.MapToPolicy(object, &api.AuthPolicy{})
 			}),
 		).

diff --git a/controllers/dnspolicy_controller.go b/controllers/dnspolicy_controller.go
@@ -195,7 +195,7 @@ func (r *DNSPolicyReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		Owns(&kuadrantdnsv1alpha1.DNSRecord{}).
 		Watches(
 			&gatewayapiv1.Gateway{},
-			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
+			handler.EnqueueRequestsFromMapFunc(func(_ context.Context, object client.Object) []reconcile.Request {
 				return gatewayEventMapper.MapToPolicy(object, &v1alpha1.DNSPolicy{})
 			}),
 		)

diff --git a/controllers/kuadrant_controller.go b/controllers/kuadrant_controller.go
@@ -20,21 +20,16 @@ import (
 	"context"
 	"encoding/json"
 
-	"k8s.io/utils/ptr"
-
-	"github.com/kuadrant/kuadrant-operator/pkg/kuadranttools"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/utils/env"
-
 	"github.com/go-logr/logr"
 	authorinov1beta1 "github.com/kuadrant/authorino-operator/api/v1beta1"
 	limitadorv1alpha1 "github.com/kuadrant/limitador-operator/api/v1alpha1"
 	iopv1alpha1 "istio.io/istio/operator/pkg/apis/istio/v1alpha1"
-	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/env"
+	"k8s.io/utils/ptr"
 	istiov1alpha1 "maistra.io/istio-operator/api/v1alpha1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/controllers/kuadrant_controller_test.go b/controllers/kuadrant_controller_test.go
@@ -7,9 +7,6 @@ import (
 	"time"
 
 	"github.com/kuadrant/limitador-operator/api/v1alpha1"
-	authorinov1beta1 "github.com/kuadrant/authorino-operator/api/v1beta1"
-	kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
-	"github.com/kuadrant/kuadrant-operator/pkg/common"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"k8s.io/utils/ptr"

diff --git a/controllers/ratelimitpolicy_controller.go b/controllers/ratelimitpolicy_controller.go
@@ -241,15 +241,15 @@ func (r *RateLimitPolicyReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&kuadrantv1beta2.RateLimitPolicy{}).
 		Watches(
 			&gatewayapiv1.HTTPRoute{},
-			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
+			handler.EnqueueRequestsFromMapFunc(func(_ context.Context, object client.Object) []reconcile.Request {
 				return httpRouteEventMapper.MapToPolicy(object, &kuadrantv1beta2.RateLimitPolicy{})
 			}),
 		).
 		// Currently the purpose is to generate events when rlp references change in gateways
 		// so the status of the rlps targeting a route can be keep in sync
 		Watches(
 			&gatewayapiv1.Gateway{},
-			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
+			handler.EnqueueRequestsFromMapFunc(func(_ context.Context, object client.Object) []reconcile.Request {
 				return gatewayEventMapper.MapToPolicy(object, &kuadrantv1beta2.RateLimitPolicy{})
 			}),
 		).

diff --git a/controllers/tlspolicy_controller.go b/controllers/tlspolicy_controller.go
@@ -202,7 +202,7 @@ func (r *TLSPolicyReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		For(&v1alpha1.TLSPolicy{}).
 		Watches(
 			&gatewayapiv1.Gateway{},
-			handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, object client.Object) []reconcile.Request {
+			handler.EnqueueRequestsFromMapFunc(func(_ context.Context, object client.Object) []reconcile.Request {
 				return gatewayEventMapper.MapToPolicy(object, &v1alpha1.TLSPolicy{})
 			}),
 		).

diff --git a/pkg/kuadranttools/authorino_tools.go b/pkg/kuadranttools/authorino_tools.go
@@ -5,8 +5,9 @@ import (
 	"reflect"
 
 	authorinov1beta1 "github.com/kuadrant/authorino-operator/api/v1beta1"
-	"github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/kuadrant/kuadrant-operator/api/v1beta1"
 )
 
 func AuthorinoMutator(existingObj, desiredObj client.Object) (bool, error) {

diff --git a/pkg/kuadranttools/authorino_tools_test.go b/pkg/kuadranttools/authorino_tools_test.go
@@ -5,9 +5,10 @@ import (
 	"testing"
 
 	authorinov1beta1 "github.com/kuadrant/authorino-operator/api/v1beta1"
-	"github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/kuadrant/kuadrant-operator/api/v1beta1"
 )
 
 func Test_authorinoSpecSubSet(t *testing.T) {