Changes required after a rebase.

Kuadrant · Jul 8, 2024 · eb909a5 · eb909a5
1 parent de6e57f
commit eb909a5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
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/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) {

diff --git a/tests/common/kuadrant/kuadrant_controller_test.go b/tests/common/kuadrant/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"