synced with upstream

kubernetes · Feb 14, 2023 · bb1175e · bb1175e
2 parents 4ecc6c4 + 80fd69e
commit bb1175e
Show file tree

Hide file tree

Showing 35 changed files with 2,242 additions and 2,077 deletions.
diff --git a/README.md b/README.md
@@ -38,6 +38,7 @@ the versions listed. Ingress-Nginx versions may work on older versions but the p
 
 | Ingress-NGINX version | k8s supported version        | Alpine Version | Nginx Version |
 |-----------------------|------------------------------|----------------|---------------|
+| v1.6.3                | 1.26, 1.25, 1.24, 1.23       | 3.17.0         | 1.21.6        |
 | v1.5.1                | 1.25, 1.24, 1.23             | 3.16.2         | 1.21.6        |
 | v1.4.0                | 1.25, 1.24, 1.23, 1.22       | 3.16.2         | 1.19.10†      |
 | v1.3.1                | 1.24, 1.23, 1.22, 1.21, 1.20 | 3.16.2         | 1.19.10†      |

diff --git a/TAG b/TAG
@@ -1 +1,2 @@
-v1.6.2
+v1.6.3
+
diff --git a/changelog/Changelog-1.5.2.md → changelog/Changelog-1.6.3.md b/changelog/Changelog-1.5.2.md → changelog/Changelog-1.6.3.md
@@ -1,14 +1,59 @@
 # Changelog
 
-### 1.5.2
+### 1.6.3
 Images:
 
-<<<<<<< HEAD
- * registry.k8s.io/ingress-nginx/controller:controller-v1.5.2@sha256:3870522ed937c9efb94bfa31a7eb16009831567a0d4cbe01846fc5486d622655
- * registry.k8s.io/ingress-nginx/controller-chroot:controller-v1.5.2@sha256:84613555694f2c59a8b2551126d226c9aa648544ebf0cde1e0df942f7dbce42b
+ * registry.k8s.io/controller:controller-v1.6.3@sha256:b92667e0afde1103b736e6a3f00dd75ae66eec4e71827d19f19f471699e909d2
+ * registry.k8s.io/controller-chroot:controller-v1.6.3@sha256:4b4a249c9a35ac16a8ec0e22f6c522b8707f7e59e656e64a4ad9ace8fea830a4
 
 ### All Changes:
 
