Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate to multigroup #327

Merged
merged 1 commit into from
Jan 11, 2024
Merged

migrate to multigroup #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
15 changes: 8 additions & 7 deletions PROJECT
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 api/v1alpha1/domain_types.go → api/ingress/v1alpha1/domain_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/groupversion_info.go → api/ingress/v1alpha1/groupversion_info.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/httpsedge_types.go → api/ingress/v1alpha1/httpsedge_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/httpsedge_types_test.go → api/ingress/v1alpha1/httpsedge_types_test.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/ippolicy_types.go → api/ingress/v1alpha1/ippolicy_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/ngrok_common.go → api/ingress/v1alpha1/ngrok_common.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/ngrokmoduleset_types.go → api/ingress/v1alpha1/ngrokmoduleset_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/tcpedge_types.go → api/ingress/v1alpha1/tcpedge_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/tlsedge_types.go → api/ingress/v1alpha1/tlsedge_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/tunnel_types.go → api/ingress/v1alpha1/tunnel_types.go
View file
Open in desktop
File renamed without changes.
0 api/v1alpha1/zz_generated.deepcopy.go → ...ingress/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/annotations/annotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/annotations/compression/compression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/annotations/compression/compression_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/annotations/headers/headers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/annotations/ip_policies/ip_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/annotations/ip_policies/ip_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/annotations/tls/tls.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/annotations/webhook_verification/webhook_verification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/annotations/webhook_verification/webhook_verification_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 internal/controller/base_controller.go → ...nal/controller/ingress/base_controller.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/controller/domain_controller.go → ...l/controller/ingress/domain_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/httpsedge_controller.go → ...ontroller/ingress/httpsedge_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...l/controller/httpsedge_controller_test.go → ...ller/ingress/httpsedge_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/ingress_controller.go → .../controller/ingress/ingress_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...nal/controller/ingress_controller_test.go → ...roller/ingress/ingress_controller_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/controller/ippolicy_controller.go → ...controller/ingress/ippolicy_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...l/controller/ippolicy_controllers_test.go → ...ller/ingress/ippolicy_controllers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/moduleset_controller.go → ...ontroller/ingress/moduleset_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...ntroller/non_leader_elected_controller.go → .../ingress/non_leader_elected_controller.go
View file
Open in desktop
File renamed without changes.
0 ...ler/non_leader_elected_controller_test.go → ...ess/non_leader_elected_controller_test.go
View file
Open in desktop
File renamed without changes.
0 internal/controller/predicate_filters.go → ...l/controller/ingress/predicate_filters.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/controller/tcpedge_controller.go → .../controller/ingress/tcpedge_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/tlsedge_controller.go → .../controller/ingress/tlsedge_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/tunnel_controller.go → ...l/controller/ingress/tunnel_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/utils.go → internal/controller/ingress/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/store/cachestores.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/store/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/store/driver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/store/testutility.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/tunneldriver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down