feat: rename incubator package to incubator.ingress-controller.konghq…

….com (#5302)
Kong · Dec 7, 2023 · 6470f94 · 6470f94
1 parent 83f3c86
commit 6470f94
Show file tree

Hide file tree

Showing 21 changed files with 48 additions and 47 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -100,6 +100,7 @@ Adding a new version? You'll need three changes:
   [#5234](https://github.com/Kong/kubernetes-ingress-controller/pull/5234)
   [#5290](https://github.com/Kong/kubernetes-ingress-controller/pull/5290)
   [#5282](https://github.com/Kong/kubernetes-ingress-controller/pull/5282)
+  [#5302](https://github.com/Kong/kubernetes-ingress-controller/pull/5302)
 - Added support for GRPC over HTTP (without TLS) in Gateway API.
   [#5128](https://github.com/Kong/kubernetes-ingress-controller/pull/5128)
 - Added `-init-cache-sync-duration` CLI flag. This flag configures how long the controller waits for Kubernetes resources to populate at startup before generating the initial Kong configuration. It also fixes a bug that removed the default 5 second wait period.

diff --git a/...ubator.konghq.com_kongservicefacades.yaml → ...roller.konghq.com_kongservicefacades.yaml b/...ubator.konghq.com_kongservicefacades.yaml → ...roller.konghq.com_kongservicefacades.yaml
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.13.0
-  name: kongservicefacades.incubator.konghq.com
+  name: kongservicefacades.incubator.ingress-controller.konghq.com
 spec:
-  group: incubator.konghq.com
+  group: incubator.ingress-controller.konghq.com
   names:
     categories:
     - kong-ingress-controller

diff --git a/config/crd/incubator/kustomization.yaml b/config/crd/incubator/kustomization.yaml
@@ -1,4 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- incubator.konghq.com_kongservicefacades.yaml
+- incubator.ingress-controller.konghq.com_kongservicefacades.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -194,15 +194,15 @@ rules:
   - list
   - watch
 - apiGroups:
-  - incubator.konghq.com
+  - incubator.ingress-controller.konghq.com
   resources:
   - kongservicefacades
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - incubator.konghq.com
+  - incubator.ingress-controller.konghq.com
   resources:
   - kongservicefacades/status
   verbs:

diff --git a/hack/generators/controllers/networking/main.go b/hack/generators/controllers/networking/main.go
@@ -234,7 +234,7 @@ var inputControllersNeeded = &typesNeeded{
 		RBACVerbs:                         []string{"get", "list", "watch"},
 	},
 	typeNeeded{
-		Group:                             "incubator.konghq.com",
+		Group:                             "incubator.ingress-controller.konghq.com",
 		Version:                           "v1alpha1",
 		Kind:                              "KongServiceFacade",
 		PackageImportAlias:                "incubatorv1alpha1",

diff --git a/internal/controllers/configuration/zz_generated_controllers.go b/internal/controllers/configuration/zz_generated_controllers.go
diff --git a/...dataplane/translator/testdata/golden/kong-service-facade/expression-routes-on_golden.yaml b/...dataplane/translator/testdata/golden/kong-service-facade/expression-routes-on_golden.yaml
diff --git a/...rnal/dataplane/translator/testdata/golden/kong-service-facade/feature-flag-on_golden.yaml b/...rnal/dataplane/translator/testdata/golden/kong-service-facade/feature-flag-on_golden.yaml
diff --git a/internal/dataplane/translator/testdata/golden/kong-service-facade/in.yaml b/internal/dataplane/translator/testdata/golden/kong-service-facade/in.yaml
@@ -11,7 +11,7 @@ spec:
         paths:
           - backend:
               resource:
-                apiGroup: incubator.konghq.com
+                apiGroup: incubator.ingress-controller.konghq.com
                 kind: KongServiceFacade
                 name: svc-facade-alpha
             path: /alpha
@@ -29,14 +29,14 @@ spec:
         paths:
           - backend:
               resource:
-                apiGroup: incubator.konghq.com
+                apiGroup: incubator.ingress-controller.konghq.com
                 kind: KongServiceFacade
                 name: svc-facade-beta
             path: /beta
             pathType: Exact
   defaultBackend:
     resource:
-      apiGroup: incubator.konghq.com
+      apiGroup: incubator.ingress-controller.konghq.com
       kind: KongServiceFacade
       name: svc-facade-default
 ---
@@ -71,7 +71,7 @@ ports:
     port: 80
     protocol: TCP
 ---
-apiVersion: incubator.konghq.com/v1alpha1
+apiVersion: incubator.ingress-controller.konghq.com/v1alpha1
 kind: KongServiceFacade
 metadata:
   annotations:
@@ -84,7 +84,7 @@ spec:
     name: svc
     port: 80
 ---
-apiVersion: incubator.konghq.com/v1alpha1
+apiVersion: incubator.ingress-controller.konghq.com/v1alpha1
 kind: KongServiceFacade
 metadata:
   annotations:
@@ -97,7 +97,7 @@ spec:
     name: svc
     port: 80
 ---
-apiVersion: incubator.konghq.com/v1alpha1
+apiVersion: incubator.ingress-controller.konghq.com/v1alpha1
 kind: KongServiceFacade
 metadata:
   annotations:

diff --git a/internal/dataplane/translator/translator_test.go b/internal/dataplane/translator/translator_test.go
@@ -2554,7 +2554,7 @@ func TestDefaultBackend(t *testing.T) {
 			lo.ToPtr("k8s-name:foo-facade"),
 			lo.ToPtr("k8s-namespace:default"),
 			lo.ToPtr("k8s-kind:KongServiceFacade"),
-			lo.ToPtr("k8s-group:incubator.konghq.com"),
+			lo.ToPtr("k8s-group:incubator.ingress-controller.konghq.com"),
 			lo.ToPtr("k8s-version:v1alpha1"),
 		}, service.Tags, "tags are populated with KongServiceFacade as a parent")
 	})

diff --git a/pkg/apis/incubator/doc.go b/pkg/apis/incubator/doc.go
@@ -1,4 +1,4 @@
-// Package incubator contains API Schema definitions for the incubator.konghq.com API group.
+// Package incubator contains API Schema definitions for the incubator.ingress-controller.konghq.com API group.
 // This group is for APIs that are highly experimental and may not be supported in the future.
 // It's not distributed by default and has to be installed separately.
 //

diff --git a/pkg/apis/incubator/v1alpha1/doc.go b/pkg/apis/incubator/v1alpha1/doc.go
@@ -1,4 +1,4 @@
-// Package v1alpha1 contains API Schema definitions for the incubator.konghq.com v1alpha1 API group.
+// Package v1alpha1 contains API Schema definitions for the incubator.ingress-controller.konghq.com v1alpha1 API group.
 // +kubebuilder:object:generate=true
-// +groupName=incubator.konghq.com
+// +groupName=incubator.ingress-controller.konghq.com
 package v1alpha1
diff --git a/pkg/apis/incubator/v1alpha1/groupversion_info.go b/pkg/apis/incubator/v1alpha1/groupversion_info.go
@@ -7,7 +7,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects.
-	GroupVersion = schema.GroupVersion{Group: "incubator.konghq.com", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "incubator.ingress-controller.konghq.com", Version: "v1alpha1"}
 
 	// SchemeGroupVersion is a convenience var for generated clientsets.
 	SchemeGroupVersion = GroupVersion

diff --git a/pkg/clientset/typed/incubator/v1alpha1/incubator_client.go b/pkg/clientset/typed/incubator/v1alpha1/incubator_client.go
diff --git a/test/e2e/manifests/all-in-one-dbless-k4k8s-enterprise.yaml b/test/e2e/manifests/all-in-one-dbless-k4k8s-enterprise.yaml
diff --git a/test/e2e/manifests/all-in-one-dbless-konnect-enterprise.yaml b/test/e2e/manifests/all-in-one-dbless-konnect-enterprise.yaml
diff --git a/test/e2e/manifests/all-in-one-dbless-konnect.yaml b/test/e2e/manifests/all-in-one-dbless-konnect.yaml
diff --git a/test/e2e/manifests/all-in-one-dbless.yaml b/test/e2e/manifests/all-in-one-dbless.yaml
diff --git a/test/e2e/manifests/all-in-one-postgres-enterprise.yaml b/test/e2e/manifests/all-in-one-postgres-enterprise.yaml
diff --git a/test/e2e/manifests/all-in-one-postgres-multiple-gateways.yaml b/test/e2e/manifests/all-in-one-postgres-multiple-gateways.yaml
diff --git a/test/e2e/manifests/all-in-one-postgres.yaml b/test/e2e/manifests/all-in-one-postgres.yaml