Skip to content

Commit

Permalink
fix(codegen) use extensions group for Ingresses (#1584)
Browse files Browse the repository at this point in the history
* fix(codegen) use extensions group for Ingresses

Change the API group for the original v1beta1 Ingress from
apiextensions.k8s.io to extensions. See
https://v1-17.docs.kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#ingress-v1beta1-extensions
for reference.

apiextensions.k8s.io is for CRDs instead.

* chore(*) run code and manifest generators
* docs(*) update changelog
  • Loading branch information
Travis Raines authored Jul 23, 2021
1 parent 9813575 commit 7149737
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 101 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 16 additions & 16 deletions deploy/single-v2/all-in-one-dbless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
32 changes: 16 additions & 16 deletions deploy/single-v2/all-in-one-enterprise-dbless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
32 changes: 16 additions & 16 deletions deploy/single-v2/all-in-one-enterprise-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
32 changes: 16 additions & 16 deletions deploy/single-v2/all-in-one-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
64 changes: 32 additions & 32 deletions railgun/config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion railgun/hack/generators/controllers/networking/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

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

0 comments on commit 7149737

Please sign in to comment.