+* Revert Implement pathType validation (#9511) (#9607)
+* update history and allow to pass a target test  (#9605)
+* Allow to pass a target test (#9542)
+* Replace deprecated command with environment file (#9581)
+* build 1.6.2 to fix (#9569)
+* add lint on chart before release (#9570)
+* tcpproxy: increase buffer size to 16K (#9548)
+* Move and spell-check Kubernetes 1.22 migration FAQ (#9544)
+* Add CORS template check inside location for externalAuth.SignURL (#8814)
+* fix(grafana-dashboard): remove hardcoded namespace references (#9523)
+* Replace deprecated command with environment file (#9581)
+* add path validation to implementation specific as well (#9573)
+* add lint on chart before release (#9570)
+* Switch logic on path type validation and setting it to false (#9543)
+* tcpproxy: increase buffer size to 16K (#9548)
+* Move and spell-check Kubernetes 1.22 migration FAQ (#9544)
+* Add CORS template check inside location for externalAuth.SignURL (#8814)
+* fix(grafana-dashboard): remove hardcoded namespace references (#9523)
+* Align default value for keepalive_request with NGINX default (#9518)
+* Implement pathType validation (#9511)
+* feat(configmap): expose gzip-disable (#9505)
+* Values: Add missing `controller.metrics.service.labels`. (#9501)
+* Add docs about orphan_ingress metric (#9514)
+* Add new prometheus metric for orphaned ingress (#8230)
+* Sanitise request metrics in monitoring docs (#9384)
+* Change default value of enable-brotli (#9500)
+* feat: support topology aware hints (#9165)
+* Remove 1.5.2 from readme (#9498)
+* Remove nonexistent load flag from docker build commands (#9122)
+* added option to disable sync event creation (#8528)
+* Add buildResolvers to the stream module (#9184)
+* fix: disable auth access logs (#9049)
+* Adding ipdenylist annotation (#8795)
+* Add update updateStrategy and minReadySeconds for defaultBackend (#8506)
+* Fix indentation on serviceAccount annotation (#9129)
+* Update monitoring.md (#9269)
+* add github actions stale bot (#9439)
+* Admission Webhooks/Job: Add `NetworkPolicy`. (#9218)
+* update OpenTelemetry image (#9491)
+* bump OpenTelemetry (#9489)
+* Optional podman support (#9294)
+* fix change images (#9463)
+* move tests to gh actions (#9461)
+* Automated Release Controller 1.5.2 (#9455)
+* Add sslpassthrough tests (#9457)
+* updated the link in RELEASE.md file (#9456)
 * restart 1.5.2 release process (#9450)
 * Update command line arguments documentation (#9224)
 * start release 1.5.2 (#9445)
@@ -20,24 +65,6 @@ Images:
 * update the nginx run container for alpine:3.17.0 (#9430)
 * cleanup: remove ioutil for new go version (#9427)
 * start upgrade to golang 1.19.4 and alpine 3.17.0 (#9417)
-=======
- * registry.k8s.io/controller:controller-v1.5.2@sha256:c1c091b88a6c936a83bd7g098v62f60a87868d12452529bad0d178fb36143346
- * registry.k8s.io/controller-chroot:controller-v1.5.2@sha256:c1c091b88a6c936a83bd7b098662760a87868d12452529b350d178fb36147345
-
-### All Changes:
-
-<<<<<<< HEAD
->>>>>>> f4164ae0b (THE CHANGELOG WORKS)
-=======
-* upgrade nginx base image (#9436)
-* test the new e2e test images (#9444)
-* avoid builds and tests for non-code changes (#9392)
-* CI updates (#9440)
-* HPA: Add `controller.autoscaling.annotations` to `values.yaml`. (#9253)
-* update the nginx run container for alpine:3.17.0 (#9430)
-* cleanup: remove ioutil for new go version (#9427)
-* start upgrade to golang 1.19.4 and alpine 3.17.0 (#9417)
->>>>>>> 9ecab7d85 (e2e doc updates work now)
 * ci: remove setup-helm step (#9404)
 * ci: remove setup-kind step (#9401)
 * Add reporter for all tests (#9395)
@@ -73,10 +100,17 @@ Images:
 * add containerSecurityContext to extraModules init containers (kubernetes#9016) (#9242)
 
 ### Dependencies updates: 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 9ecab7d85 (e2e doc updates work now)
+* Bump google.golang.org/grpc from 1.52.0 to 1.52.3 (#9555)
+* Bump k8s.io/klog/v2 from 2.80.1 to 2.90.0 (#9553)
+* Bump sigs.k8s.io/controller-runtime from 0.13.1 to 0.14.2 (#9552)
+* Bump google.golang.org/grpc from 1.51.0 to 1.52.0 (#9512)
+* Bump `client-go` to remove dependence on go-autorest dependency (#9488)
+* Bump google.golang.org/grpc from 1.52.0 to 1.52.3 (#9555)
+* Bump k8s.io/klog/v2 from 2.80.1 to 2.90.0 (#9553)
+* Bump sigs.k8s.io/controller-runtime from 0.13.1 to 0.14.2 (#9552)
+* Bump google.golang.org/grpc from 1.51.0 to 1.52.0 (#9512)
+* Bump `client-go` to remove dependence on go-autorest dependency (#9488)
+* Bump golang.org/x/crypto from 0.4.0 to 0.5.0 (#9494)
 * Bump golang.org/x/crypto from 0.3.0 to 0.4.0 (#9397)
 * Bump github.com/onsi/ginkgo/v2 from 2.6.0 to 2.6.1 (#9432)
 * Bump github.com/onsi/ginkgo/v2 from 2.6.0 to 2.6.1 (#9421)
@@ -85,11 +119,6 @@ Images:
 * Bump goreleaser/goreleaser-action from 3.2.0 to 4.1.0 (#9426)
 * Bump actions/dependency-review-action from 3.0.1 to 3.0.2 (#9424)
 * Bump ossf/scorecard-action from 2.0.6 to 2.1.0 (#9422)
-<<<<<<< HEAD
-=======
->>>>>>> f4164ae0b (THE CHANGELOG WORKS)
-=======
->>>>>>> 9ecab7d85 (e2e doc updates work now)
 * Bump github.com/prometheus/common from 0.37.0 to 0.39.0 (#9416)
 * Bump github.com/onsi/ginkgo/v2 from 2.5.1 to 2.6.0 (#9408)
 * Bump github.com/onsi/ginkgo/v2 from 2.5.1 to 2.6.0 (#9398)
@@ -104,12 +133,4 @@ Images:
 * Bump actions/dependency-review-action from 2.5.1 to 3.0.0 (#9301)
 * Bump k8s.io/component-base from 0.25.3 to 0.25.4 (#9300)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-controller-v1.5.1...controller-controller-v1.5.2
-=======
-**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-controller-v1.5.2...controller-controller-v1.5.1
->>>>>>> f4164ae0b (THE CHANGELOG WORKS)
-=======
-**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-controller-v1.5.1...controller-controller-v1.5.2
->>>>>>> 9ecab7d85 (e2e doc updates work now)
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-controller-v1.5.1...controller-controller-v1.6.3
diff --git a/charts/ingress-nginx/Chart.yaml b/charts/ingress-nginx/Chart.yaml
@@ -1,31 +1,27 @@
+annotations:
+  artifacthub.io/changes: |
+     - "add lint on chart before release (#9570)"
+     - "ci: remove setup-helm step (#9404)"
+     - "feat(helm): Optionally use cert-manager instead admission patch (#9279)"
+     - "run helm release on main only and when the chart/value changes only (#9290)"
+     - "Update Ingress-Nginx version controller-v1.6.3"
+  artifacthub.io/prerelease: "false"
 apiVersion: v2
-name: ingress-nginx
-# When the version is modified, make sure the artifacthub.io/changes list is updated
-# Also update CHANGELOG.md
-version: 4.4.2
-appVersion: 1.5.1
+appVersion: 1.6.3
+description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
+  load balancer
+engine: gotpl
 home: https://github.com/kubernetes/ingress-nginx
-description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
 icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
 keywords:
-  - ingress
-  - nginx
-sources:
-  - https://github.com/kubernetes/ingress-nginx
+- ingress
+- nginx
+kubeVersion: '>=1.20.0-0'
 maintainers:
-  - name: rikatz
-  - name: strongjz
-  - name: tao12345666333
-engine: gotpl
-kubeVersion: ">=1.20.0-0"
-annotations:
-  # Use this annotation to indicate that this chart version is a pre-release.
-  # https://artifacthub.io/docs/topics/annotations/helm/
-  artifacthub.io/prerelease: "false"
-  # List of changes for the release in artifacthub.io
-  # https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog
-  artifacthub.io/changes: |
-    - Adding support for disabling liveness and readiness probes to the Helm chart
-    - add:(admission-webhooks) ability to set securityContext
-    - Updated Helm chart to use the fullname for the electionID if not specified
-    - Rename controller-wehbooks-networkpolicy.yaml
+- name: rikatz
+- name: strongjz
+- name: tao12345666333
+name: ingress-nginx
+sources:
+- https://github.com/kubernetes/ingress-nginx
+version: 4.5.0
diff --git a/charts/ingress-nginx/README.md b/charts/ingress-nginx/README.md
@@ -2,7 +2,7 @@
 
 [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
 
-![Version: 4.4.2](https://img.shields.io/badge/Version-4.4.2-informational?style=flat-square) ![AppVersion: 1.5.1](https://img.shields.io/badge/AppVersion-1.5.1-informational?style=flat-square)
+![Version: 4.5.0](https://img.shields.io/badge/Version-4.5.0-informational?style=flat-square) ![AppVersion: 1.6.3](https://img.shields.io/badge/AppVersion-1.6.3-informational?style=flat-square)
 
 To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
 
@@ -253,7 +253,6 @@ Kubernetes: `>=1.20.0-0`
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | commonLabels | object | `{}` |  |
-| controller.EnablePathTypeValidation | bool | `false` | This configuration defines if Ingress Controller should validate pathType. If false, special characters will be allowed on paths of any pathType. If true, special characters are only allowed on paths with pathType = ImplementationSpecific |
 | controller.addHeaders | object | `{}` | Will add custom headers before sending response traffic to the client according to: https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#add-headers |
 | controller.admissionWebhooks.annotations | object | `{}` |  |
 | controller.admissionWebhooks.certManager.admissionCert.duration | string | `""` |  |
@@ -334,13 +333,13 @@ Kubernetes: `>=1.20.0-0`
 | controller.hostname | object | `{}` | Optionally customize the pod hostname. |
 | controller.image.allowPrivilegeEscalation | bool | `true` |  |
 | controller.image.chroot | bool | `false` |  |
-| controller.image.digest | string | `"sha256:4ba73c697770664c1e00e9f968de14e08f606ff961c76e5d7033a4a9c593c629"` |  |
-| controller.image.digestChroot | string | `"sha256:c1c091b88a6c936a83bd7b098662760a87868d12452529bad0d178fb36147345"` |  |
+| controller.image.digest | string | `"sha256:b92667e0afde1103b736e6a3f00dd75ae66eec4e71827d19f19f471699e909d2"` |  |
+| controller.image.digestChroot | string | `"sha256:4b4a249c9a35ac16a8ec0e22f6c522b8707f7e59e656e64a4ad9ace8fea830a4"` |  |
 | controller.image.image | string | `"ingress-nginx/controller"` |  |
 | controller.image.pullPolicy | string | `"IfNotPresent"` |  |
 | controller.image.registry | string | `"registry.k8s.io"` |  |
 | controller.image.runAsUser | int | `101` |  |
-| controller.image.tag | string | `"v1.5.1"` |  |
+| controller.image.tag | string | `"v1.6.3"` |  |
 | controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
 | controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
 | controller.ingressClassResource.controllerValue | string | `"k8s.io/ingress-nginx"` | Controller-value of the controller that is processing this ingressClass |

diff --git a/...ngress-nginx/changelog/Changelog-1.5.2.md → ...ngress-nginx/changelog/Changelog-4.5.0.md b/...ngress-nginx/changelog/Changelog-1.5.2.md → ...ngress-nginx/changelog/Changelog-4.5.0.md
@@ -2,11 +2,12 @@
 
 This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
 
-### 4.4.1
+### 4.5.0
 
+* add lint on chart before release (#9570)
 * ci: remove setup-helm step (#9404)
 * feat(helm): Optionally use cert-manager instead admission patch (#9279)
 * run helm release on main only and when the chart/value changes only (#9290)
-* Update Ingress-Nginx version controller-v1.5.2
+* Update Ingress-Nginx version controller-v1.6.3
 
-**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.4.1...helm-chart-4.4.1
+**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.4.3...helm-chart-4.5.0
diff --git a/charts/ingress-nginx/templates/controller-configmap.yaml b/charts/ingress-nginx/templates/controller-configmap.yaml
@@ -14,7 +14,6 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   allow-snippet-annotations: "{{ .Values.controller.allowSnippetAnnotations }}"
-  enable-pathtype-validation: "{{ .Values.controller.EnablePathTypeValidation }}"
 {{- if .Values.controller.addHeaders }}
   add-headers: {{ .Release.Namespace }}/{{ include "ingress-nginx.fullname" . }}-custom-add-headers
 {{- end }}