Skip to content
This repository has been archived by the owner on Dec 16, 2024. It is now read-only.

Commit

Permalink
temp commit - drop later
Browse files Browse the repository at this point in the history
  • Loading branch information
@laurafitzgerald
laurafitzgerald committed Nov 7, 2023
1 parent 6f688a6 commit a2a980e
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 32 deletions.
3 changes: 1 addition & 2 deletions cmd/ocm/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)

Expand Down
3 changes: 1 addition & 2 deletions cmd/policy_controller/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/_internal/policy/policy.go
View file
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions pkg/_internal/policy/policy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
3 changes: 1 addition & 2 deletions pkg/controllers/dnspolicy/dns_helper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions pkg/controllers/dnspolicy/dnspolicy_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions pkg/controllers/dnspolicy/dnspolicy_dnsrecords.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/dnspolicy/dnspolicy_healthchecks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ 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"
"sigs.k8s.io/controller-runtime/pkg/client"
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"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/dnspolicy/dnspolicy_healthchecks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions pkg/controllers/events/cluster_eventmapper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions pkg/controllers/events/gateway_eventmapper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions pkg/controllers/tlspolicy/tlspolicy_certmanager_certificates.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)
Expand Down
5 changes: 2 additions & 3 deletions pkg/controllers/tlspolicy/tlspolicy_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions test/policy_integration/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit a2a980e

Please sign in to comment.