diff --git a/bitnami/nginx-ingress-controller/Chart.lock b/bitnami/nginx-ingress-controller/Chart.lock index b2ea47ab4..3a80a2fd5 100644 --- a/bitnami/nginx-ingress-controller/Chart.lock +++ b/bitnami/nginx-ingress-controller/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: https://charts.bitnami.com/bitnami - version: 1.8.0 -digest: sha256:3e342a25057f87853e52d83e1d14e6d8727c15fd85aaae22e7594489cc129f15 -generated: "2021-08-25T06:47:08.152284494Z" + version: 1.9.0 +digest: sha256:6d608d323ac01a7950ba64fa7caf4169a5d9d33e442c99e23e123caaf303b6b9 +generated: "2021-09-15T15:33:21.21342245Z" diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index cafaf0908..6ba7f69e0 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,7 +1,7 @@ annotations: category: Infrastructure apiVersion: v2 -appVersion: 0.48.1 +appVersion: 1.0.0 dependencies: - name: common repository: https://charts.bitnami.com/bitnami @@ -26,4 +26,4 @@ name: nginx-ingress-controller sources: - https://github.com/bitnami/bitnami-docker-nginx-ingress-controller - https://github.com/kubernetes/ingress-nginx -version: 7.6.21 +version: 8.0.0 diff --git a/bitnami/nginx-ingress-controller/README.md b/bitnami/nginx-ingress-controller/README.md index 8841ca420..0bec94888 100644 --- a/bitnami/nginx-ingress-controller/README.md +++ b/bitnami/nginx-ingress-controller/README.md @@ -83,6 +83,7 @@ The command removes all the Kubernetes components associated with the chart and | `defaultBackendService` | Default 404 backend service; required only if `defaultBackend.enabled = false` | `""` | | `electionID` | Election ID to use for status update | `ingress-controller-leader` | | `reportNodeInternalIp` | If using `hostNetwork=true`, setting `reportNodeInternalIp=true`, will pass the flag `report-node-internal-ip-address` to Nginx Ingress Controller | `false` | +| `watchIngressWithoutClass` | Process Ingress objects without ingressClass annotation/ingressClassName field | `false` | | `ingressClass` | Name of the ingress class to route through this controller | `nginx` | | `publishService.enabled` | Set the endpoint records on the Ingress objects to reflect those on the service | `false` | | `publishService.pathOverride` | Allows overriding of the publish service to bind to | `""` | diff --git a/bitnami/nginx-ingress-controller/templates/clusterrole.yaml b/bitnami/nginx-ingress-controller/templates/clusterrole.yaml index 2429386d5..224c1917f 100644 --- a/bitnami/nginx-ingress-controller/templates/clusterrole.yaml +++ b/bitnami/nginx-ingress-controller/templates/clusterrole.yaml @@ -49,8 +49,7 @@ rules: - update - watch - apiGroups: - - extensions - - "networking.k8s.io" + - networking.k8s.io resources: - ingresses verbs: @@ -65,14 +64,13 @@ rules: - create - patch - apiGroups: - - extensions - - "networking.k8s.io" + - networking.k8s.io resources: - ingresses/status verbs: - update - apiGroups: - - "networking.k8s.io" # k8s 1.14+ + - networking.k8s.io resources: - ingressclasses verbs: diff --git a/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml b/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml index 8eb0464c9..879d26191 100644 --- a/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml +++ b/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml @@ -92,7 +92,7 @@ spec: - --publish-service={{ include "nginx-ingress-controller.publishServicePath" . }} {{- end }} - --election-id={{ .Values.electionID }} - - --ingress-class={{ .Values.ingressClass }} + - --controller-class={{ .Values.ingressClass }} - --configmap={{ .Release.Namespace }}/{{ include "common.names.fullname" . }} {{- if .Values.tcp }} - --tcp-services-configmap={{ .Release.Namespace }}/{{ include "common.names.fullname" . }}-tcp @@ -109,6 +109,9 @@ spec: {{- if and (.Values.reportNodeInternalIp) (.Values.hostNetwork)}} - --report-node-internal-ip-address={{ .Values.reportNodeInternalIp }} {{- end }} + {{- if .Values.watchIngressWithoutClass }} + - --watch-ingress-without-class=true + {{- end }} {{- range $key, $value := .Values.extraArgs }} {{- if $value }} - --{{ $key }}={{ $value }} diff --git a/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml b/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml index f74c153da..962af7cc2 100644 --- a/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml +++ b/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml @@ -94,7 +94,7 @@ spec: - --publish-service={{ include "nginx-ingress-controller.publishServicePath" . }} {{- end }} - --election-id={{ .Values.electionID }} - - --ingress-class={{ .Values.ingressClass }} + - --controller-class={{ .Values.ingressClass }} - --configmap={{ default .Release.Namespace .Values.configMapNamespace }}/{{ include "common.names.fullname" . }} {{- if .Values.tcp }} - --tcp-services-configmap={{ default .Release.Namespace .Values.tcpConfigMapNamespace }}/{{ include "common.names.fullname" . }}-tcp @@ -111,6 +111,9 @@ spec: {{- if and (.Values.reportNodeInternalIp) (.Values.hostNetwork) }} - --report-node-internal-ip-address={{ .Values.reportNodeInternalIp }} {{- end }} + {{- if .Values.watchIngressWithoutClass }} + - --watch-ingress-without-class=true + {{- end }} {{- range $key, $value := .Values.extraArgs }} {{- if $value }} - --{{ $key }}={{ $value }} diff --git a/bitnami/nginx-ingress-controller/templates/role.yaml b/bitnami/nginx-ingress-controller/templates/role.yaml index ef8cbd6ef..71fb15ad3 100644 --- a/bitnami/nginx-ingress-controller/templates/role.yaml +++ b/bitnami/nginx-ingress-controller/templates/role.yaml @@ -39,8 +39,7 @@ rules: - update - watch - apiGroups: - - extensions - - "networking.k8s.io" + - networking.k8s.io resources: - ingresses verbs: @@ -48,8 +47,7 @@ rules: - list - watch - apiGroups: - - extensions - - "networking.k8s.io" + - networking.k8s.io resources: - ingresses/status verbs: diff --git a/bitnami/nginx-ingress-controller/values.yaml b/bitnami/nginx-ingress-controller/values.yaml index e987df0ef..6c81f6f52 100644 --- a/bitnami/nginx-ingress-controller/values.yaml +++ b/bitnami/nginx-ingress-controller/values.yaml @@ -45,7 +45,7 @@ extraDeploy: [] image: registry: docker.io repository: bitnami/nginx-ingress-controller - tag: 0.48.1-debian-10-r38 + tag: 1.0.0-debian-10-r0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -93,6 +93,9 @@ electionID: ingress-controller-leader ## ref: https://kubernetes.github.io/ingress-nginx/deploy/baremetal/#via-the-host-network ## reportNodeInternalIp: false +## @param watchIngressWithoutClass Process Ingress objects without ingressClass annotation/ingressClassName field +## +watchIngressWithoutClass: false ## @param ingressClass Name of the ingress class to route through this controller ## ingressClass: nginx @@ -439,7 +442,7 @@ defaultBackend: image: registry: docker.io repository: bitnami/nginx - tag: 1.21.1-debian-10-r46 + tag: 1.21.3-debian-10-r7 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images