chore: move license controller to internal (#7606)

* chore: move license controller to internal

* chore: move license controller to internal

Author: programmer04

.golangci.yaml

@@ -158,7 +158,7 @@ linters:
           alias: konnect${1}
         - pkg: github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/config
           alias: dpconf
-        - pkg: github.com/kong/kubernetes-ingress-controller/v3/controllers/license
+        - pkg: github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/license
           alias: ctrllicense
         - pkg: github.com/Kong/sdk-konnect-go/models/components
           alias: sdkkonnectcomp

Dockerfile

@@ -26,7 +26,6 @@ RUN --mount=type=cache,target=$GOPATH/pkg/mod \
     --mount=type=bind,source=go.mod,target=go.mod \
     go mod download -x
 
-COPY controllers/ controllers/
 COPY pkg/ pkg/
 COPY internal/ internal/
 COPY Makefile .
@@ -97,12 +96,12 @@ ARG TARGETOS
 ARG TARGETARCH
 
 LABEL name="Kong Ingress Controller" \
-      vendor="Kong" \
-      version="$TAG" \
-      release="1" \
-      url="https://github.com/Kong/kubernetes-ingress-controller" \
-      summary="Kong for Kubernetes Ingress" \
-      description="Use Kong for Kubernetes Ingress. Configure plugins, health checking, load balancing and more in Kong for Kubernetes Services, all using Custom Resource Definitions (CRDs) and Kubernetes-native tooling."
+    vendor="Kong" \
+    version="$TAG" \
+    release="1" \
+    url="https://github.com/Kong/kubernetes-ingress-controller" \
+    summary="Kong for Kubernetes Ingress" \
+    description="Use Kong for Kubernetes Ingress. Configure plugins, health checking, load balancing and more in Kong for Kubernetes Services, all using Custom Resource Definitions (CRDs) and Kubernetes-native tooling."
 
 WORKDIR /
 COPY --from=builder /workspace/bin/manager .

Dockerfile.debug

@@ -25,7 +25,6 @@ RUN --mount=type=cache,target=$GOPATH/pkg/mod \
     --mount=type=bind,source=go.mod,target=go.mod \
     go mod download -x
 
-COPY controllers/ controllers/
 COPY pkg/ pkg/
 COPY internal/ internal/
 COPY Makefile .

Makefile

@@ -273,7 +273,7 @@ manifests: manifests.rbac manifests.webhook manifests.single
 
 .PHONY: manifests.rbac ## Generate ClusterRole objects.
 manifests.rbac: controller-gen
-	$(CONTROLLER_GEN) rbac:roleName=kong-ingress paths="./internal/controllers/configuration/" paths="./controllers/license/" paths="./internal/konnect/license/"
+	$(CONTROLLER_GEN) rbac:roleName=kong-ingress paths="./internal/controllers/configuration/" paths="./internal/controllers/license/" paths="./internal/konnect/license/"
 	$(CONTROLLER_GEN) rbac:roleName=kong-ingress-gateway paths="./internal/controllers/gateway/" output:rbac:artifacts:config=config/rbac/gateway
 	$(CONTROLLER_GEN) rbac:roleName=kong-ingress-crds paths="./internal/controllers/crds/" output:rbac:artifacts:config=config/rbac/crds
 

…ollers/license/konglicense_controller.go …ollers/license/konglicense_controller.gocontrollers/license/konglicense_controller.go renamed to internal/controllers/license/konglicense_controller.go controllers/license/konglicense_controller.go renamed to internal/controllers/license/konglicense_controller.go

@@ -24,10 +24,10 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	ctrllicense "github.com/kong/kubernetes-ingress-controller/v3/controllers/license"
 	"github.com/kong/kubernetes-ingress-controller/v3/internal/adminapi"
 	"github.com/kong/kubernetes-ingress-controller/v3/internal/admission"
 	"github.com/kong/kubernetes-ingress-controller/v3/internal/clients"
+	ctrllicense "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/license"
 	ctrlref "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/reference"
 	"github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane"
 	dpconf "github.com/kong/kubernetes-ingress-controller/v3/internal/dataplane/config"

…s/license/konglicense_controller_test.go …s/license/konglicense_controller_test.gocontrollers/license/konglicense_controller_test.go renamed to internal/controllers/license/konglicense_controller_test.go controllers/license/konglicense_controller_test.go renamed to internal/controllers/license/konglicense_controller_test.go

@@ -15,7 +15,7 @@ import (
 
 	configurationv1alpha1 "github.com/kong/kubernetes-configuration/api/configuration/v1alpha1"
 
-	ctrllicense "github.com/kong/kubernetes-ingress-controller/v3/controllers/license"
+	ctrllicense "github.com/kong/kubernetes-ingress-controller/v3/internal/controllers/license"
 )
 
 func TestKongLicenseController(t *testing.T) {