migrate to multigroup

ngrok · Jan 10, 2024 · a26ca96 · a26ca96
1 parent f244d2d
commit a26ca96
Show file tree

Hide file tree

Showing 45 changed files with 38 additions and 37 deletions.
diff --git 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
diff --git a/api/v1alpha1/domain_types.go → api/ingress/v1alpha1/domain_types.go b/api/v1alpha1/domain_types.go → api/ingress/v1alpha1/domain_types.go
diff --git a/api/v1alpha1/groupversion_info.go → api/ingress/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go → api/ingress/v1alpha1/groupversion_info.go
diff --git a/api/v1alpha1/httpsedge_types.go → api/ingress/v1alpha1/httpsedge_types.go b/api/v1alpha1/httpsedge_types.go → api/ingress/v1alpha1/httpsedge_types.go
diff --git a/api/v1alpha1/httpsedge_types_test.go → api/ingress/v1alpha1/httpsedge_types_test.go b/api/v1alpha1/httpsedge_types_test.go → api/ingress/v1alpha1/httpsedge_types_test.go
diff --git a/api/v1alpha1/ippolicy_types.go → api/ingress/v1alpha1/ippolicy_types.go b/api/v1alpha1/ippolicy_types.go → api/ingress/v1alpha1/ippolicy_types.go
diff --git a/api/v1alpha1/ngrok_common.go → api/ingress/v1alpha1/ngrok_common.go b/api/v1alpha1/ngrok_common.go → api/ingress/v1alpha1/ngrok_common.go
diff --git a/api/v1alpha1/ngrokmoduleset_types.go → api/ingress/v1alpha1/ngrokmoduleset_types.go b/api/v1alpha1/ngrokmoduleset_types.go → api/ingress/v1alpha1/ngrokmoduleset_types.go
diff --git a/api/v1alpha1/tcpedge_types.go → api/ingress/v1alpha1/tcpedge_types.go b/api/v1alpha1/tcpedge_types.go → api/ingress/v1alpha1/tcpedge_types.go
diff --git a/api/v1alpha1/tlsedge_types.go → api/ingress/v1alpha1/tlsedge_types.go b/api/v1alpha1/tlsedge_types.go → api/ingress/v1alpha1/tlsedge_types.go
diff --git a/api/v1alpha1/tunnel_types.go → api/ingress/v1alpha1/tunnel_types.go b/api/v1alpha1/tunnel_types.go → api/ingress/v1alpha1/tunnel_types.go
diff --git a/api/v1alpha1/zz_generated.deepcopy.go → ...ingress/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go → ...ingress/v1alpha1/zz_generated.deepcopy.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → ...nal/controller/ingress/base_controller.go b/internal/controller/base_controller.go → ...nal/controller/ingress/base_controller.go
diff --git a/internal/controller/domain_controller.go → ...l/controller/ingress/domain_controller.go b/internal/controller/domain_controller.go → ...l/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 → ...ontroller/ingress/httpsedge_controller.go b/internal/controller/httpsedge_controller.go → ...ontroller/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/...l/controller/httpsedge_controller_test.go → ...ller/ingress/httpsedge_controller_test.go b/...l/controller/httpsedge_controller_test.go → ...ller/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 → .../controller/ingress/ingress_controller.go b/internal/controller/ingress_controller.go → .../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/...nal/controller/ingress_controller_test.go → ...roller/ingress/ingress_controller_test.go b/...nal/controller/ingress_controller_test.go → ...roller/ingress/ingress_controller_test.go
diff --git a/internal/controller/ippolicy_controller.go → ...controller/ingress/ippolicy_controller.go b/internal/controller/ippolicy_controller.go → ...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/...l/controller/ippolicy_controllers_test.go → ...ller/ingress/ippolicy_controllers_test.go b/...l/controller/ippolicy_controllers_test.go → ...ller/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 → ...ontroller/ingress/moduleset_controller.go b/internal/controller/moduleset_controller.go → ...ontroller/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/...ntroller/non_leader_elected_controller.go → .../ingress/non_leader_elected_controller.go b/...ntroller/non_leader_elected_controller.go → .../ingress/non_leader_elected_controller.go
diff --git a/...ler/non_leader_elected_controller_test.go → ...ess/non_leader_elected_controller_test.go b/...ler/non_leader_elected_controller_test.go → ...ess/non_leader_elected_controller_test.go
diff --git a/internal/controller/predicate_filters.go → ...l/controller/ingress/predicate_filters.go b/internal/controller/predicate_filters.go → ...l/controller/ingress/predicate_filters.go
diff --git a/internal/controller/tcpedge_controller.go → .../controller/ingress/tcpedge_controller.go b/internal/controller/tcpedge_controller.go → .../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 → .../controller/ingress/tlsedge_controller.go b/internal/controller/tlsedge_controller.go → .../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 → ...l/controller/ingress/tunnel_controller.go b/internal/controller/tunnel_controller.go → ...l/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 → internal/controller/ingress/utils.go b/internal/controller/utils.go → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"