Skip to content

Commit 01443c0

Browse files
committed
Revert "Merge pull request #11277 from strongjz/chart-1.10.1"
This reverts commit 5ed8402, reversing changes made to 427d275.
1 parent ae0715e commit 01443c0

File tree

4 files changed

+15
-28
lines changed

4 files changed

+15
-28
lines changed

charts/ingress-nginx/Chart.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
annotations:
22
artifacthub.io/changes: |-
3-
- "update post submit helm ci and clean up (#11221)"
4-
- "refactor helm ci tests part I (#11188)"
5-
- "Update Ingress-Nginx version controller-v1.10.1"
3+
- "Update Ingress-Nginx version controller-v1.10.0"
64
artifacthub.io/prerelease: "false"
75
apiVersion: v2
8-
appVersion: 1.10.1
6+
appVersion: 1.10.0
97
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
108
load balancer
119
home: https://github.com/kubernetes/ingress-nginx
@@ -15,11 +13,11 @@ keywords:
1513
- nginx
1614
kubeVersion: '>=1.21.0-0'
1715
maintainers:
18-
- name: Gacko
19-
- name: rikatz
20-
- name: strongjz
21-
- name: tao12345666333
16+
- name: Gacko
17+
- name: rikatz
18+
- name: strongjz
19+
- name: tao12345666333
2220
name: ingress-nginx
2321
sources:
24-
- https://github.com/kubernetes/ingress-nginx
25-
version: 4.10.1
22+
- https://github.com/kubernetes/ingress-nginx
23+
version: 4.10.0

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.10.1](https://img.shields.io/badge/Version-4.10.1-informational?style=flat-square) ![AppVersion: 1.10.1](https://img.shields.io/badge/AppVersion-1.10.1-informational?style=flat-square)
5+
![Version: 4.10.0](https://img.shields.io/badge/Version-4.10.0-informational?style=flat-square) ![AppVersion: 1.10.0](https://img.shields.io/badge/AppVersion-1.10.0-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

@@ -317,16 +317,16 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
317317
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
318318
| controller.image.allowPrivilegeEscalation | bool | `false` | |
319319
| controller.image.chroot | bool | `false` | |
320-
| controller.image.digest | string | `"sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e"` | |
321-
| controller.image.digestChroot | string | `"sha256:c155954116b397163c88afcb3252462771bd7867017e8a17623e83601bab7ac7"` | |
320+
| controller.image.digest | string | `"sha256:42b3f0e5d0846876b1791cd3afeb5f1cbbe4259d6f35651dcc1b5c980925379c"` | |
321+
| controller.image.digestChroot | string | `"sha256:7eb46ff733429e0e46892903c7394aff149ac6d284d92b3946f3baf7ff26a096"` | |
322322
| controller.image.image | string | `"ingress-nginx/controller"` | |
323323
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
324324
| controller.image.readOnlyRootFilesystem | bool | `false` | |
325325
| controller.image.registry | string | `"registry.k8s.io"` | |
326326
| controller.image.runAsNonRoot | bool | `true` | |
327327
| controller.image.runAsUser | int | `101` | |
328328
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
329-
| controller.image.tag | string | `"v1.10.1"` | |
329+
| controller.image.tag | string | `"v1.10.0"` | |
330330
| 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 |
331331
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
332332
| controller.ingressClassResource | object | `{"controllerValue":"k8s.io/ingress-nginx","default":false,"enabled":true,"name":"nginx","parameters":{}}` | This section refers to the creation of the IngressClass resource. IngressClasses are immutable and cannot be changed after creation. We do not support namespaced IngressClasses, yet, so a ClusterRole and a ClusterRoleBinding is required. |

charts/ingress-nginx/changelog/helm-chart-4.10.1.md

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

charts/ingress-nginx/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ controller:
2626
## for backwards compatibility consider setting the full image url via the repository value below
2727
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
2828
## repository:
29-
tag: "v1.10.1"
30-
digest: sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
31-
digestChroot: sha256:c155954116b397163c88afcb3252462771bd7867017e8a17623e83601bab7ac7
29+
tag: "v1.10.0"
30+
digest: sha256:42b3f0e5d0846876b1791cd3afeb5f1cbbe4259d6f35651dcc1b5c980925379c
31+
digestChroot: sha256:7eb46ff733429e0e46892903c7394aff149ac6d284d92b3946f3baf7ff26a096
3232
pullPolicy: IfNotPresent
3333
runAsNonRoot: true
3434
# www-data -> uid 101

0 commit comments

Comments
 (0)