Skip to content

Commit 2ea0109

Browse files
authored
Merge pull request #9469 from strongjz/rollback-1.5.2
Rollback 1.5.2
2 parents 8b5a25f + a6badc4 commit 2ea0109

File tree

15 files changed

+1371
-1721
lines changed

15 files changed

+1371
-1721
lines changed

TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.5.2
1+
v1.5.1

charts/ingress-nginx/Chart.yaml

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
1-
annotations:
2-
artifacthub.io/changes: |
3-
- "ci: remove setup-helm step (#9404)"
4-
- "feat(helm): Optionally use cert-manager instead admission patch (#9279)"
5-
- "run helm release on main only and when the chart/value changes only (#9290)"
6-
- "Update Ingress-Nginx version controller-v1.5.2"
7-
artifacthub.io/prerelease: "false"
81
apiVersion: v2
9-
appVersion: 1.5.2
10-
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
11-
load balancer
12-
engine: gotpl
2+
name: ingress-nginx
3+
# When the version is modified, make sure the artifacthub.io/changes list is updated
4+
# Also update CHANGELOG.md
5+
version: 4.4.2
6+
appVersion: 1.5.1
137
home: https://github.com/kubernetes/ingress-nginx
8+
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
149
icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
1510
keywords:
16-
- ingress
17-
- nginx
18-
kubeVersion: '>=1.20.0-0'
19-
maintainers:
20-
- name: rikatz
21-
- name: strongjz
22-
- name: tao12345666333
23-
name: ingress-nginx
11+
- ingress
12+
- nginx
2413
sources:
25-
- https://github.com/kubernetes/ingress-nginx
26-
version: 4.4.1
14+
- https://github.com/kubernetes/ingress-nginx
15+
maintainers:
16+
- name: rikatz
17+
- name: strongjz
18+
- name: tao12345666333
19+
engine: gotpl
20+
kubeVersion: ">=1.20.0-0"
21+
annotations:
22+
# Use this annotation to indicate that this chart version is a pre-release.
23+
# https://artifacthub.io/docs/topics/annotations/helm/
24+
artifacthub.io/prerelease: "false"
25+
# List of changes for the release in artifacthub.io
26+
# https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog
27+
artifacthub.io/changes: |
28+
- Adding support for disabling liveness and readiness probes to the Helm chart
29+
- add:(admission-webhooks) ability to set securityContext
30+
- Updated Helm chart to use the fullname for the electionID if not specified
31+
- Rename controller-wehbooks-networkpolicy.yaml

charts/ingress-nginx/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
44

5-
![Version: 4.4.1](https://img.shields.io/badge/Version-4.4.1-informational?style=flat-square) ![AppVersion: 1.5.2](https://img.shields.io/badge/AppVersion-1.5.2-informational?style=flat-square)
5+
![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)
66

77
To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
88

@@ -332,13 +332,13 @@ Kubernetes: `>=1.20.0-0`
332332
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
333333
| controller.image.allowPrivilegeEscalation | bool | `true` | |
334334
| controller.image.chroot | bool | `false` | |
335-
| controller.image.digest | string | `"sha256:3870522ed937c9efb94bfa31a7eb16009831567a0d4cbe01846fc5486d622655"` | |
336-
| controller.image.digestChroot | string | `"sha256:84613555694f2c59a8b2551126d226c9aa648544ebf0cde1e0df942f7dbce42b"` | |
335+
| controller.image.digest | string | `"sha256:4ba73c697770664c1e00e9f968de14e08f606ff961c76e5d7033a4a9c593c629"` | |
336+
| controller.image.digestChroot | string | `"sha256:c1c091b88a6c936a83bd7b098662760a87868d12452529bad0d178fb36147345"` | |
337337
| controller.image.image | string | `"ingress-nginx/controller"` | |
338338
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
339339
| controller.image.registry | string | `"registry.k8s.io"` | |
340340
| controller.image.runAsUser | int | `101` | |
341-
| controller.image.tag | string | `"v1.5.2"` | |
341+
| controller.image.tag | string | `"v1.5.1"` | |
342342
| 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 |
343343
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
344344
| controller.ingressClassResource.controllerValue | string | `"k8s.io/ingress-nginx"` | Controller-value of the controller that is processing this ingressClass |

charts/ingress-nginx/changelog/Changelog-1.5.2.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)