From a2a980e875b04af449106e0fd982d654003ceed0 Mon Sep 17 00:00:00 2001 From: Laura Fitzgerald Date: Fri, 27 Oct 2023 17:11:36 +0100 Subject: [PATCH] temp commit - drop later --- cmd/ocm/main.go | 3 +-- cmd/policy_controller/main.go | 3 +-- go.mod | 2 +- pkg/_internal/policy/policy.go | 4 ++-- pkg/_internal/policy/policy_test.go | 4 ++-- pkg/controllers/dnspolicy/dns_helper.go | 3 +-- pkg/controllers/dnspolicy/dnspolicy_controller.go | 3 +-- pkg/controllers/dnspolicy/dnspolicy_dnsrecords.go | 3 +-- pkg/controllers/dnspolicy/dnspolicy_healthchecks.go | 6 +++--- pkg/controllers/dnspolicy/dnspolicy_healthchecks_test.go | 6 +++--- pkg/controllers/events/cluster_eventmapper.go | 3 +-- pkg/controllers/events/gateway_eventmapper.go | 3 +-- .../tlspolicy/tlspolicy_certmanager_certificates.go | 3 +-- pkg/controllers/tlspolicy/tlspolicy_controller.go | 5 ++--- test/policy_integration/suite_test.go | 3 +-- 15 files changed, 22 insertions(+), 32 deletions(-) diff --git a/cmd/ocm/main.go b/cmd/ocm/main.go index 6b2799e64..b4f0122c9 100644 --- a/cmd/ocm/main.go +++ b/cmd/ocm/main.go @@ -5,6 +5,7 @@ import ( "embed" "fmt" + kuadrantv1beta1 "github.com/laurafitzgerald/kuadrant-operator/api/v1beta1" operatorsv1 "github.com/operator-framework/api/pkg/operators/v1" operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1" "open-cluster-management.io/addon-framework/pkg/addonfactory" @@ -17,8 +18,6 @@ import ( "k8s.io/klog/v2" ctrl "sigs.k8s.io/controller-runtime" - kuadrantv1beta1 "github.com/kuadrant/kuadrant-operator/api/v1beta1" - hub "github.com/Kuadrant/multicluster-gateway-controller/pkg/ocm/hub" ) diff --git a/cmd/policy_controller/main.go b/cmd/policy_controller/main.go index 7e4b4842c..bbc322e47 100644 --- a/cmd/policy_controller/main.go +++ b/cmd/policy_controller/main.go @@ -21,6 +21,7 @@ import ( "os" certmanv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" + "github.com/laurafitzgerald/kuadrant-operator/pkg/reconcilers" clusterv1 "open-cluster-management.io/api/cluster/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -34,8 +35,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/webhook" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kuadrant/kuadrant-operator/pkg/reconcilers" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" "github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/dnspolicy" "github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/dnsrecord" diff --git a/go.mod b/go.mod index ee1a43b45..e9bc513dd 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e github.com/jetstack/cert-manager v1.7.1 github.com/kuadrant/authorino v0.15.0 - github.com/kuadrant/kuadrant-operator v0.1.1-0.20230323151616-58593d01833a + github.com/laurafitzgerald/kuadrant-operator v0.0.0-20231027155627-5ab60298a21e github.com/martinlindhe/base36 v1.1.1 github.com/onsi/ginkgo/v2 v2.11.0 github.com/onsi/gomega v1.27.10 diff --git a/pkg/_internal/policy/policy.go b/pkg/_internal/policy/policy.go index acba12d15..c2b2a67ff 100644 --- a/pkg/_internal/policy/policy.go +++ b/pkg/_internal/policy/policy.go @@ -1,9 +1,9 @@ package policy import ( - gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" + "github.com/laurafitzgerald/kuadrant-operator/pkg/common" - "github.com/kuadrant/kuadrant-operator/pkg/common" + gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" ) const ( diff --git a/pkg/_internal/policy/policy_test.go b/pkg/_internal/policy/policy_test.go index 8051ad009..1bb2d703b 100644 --- a/pkg/_internal/policy/policy_test.go +++ b/pkg/_internal/policy/policy_test.go @@ -5,12 +5,12 @@ package policy import ( "testing" + "github.com/laurafitzgerald/kuadrant-operator/pkg/common" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kuadrant/kuadrant-operator/pkg/common" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" testutil "github.com/Kuadrant/multicluster-gateway-controller/test/util" ) diff --git a/pkg/controllers/dnspolicy/dns_helper.go b/pkg/controllers/dnspolicy/dns_helper.go index 66db992bc..fa7c343de 100644 --- a/pkg/controllers/dnspolicy/dns_helper.go +++ b/pkg/controllers/dnspolicy/dns_helper.go @@ -7,6 +7,7 @@ import ( "strconv" "strings" + "github.com/laurafitzgerald/kuadrant-operator/pkg/common" "golang.org/x/net/publicsuffix" "k8s.io/apimachinery/pkg/api/equality" @@ -18,8 +19,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kuadrant/kuadrant-operator/pkg/common" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/_internal/slice" "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" "github.com/Kuadrant/multicluster-gateway-controller/pkg/dns" diff --git a/pkg/controllers/dnspolicy/dnspolicy_controller.go b/pkg/controllers/dnspolicy/dnspolicy_controller.go index 4a732edec..de7608a14 100644 --- a/pkg/controllers/dnspolicy/dnspolicy_controller.go +++ b/pkg/controllers/dnspolicy/dnspolicy_controller.go @@ -23,6 +23,7 @@ import ( "reflect" "github.com/kuadrant/authorino/pkg/log" + "github.com/laurafitzgerald/kuadrant-operator/pkg/reconcilers" clusterv1 "open-cluster-management.io/api/cluster/v1" "k8s.io/apimachinery/pkg/api/equality" @@ -36,8 +37,6 @@ import ( crlog "sigs.k8s.io/controller-runtime/pkg/log" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kuadrant/kuadrant-operator/pkg/reconcilers" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/_internal/conditions" "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" "github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/events" diff --git a/pkg/controllers/dnspolicy/dnspolicy_dnsrecords.go b/pkg/controllers/dnspolicy/dnspolicy_dnsrecords.go index 400af16e0..86c55870f 100644 --- a/pkg/controllers/dnspolicy/dnspolicy_dnsrecords.go +++ b/pkg/controllers/dnspolicy/dnspolicy_dnsrecords.go @@ -5,6 +5,7 @@ import ( "fmt" "strings" + "github.com/laurafitzgerald/kuadrant-operator/pkg/reconcilers" clusterv1 "open-cluster-management.io/api/cluster/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -13,8 +14,6 @@ import ( crlog "sigs.k8s.io/controller-runtime/pkg/log" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kuadrant/kuadrant-operator/pkg/reconcilers" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" "github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/gateway" "github.com/Kuadrant/multicluster-gateway-controller/pkg/dns" diff --git a/pkg/controllers/dnspolicy/dnspolicy_healthchecks.go b/pkg/controllers/dnspolicy/dnspolicy_healthchecks.go index 9afa640a7..d29476e54 100644 --- a/pkg/controllers/dnspolicy/dnspolicy_healthchecks.go +++ b/pkg/controllers/dnspolicy/dnspolicy_healthchecks.go @@ -6,6 +6,9 @@ import ( "strings" "time" + "github.com/laurafitzgerald/kuadrant-operator/pkg/common" + "github.com/laurafitzgerald/kuadrant-operator/pkg/reconcilers" + k8serror "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -13,9 +16,6 @@ import ( crlog "sigs.k8s.io/controller-runtime/pkg/log" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kuadrant/kuadrant-operator/pkg/common" - "github.com/kuadrant/kuadrant-operator/pkg/reconcilers" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/_internal/slice" "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" ) diff --git a/pkg/controllers/dnspolicy/dnspolicy_healthchecks_test.go b/pkg/controllers/dnspolicy/dnspolicy_healthchecks_test.go index 974726087..c867634af 100644 --- a/pkg/controllers/dnspolicy/dnspolicy_healthchecks_test.go +++ b/pkg/controllers/dnspolicy/dnspolicy_healthchecks_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" + "github.com/laurafitzgerald/kuadrant-operator/pkg/common" + "github.com/laurafitzgerald/kuadrant-operator/pkg/reconcilers" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" controllerruntime "sigs.k8s.io/controller-runtime" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kuadrant/kuadrant-operator/pkg/common" - "github.com/kuadrant/kuadrant-operator/pkg/reconcilers" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" "github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/gateway" "github.com/Kuadrant/multicluster-gateway-controller/pkg/dns" diff --git a/pkg/controllers/events/cluster_eventmapper.go b/pkg/controllers/events/cluster_eventmapper.go index e88002b0e..47bf2b203 100644 --- a/pkg/controllers/events/cluster_eventmapper.go +++ b/pkg/controllers/events/cluster_eventmapper.go @@ -5,13 +5,12 @@ import ( "encoding/json" "github.com/go-logr/logr" + "github.com/laurafitzgerald/kuadrant-operator/pkg/common" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kuadrant/kuadrant-operator/pkg/common" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/_internal/metadata" "github.com/Kuadrant/multicluster-gateway-controller/pkg/_internal/slice" "github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/gateway" diff --git a/pkg/controllers/events/gateway_eventmapper.go b/pkg/controllers/events/gateway_eventmapper.go index 7bc3ddd73..757afcbbd 100644 --- a/pkg/controllers/events/gateway_eventmapper.go +++ b/pkg/controllers/events/gateway_eventmapper.go @@ -5,12 +5,11 @@ import ( "fmt" "github.com/go-logr/logr" + "github.com/laurafitzgerald/kuadrant-operator/pkg/common" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - - "github.com/kuadrant/kuadrant-operator/pkg/common" ) // GatewayEventMapper is an EventHandler that maps Gateway object events to policy events. diff --git a/pkg/controllers/tlspolicy/tlspolicy_certmanager_certificates.go b/pkg/controllers/tlspolicy/tlspolicy_certmanager_certificates.go index aa0556aef..64c9827a6 100644 --- a/pkg/controllers/tlspolicy/tlspolicy_certmanager_certificates.go +++ b/pkg/controllers/tlspolicy/tlspolicy_certmanager_certificates.go @@ -6,6 +6,7 @@ import ( "reflect" certmanv1 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" + "github.com/laurafitzgerald/kuadrant-operator/pkg/reconcilers" corev1 "k8s.io/api/core/v1" k8serror "k8s.io/apimachinery/pkg/api/errors" @@ -16,8 +17,6 @@ import ( crlog "sigs.k8s.io/controller-runtime/pkg/log" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kuadrant/kuadrant-operator/pkg/reconcilers" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/_internal/slice" "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" ) diff --git a/pkg/controllers/tlspolicy/tlspolicy_controller.go b/pkg/controllers/tlspolicy/tlspolicy_controller.go index 13068e34b..f595c6a75 100644 --- a/pkg/controllers/tlspolicy/tlspolicy_controller.go +++ b/pkg/controllers/tlspolicy/tlspolicy_controller.go @@ -23,6 +23,8 @@ import ( "reflect" "github.com/go-logr/logr" + "github.com/laurafitzgerald/kuadrant-operator/pkg/common" + "github.com/laurafitzgerald/kuadrant-operator/pkg/reconcilers" "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -37,9 +39,6 @@ import ( gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" gatewayapiv1alpha2 "sigs.k8s.io/gateway-api/apis/v1alpha2" - "github.com/kuadrant/kuadrant-operator/pkg/common" - "github.com/kuadrant/kuadrant-operator/pkg/reconcilers" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/_internal/conditions" "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" "github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/events" diff --git a/test/policy_integration/suite_test.go b/test/policy_integration/suite_test.go index aad02ccf4..00eafc5d8 100644 --- a/test/policy_integration/suite_test.go +++ b/test/policy_integration/suite_test.go @@ -23,6 +23,7 @@ import ( "github.com/go-logr/logr" certman "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1" + "github.com/laurafitzgerald/kuadrant-operator/pkg/reconcilers" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ocmclusterv1 "open-cluster-management.io/api/cluster/v1" @@ -39,8 +40,6 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" gatewayapiv1 "sigs.k8s.io/gateway-api/apis/v1" - "github.com/kuadrant/kuadrant-operator/pkg/reconcilers" - "github.com/Kuadrant/multicluster-gateway-controller/pkg/apis/v1alpha1" . "github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/dnshealthcheckprobe" . "github.com/Kuadrant/multicluster-gateway-controller/pkg/controllers/dnspolicy"