rebase and fixup and imports

Author: laurafitzgerald

controllers/mtls_reconciler.go

@@ -11,7 +11,6 @@ import (
 	kuadrantv1 "github.com/kuadrant/kuadrant-operator/api/v1"
 	kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	"github.com/kuadrant/kuadrant-operator/pkg/istio"
-	"github.com/kuadrant/kuadrant-operator/pkg/log"
 	"github.com/kuadrant/kuadrant-operator/pkg/reconcilers"
 	"github.com/kuadrant/policy-machinery/controller"
 	"github.com/kuadrant/policy-machinery/machinery"
@@ -45,7 +44,6 @@ func NewMTLSReconciler(mgr controllerruntime.Manager, client *dynamic.DynamicCli
 			mgr.GetClient(),
 			mgr.GetScheme(),
 			mgr.GetAPIReader(),
-			log.Log.WithName("mtls"),
 		),
 	}
 }

pkg/istio/utils.go

@@ -2,6 +2,7 @@ package istio
 
 import (
 	"encoding/json"
+
 	"github.com/kuadrant/kuadrant-operator/api/v1beta1"
 	"github.com/kuadrant/policy-machinery/controller"
 	"github.com/kuadrant/policy-machinery/machinery"