From e09cba575a287349bd7fb52b949d05901c6dcf0a Mon Sep 17 00:00:00 2001 From: Abdirahman Osman Date: Wed, 27 Dec 2023 18:59:17 -0600 Subject: [PATCH] migrate to multigroup --- Makefile | 4 ++-- PROJECT | 15 ++++++++------- api/{ => ingress}/v1alpha1/domain_types.go | 0 api/{ => ingress}/v1alpha1/groupversion_info.go | 0 api/{ => ingress}/v1alpha1/httpsedge_types.go | 0 .../v1alpha1/httpsedge_types_test.go | 0 api/{ => ingress}/v1alpha1/ippolicy_types.go | 0 api/{ => ingress}/v1alpha1/ngrok_common.go | 0 .../v1alpha1/ngrokmoduleset_types.go | 0 api/{ => ingress}/v1alpha1/tcpedge_types.go | 0 api/{ => ingress}/v1alpha1/tlsedge_types.go | 0 api/{ => ingress}/v1alpha1/tunnel_types.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 cmd/main.go | 4 ++-- internal/annotations/annotations.go | 2 +- internal/annotations/compression/compression.go | 2 +- .../annotations/compression/compression_test.go | 2 +- internal/annotations/headers/headers.go | 2 +- internal/annotations/ip_policies/ip_policy.go | 2 +- .../annotations/ip_policies/ip_policy_test.go | 2 +- internal/annotations/tls/tls.go | 2 +- .../webhook_verification/webhook_verification.go | 2 +- .../webhook_verification_test.go | 2 +- .../controller/{ => ingress}/base_controller.go | 0 .../controller/{ => ingress}/domain_controller.go | 2 +- .../{ => ingress}/httpsedge_controller.go | 2 +- .../{ => ingress}/httpsedge_controller_test.go | 2 +- .../{ => ingress}/ingress_controller.go | 2 +- .../{ => ingress}/ingress_controller_test.go | 0 .../{ => ingress}/ippolicy_controller.go | 2 +- .../{ => ingress}/ippolicy_controllers_test.go | 2 +- .../{ => ingress}/moduleset_controller.go | 2 +- .../non_leader_elected_controller.go | 0 .../non_leader_elected_controller_test.go | 0 .../controller/{ => ingress}/predicate_filters.go | 0 .../{ => ingress}/tcpedge_controller.go | 2 +- .../{ => ingress}/tlsedge_controller.go | 2 +- .../controller/{ => ingress}/tunnel_controller.go | 2 +- internal/controller/{ => ingress}/utils.go | 2 +- internal/store/cachestores.go | 2 +- internal/store/driver.go | 2 +- internal/store/driver_test.go | 2 +- internal/store/store.go | 2 +- internal/store/testutility.go | 2 +- pkg/tunneldriver/driver.go | 2 +- 45 files changed, 38 insertions(+), 37 deletions(-) rename api/{ => ingress}/v1alpha1/domain_types.go (100%) rename api/{ => ingress}/v1alpha1/groupversion_info.go (100%) rename api/{ => ingress}/v1alpha1/httpsedge_types.go (100%) rename api/{ => ingress}/v1alpha1/httpsedge_types_test.go (100%) rename api/{ => ingress}/v1alpha1/ippolicy_types.go (100%) rename api/{ => ingress}/v1alpha1/ngrok_common.go (100%) rename api/{ => ingress}/v1alpha1/ngrokmoduleset_types.go (100%) rename api/{ => ingress}/v1alpha1/tcpedge_types.go (100%) rename api/{ => ingress}/v1alpha1/tlsedge_types.go (100%) rename api/{ => ingress}/v1alpha1/tunnel_types.go (100%) rename api/{ => ingress}/v1alpha1/zz_generated.deepcopy.go (100%) rename internal/controller/{ => ingress}/base_controller.go (100%) rename internal/controller/{ => ingress}/domain_controller.go (99%) rename internal/controller/{ => ingress}/httpsedge_controller.go (99%) rename internal/controller/{ => ingress}/httpsedge_controller_test.go (99%) rename internal/controller/{ => ingress}/ingress_controller.go (99%) rename internal/controller/{ => ingress}/ingress_controller_test.go (100%) rename internal/controller/{ => ingress}/ippolicy_controller.go (99%) rename internal/controller/{ => ingress}/ippolicy_controllers_test.go (99%) rename internal/controller/{ => ingress}/moduleset_controller.go (98%) rename internal/controller/{ => ingress}/non_leader_elected_controller.go (100%) rename internal/controller/{ => ingress}/non_leader_elected_controller_test.go (100%) rename internal/controller/{ => ingress}/predicate_filters.go (100%) rename internal/controller/{ => ingress}/tcpedge_controller.go (99%) rename internal/controller/{ => ingress}/tlsedge_controller.go (99%) rename internal/controller/{ => ingress}/tunnel_controller.go (99%) rename internal/controller/{ => ingress}/utils.go (99%) diff --git a/Makefile b/Makefile index a971e531..a3a17bbf 100644 --- a/Makefile +++ b/Makefile @@ -57,13 +57,13 @@ preflight: ## Verifies required things like the go version .PHONY: manifests manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. - $(CONTROLLER_GEN) rbac:roleName=ngrok-ingress-controller-manager-role crd webhook paths="{./api/v1alpha1/, ./internal/controller/}" \ + $(CONTROLLER_GEN) rbac:roleName=ngrok-ingress-controller-manager-role crd webhook paths="{./api/ingress/v1alpha1/, ./internal/controller/ingress/}" \ output:crd:artifacts:config=$(HELM_TEMPLATES_DIR)/crds \ output:rbac:artifacts:config=$(HELM_TEMPLATES_DIR)/rbac .PHONY: generate generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. - $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="{./api/v1alpha1/, ./internal/controller/}" + $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="{./api/ingress/v1alpha1/, ./internal/controller/ingress/}" .PHONY: fmt fmt: ## Run go fmt against code. diff --git a/PROJECT b/PROJECT index deaf2151..31d2870f 100644 --- a/PROJECT +++ b/PROJECT @@ -5,6 +5,7 @@ domain: k8s.ngrok.com layout: - go.kubebuilder.io/v4 +multigroup: true projectName: kubernetes-ingress-controller repo: github.com/ngrok/kubernetes-ingress-controller resources: @@ -15,7 +16,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: Domain - path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -24,7 +25,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: Tunnel - path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -33,7 +34,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: TCPEdge - path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -42,7 +43,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: HTTPSEdge - path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -51,7 +52,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: IPPolicy - path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -59,7 +60,7 @@ resources: domain: k8s.ngrok.com group: ingress kind: NgrokModule - path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 version: v1alpha1 - api: crdVersion: v1 @@ -67,6 +68,6 @@ resources: domain: k8s.ngrok.com group: ingress kind: NgrokModuleSet - path: github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1 + path: github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1 version: v1alpha1 version: "3" diff --git a/api/v1alpha1/domain_types.go b/api/ingress/v1alpha1/domain_types.go similarity index 100% rename from api/v1alpha1/domain_types.go rename to api/ingress/v1alpha1/domain_types.go diff --git a/api/v1alpha1/groupversion_info.go b/api/ingress/v1alpha1/groupversion_info.go similarity index 100% rename from api/v1alpha1/groupversion_info.go rename to api/ingress/v1alpha1/groupversion_info.go diff --git a/api/v1alpha1/httpsedge_types.go b/api/ingress/v1alpha1/httpsedge_types.go similarity index 100% rename from api/v1alpha1/httpsedge_types.go rename to api/ingress/v1alpha1/httpsedge_types.go diff --git a/api/v1alpha1/httpsedge_types_test.go b/api/ingress/v1alpha1/httpsedge_types_test.go similarity index 100% rename from api/v1alpha1/httpsedge_types_test.go rename to api/ingress/v1alpha1/httpsedge_types_test.go diff --git a/api/v1alpha1/ippolicy_types.go b/api/ingress/v1alpha1/ippolicy_types.go similarity index 100% rename from api/v1alpha1/ippolicy_types.go rename to api/ingress/v1alpha1/ippolicy_types.go diff --git a/api/v1alpha1/ngrok_common.go b/api/ingress/v1alpha1/ngrok_common.go similarity index 100% rename from api/v1alpha1/ngrok_common.go rename to api/ingress/v1alpha1/ngrok_common.go diff --git a/api/v1alpha1/ngrokmoduleset_types.go b/api/ingress/v1alpha1/ngrokmoduleset_types.go similarity index 100% rename from api/v1alpha1/ngrokmoduleset_types.go rename to api/ingress/v1alpha1/ngrokmoduleset_types.go diff --git a/api/v1alpha1/tcpedge_types.go b/api/ingress/v1alpha1/tcpedge_types.go similarity index 100% rename from api/v1alpha1/tcpedge_types.go rename to api/ingress/v1alpha1/tcpedge_types.go diff --git a/api/v1alpha1/tlsedge_types.go b/api/ingress/v1alpha1/tlsedge_types.go similarity index 100% rename from api/v1alpha1/tlsedge_types.go rename to api/ingress/v1alpha1/tlsedge_types.go diff --git a/api/v1alpha1/tunnel_types.go b/api/ingress/v1alpha1/tunnel_types.go similarity index 100% rename from api/v1alpha1/tunnel_types.go rename to api/ingress/v1alpha1/tunnel_types.go diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/ingress/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from api/v1alpha1/zz_generated.deepcopy.go rename to api/ingress/v1alpha1/zz_generated.deepcopy.go diff --git a/cmd/main.go b/cmd/main.go index 6e520dd6..dc2bdff2 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -42,9 +42,9 @@ import ( "github.com/ngrok/ngrok-api-go/v5" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations" - "github.com/ngrok/kubernetes-ingress-controller/internal/controller" + "github.com/ngrok/kubernetes-ingress-controller/internal/controller/ingress" "github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi" "github.com/ngrok/kubernetes-ingress-controller/internal/store" "github.com/ngrok/kubernetes-ingress-controller/internal/version" diff --git a/internal/annotations/annotations.go b/internal/annotations/annotations.go index f6eb2842..d17b38be 100644 --- a/internal/annotations/annotations.go +++ b/internal/annotations/annotations.go @@ -18,7 +18,7 @@ package annotations import ( "github.com/imdario/mergo" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/compression" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/headers" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/ip_policies" diff --git a/internal/annotations/compression/compression.go b/internal/annotations/compression/compression.go index 40c57669..d3450a34 100644 --- a/internal/annotations/compression/compression.go +++ b/internal/annotations/compression/compression.go @@ -1,7 +1,7 @@ package compression import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" networking "k8s.io/api/networking/v1" ) diff --git a/internal/annotations/compression/compression_test.go b/internal/annotations/compression/compression_test.go index 257e69a8..cfae5ed5 100644 --- a/internal/annotations/compression/compression_test.go +++ b/internal/annotations/compression/compression_test.go @@ -3,7 +3,7 @@ package compression import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/testutil" "github.com/ngrok/kubernetes-ingress-controller/internal/errors" diff --git a/internal/annotations/headers/headers.go b/internal/annotations/headers/headers.go index 0f30f86f..69754296 100644 --- a/internal/annotations/headers/headers.go +++ b/internal/annotations/headers/headers.go @@ -1,7 +1,7 @@ package headers import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" "github.com/ngrok/kubernetes-ingress-controller/internal/errors" networking "k8s.io/api/networking/v1" diff --git a/internal/annotations/ip_policies/ip_policy.go b/internal/annotations/ip_policies/ip_policy.go index 76b3758a..4895b27f 100644 --- a/internal/annotations/ip_policies/ip_policy.go +++ b/internal/annotations/ip_policies/ip_policy.go @@ -1,7 +1,7 @@ package ip_policies import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" networking "k8s.io/api/networking/v1" ) diff --git a/internal/annotations/ip_policies/ip_policy_test.go b/internal/annotations/ip_policies/ip_policy_test.go index 4aece4b1..9a08ad72 100644 --- a/internal/annotations/ip_policies/ip_policy_test.go +++ b/internal/annotations/ip_policies/ip_policy_test.go @@ -3,7 +3,7 @@ package ip_policies import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/testutil" "github.com/stretchr/testify/assert" diff --git a/internal/annotations/tls/tls.go b/internal/annotations/tls/tls.go index b62ade26..d185b8d2 100644 --- a/internal/annotations/tls/tls.go +++ b/internal/annotations/tls/tls.go @@ -1,7 +1,7 @@ package tls import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" networking "k8s.io/api/networking/v1" ) diff --git a/internal/annotations/webhook_verification/webhook_verification.go b/internal/annotations/webhook_verification/webhook_verification.go index 16c1eaf7..e6612f6e 100644 --- a/internal/annotations/webhook_verification/webhook_verification.go +++ b/internal/annotations/webhook_verification/webhook_verification.go @@ -1,7 +1,7 @@ package webhook_verification import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" networking "k8s.io/api/networking/v1" ) diff --git a/internal/annotations/webhook_verification/webhook_verification_test.go b/internal/annotations/webhook_verification/webhook_verification_test.go index b9815daa..017cb2c3 100644 --- a/internal/annotations/webhook_verification/webhook_verification_test.go +++ b/internal/annotations/webhook_verification/webhook_verification_test.go @@ -3,7 +3,7 @@ package webhook_verification import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/parser" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations/testutil" "github.com/ngrok/kubernetes-ingress-controller/internal/errors" diff --git a/internal/controller/base_controller.go b/internal/controller/ingress/base_controller.go similarity index 100% rename from internal/controller/base_controller.go rename to internal/controller/ingress/base_controller.go diff --git a/internal/controller/domain_controller.go b/internal/controller/ingress/domain_controller.go similarity index 99% rename from internal/controller/domain_controller.go rename to internal/controller/ingress/domain_controller.go index 46498cd7..2581ac84 100644 --- a/internal/controller/domain_controller.go +++ b/internal/controller/ingress/domain_controller.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" "github.com/ngrok/ngrok-api-go/v5/reserved_domains" ) diff --git a/internal/controller/httpsedge_controller.go b/internal/controller/ingress/httpsedge_controller.go similarity index 99% rename from internal/controller/httpsedge_controller.go rename to internal/controller/ingress/httpsedge_controller.go index d1558068..d535b928 100644 --- a/internal/controller/httpsedge_controller.go +++ b/internal/controller/ingress/httpsedge_controller.go @@ -43,7 +43,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" ierr "github.com/ngrok/kubernetes-ingress-controller/internal/errors" "github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi" "github.com/ngrok/ngrok-api-go/v5" diff --git a/internal/controller/httpsedge_controller_test.go b/internal/controller/ingress/httpsedge_controller_test.go similarity index 99% rename from internal/controller/httpsedge_controller_test.go rename to internal/controller/ingress/httpsedge_controller_test.go index fe9ddb6f..b2a4263f 100644 --- a/internal/controller/httpsedge_controller_test.go +++ b/internal/controller/ingress/httpsedge_controller_test.go @@ -3,7 +3,7 @@ package controllers import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/controller/ingress_controller.go b/internal/controller/ingress/ingress_controller.go similarity index 99% rename from internal/controller/ingress_controller.go rename to internal/controller/ingress/ingress_controller.go index bcbdb642..1a946074 100644 --- a/internal/controller/ingress_controller.go +++ b/internal/controller/ingress/ingress_controller.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations" internalerrors "github.com/ngrok/kubernetes-ingress-controller/internal/errors" "github.com/ngrok/kubernetes-ingress-controller/internal/store" diff --git a/internal/controller/ingress_controller_test.go b/internal/controller/ingress/ingress_controller_test.go similarity index 100% rename from internal/controller/ingress_controller_test.go rename to internal/controller/ingress/ingress_controller_test.go diff --git a/internal/controller/ippolicy_controller.go b/internal/controller/ingress/ippolicy_controller.go similarity index 99% rename from internal/controller/ippolicy_controller.go rename to internal/controller/ingress/ippolicy_controller.go index a26ed804..55177689 100644 --- a/internal/controller/ippolicy_controller.go +++ b/internal/controller/ingress/ippolicy_controller.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" "github.com/ngrok/ngrok-api-go/v5/ip_policies" "github.com/ngrok/ngrok-api-go/v5/ip_policy_rules" diff --git a/internal/controller/ippolicy_controllers_test.go b/internal/controller/ingress/ippolicy_controllers_test.go similarity index 99% rename from internal/controller/ippolicy_controllers_test.go rename to internal/controller/ingress/ippolicy_controllers_test.go index 9dcf8d85..eb69f4eb 100644 --- a/internal/controller/ippolicy_controllers_test.go +++ b/internal/controller/ingress/ippolicy_controllers_test.go @@ -3,7 +3,7 @@ package controllers import ( "testing" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/ngrok-api-go/v5" "github.com/stretchr/testify/assert" "k8s.io/utils/pointer" diff --git a/internal/controller/moduleset_controller.go b/internal/controller/ingress/moduleset_controller.go similarity index 98% rename from internal/controller/moduleset_controller.go rename to internal/controller/ingress/moduleset_controller.go index 48bdfbd9..01d47125 100644 --- a/internal/controller/moduleset_controller.go +++ b/internal/controller/ingress/moduleset_controller.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/store" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" diff --git a/internal/controller/non_leader_elected_controller.go b/internal/controller/ingress/non_leader_elected_controller.go similarity index 100% rename from internal/controller/non_leader_elected_controller.go rename to internal/controller/ingress/non_leader_elected_controller.go diff --git a/internal/controller/non_leader_elected_controller_test.go b/internal/controller/ingress/non_leader_elected_controller_test.go similarity index 100% rename from internal/controller/non_leader_elected_controller_test.go rename to internal/controller/ingress/non_leader_elected_controller_test.go diff --git a/internal/controller/predicate_filters.go b/internal/controller/ingress/predicate_filters.go similarity index 100% rename from internal/controller/predicate_filters.go rename to internal/controller/ingress/predicate_filters.go diff --git a/internal/controller/tcpedge_controller.go b/internal/controller/ingress/tcpedge_controller.go similarity index 99% rename from internal/controller/tcpedge_controller.go rename to internal/controller/ingress/tcpedge_controller.go index 14947205..be3b118a 100644 --- a/internal/controller/tcpedge_controller.go +++ b/internal/controller/ingress/tcpedge_controller.go @@ -41,7 +41,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi" "github.com/ngrok/ngrok-api-go/v5" ) diff --git a/internal/controller/tlsedge_controller.go b/internal/controller/ingress/tlsedge_controller.go similarity index 99% rename from internal/controller/tlsedge_controller.go rename to internal/controller/ingress/tlsedge_controller.go index e33e5930..f809c106 100644 --- a/internal/controller/tlsedge_controller.go +++ b/internal/controller/ingress/tlsedge_controller.go @@ -41,7 +41,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" ierr "github.com/ngrok/kubernetes-ingress-controller/internal/errors" "github.com/ngrok/kubernetes-ingress-controller/internal/ngrokapi" "github.com/ngrok/ngrok-api-go/v5" diff --git a/internal/controller/tunnel_controller.go b/internal/controller/ingress/tunnel_controller.go similarity index 99% rename from internal/controller/tunnel_controller.go rename to internal/controller/ingress/tunnel_controller.go index a854b798..86f9ac53 100644 --- a/internal/controller/tunnel_controller.go +++ b/internal/controller/ingress/tunnel_controller.go @@ -29,7 +29,7 @@ import ( "fmt" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/pkg/tunneldriver" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" diff --git a/internal/controller/utils.go b/internal/controller/ingress/utils.go similarity index 99% rename from internal/controller/utils.go rename to internal/controller/ingress/utils.go index e56ef61d..3bda29c8 100644 --- a/internal/controller/utils.go +++ b/internal/controller/ingress/utils.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/internal/store/cachestores.go b/internal/store/cachestores.go index 1dbbc8a4..8078c657 100644 --- a/internal/store/cachestores.go +++ b/internal/store/cachestores.go @@ -19,7 +19,7 @@ import ( "sync" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" corev1 "k8s.io/api/core/v1" netv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/store/driver.go b/internal/store/driver.go index 913717c4..77b5e13f 100644 --- a/internal/store/driver.go +++ b/internal/store/driver.go @@ -17,7 +17,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/annotations" "github.com/ngrok/kubernetes-ingress-controller/internal/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/store/driver_test.go b/internal/store/driver_test.go index 6df3caa8..5ce5c185 100644 --- a/internal/store/driver_test.go +++ b/internal/store/driver_test.go @@ -15,7 +15,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" ) const defaultManagerName = "ngrok-ingress-controller" diff --git a/internal/store/store.go b/internal/store/store.go index 3f199af9..9319fb25 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -18,7 +18,7 @@ import ( "sort" "strings" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/errors" corev1 "k8s.io/api/core/v1" diff --git a/internal/store/testutility.go b/internal/store/testutility.go index 391634c6..91db9ec9 100644 --- a/internal/store/testutility.go +++ b/internal/store/testutility.go @@ -1,7 +1,7 @@ package store import ( - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" corev1 "k8s.io/api/core/v1" netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/tunneldriver/driver.go b/pkg/tunneldriver/driver.go index ddf47ae9..ad1c440c 100644 --- a/pkg/tunneldriver/driver.go +++ b/pkg/tunneldriver/driver.go @@ -11,7 +11,7 @@ import ( "path/filepath" "github.com/go-logr/logr" - ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/v1alpha1" + ingressv1alpha1 "github.com/ngrok/kubernetes-ingress-controller/api/ingress/v1alpha1" "github.com/ngrok/kubernetes-ingress-controller/internal/version" "golang.org/x/exp/maps" "golang.org/x/sync/errgroup"