Kong · rainest · Jul 23, 2021 · Jul 23, 2021 · Jul 23, 2021 · Jul 23, 2021
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -55,6 +55,11 @@
 - Added scripts to generate 2.x manifests.
   [#1563](https://github.com/Kong/kubernetes-ingress-controller/pull/1563)
 
+#### Fixed
+
+- Corrected the old Ingress v1beta1 API group.
+  [#1584](https://github.com/Kong/kubernetes-ingress-controller/pull/1584)
+
 #### Under the hood
 
 - New `v1` versions of `CustomResourceDefinitions` introduced for KIC 2.0 are now

diff --git a/deploy/single-v2/all-in-one-dbless.yaml b/deploy/single-v2/all-in-one-dbless.yaml
@@ -1104,22 +1104,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - configuration.konghq.com
   resources:
@@ -1216,6 +1200,22 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - networking.internal.knative.dev
   resources:

diff --git a/deploy/single-v2/all-in-one-enterprise-dbless.yaml b/deploy/single-v2/all-in-one-enterprise-dbless.yaml
@@ -1104,22 +1104,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - configuration.konghq.com
   resources:
@@ -1216,6 +1200,22 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - networking.internal.knative.dev
   resources:

diff --git a/deploy/single-v2/all-in-one-enterprise-postgres.yaml b/deploy/single-v2/all-in-one-enterprise-postgres.yaml
@@ -1104,22 +1104,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - configuration.konghq.com
   resources:
@@ -1216,6 +1200,22 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - networking.internal.knative.dev
   resources:

diff --git a/deploy/single-v2/all-in-one-postgres.yaml b/deploy/single-v2/all-in-one-postgres.yaml
@@ -1104,22 +1104,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - configuration.konghq.com
   resources:
@@ -1216,6 +1200,22 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - networking.internal.knative.dev
   resources:

diff --git a/railgun/config/rbac/role.yaml b/railgun/config/rbac/role.yaml
@@ -74,22 +74,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - configuration.konghq.com
   resources:
@@ -186,6 +170,22 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - networking.internal.knative.dev
   resources:
@@ -295,22 +295,6 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - ingresses/status
-  verbs:
-  - get
-  - patch
-  - update
 - apiGroups:
   - configuration.konghq.com
   resources:
@@ -407,6 +391,22 @@ rules:
   - get
   - patch
   - update
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - extensions
+  resources:
+  - ingresses/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - networking.internal.knative.dev
   resources:

diff --git a/railgun/hack/generators/controllers/networking/main.go b/railgun/hack/generators/controllers/networking/main.go
@@ -98,7 +98,7 @@ var inputControllersNeeded = &typesNeeded{
 		Package:                           extv1beta1,
 		Type:                              "Ingress",
 		Plural:                            "ingresses",
-		URL:                               "apiextensions.k8s.io",
+		URL:                               "extensions",
 		CacheType:                         "IngressV1beta1",
 		AcceptsIngressClassNameAnnotation: true,
 		AcceptsIngressClassNameSpec:       false,

diff --git a/railgun/internal/controllers/configuration/zz_generated_controllers.go b/railgun/internal/controllers/configuration/zz_generated_controllers.go