Skip to content

Commit

Permalink
Bump ingress nginx helm chart to 4.3.0
Browse files Browse the repository at this point in the history
Signed-off-by: Derek Nola <[email protected]>
  • Loading branch information
dereknola committed Feb 16, 2023
1 parent c9d912e commit e4f7254
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 36 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
--- charts-original/Chart.yaml
+++ charts/Chart.yaml
@@ -28,7 +28,7 @@
@@ -19,7 +19,7 @@
- name: rikatz
- name: strongjz
- name: tao12345666333
-name: ingress-nginx
+name: rke2-ingress-nginx
sources:
- https://github.com/kubernetes/ingress-nginx
type: application
version: 4.3.0
Original file line number Diff line number Diff line change
@@ -1,26 +1,12 @@
--- charts-original/templates/clusterrole.yaml
+++ charts/templates/clusterrole.yaml
@@ -82,6 +82,23 @@
- get
- list
- watch
+ - apiGroups:
+ - coordination.k8s.io
+ resources:
+ - leases
+ verbs:
@@ -34,6 +34,9 @@
resources:
- leases
verbs:
+ - create
+ - update
+ - get
+ - list
+ - watch
+ - apiGroups:
+ - discovery.k8s.io
+ resources:
+ - endpointslices
+ verbs:
+ - list
+ - watch
{{- end }}

{{- end }}
- list
- watch
{{- if and .Values.controller.scope.enabled .Values.controller.scope.namespace }}
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
image:
## Keep false as default for now!
chroot: false
- registry: k8s.gcr.io
- registry: registry.k8s.io
- image: ingress-nginx/controller
+ repository: rancher/nginx-ingress-controller
## for backwards compatibility consider setting the full image url via the repository value below
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
## repository:
- tag: "v1.2.0"
- digest: sha256:d8196e3bc1e72547c5dec66d6556c0ff92a23f6d0919b206be170bc90d5f9185
- digestChroot: sha256:fb17f1700b77d4fcc52ca6f83ffc2821861ae887dbb87149cf5cbc52bea425e5
- tag: "v1.4.0"
- digest: sha256:34ee929b111ffc7aa426ffd409af44da48e5a0eea1eb2207994d9e0c0882d143
- digestChroot: sha256:b67e889f1db8692de7e41d4d9aef8de56645bf048261f31fa7f8bfc6ea2222a0
+ tag: "nginx-1.4.1-hardened2"
pullPolicy: IfNotPresent
# www-data -> uid 101
Expand Down Expand Up @@ -89,26 +89,27 @@

# -- If enabled is adding an appProtocol option for Kubernetes service. An appProtocol field replacing annotations that were
# using for setting a backend protocol. Here is an example for AWS: service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
@@ -630,13 +627,11 @@
@@ -641,13 +638,11 @@
patch:
enabled: true
image:
- registry: k8s.gcr.io
- registry: registry.k8s.io
- image: ingress-nginx/kube-webhook-certgen
+ repository: rancher/mirrored-ingress-nginx-kube-webhook-certgen
## for backwards compatibility consider setting the full image url via the repository value below
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
## repository:
tag: v1.1.1
- digest: sha256:64d8c73dca984af206adf9d6d7e46aa550362b1d7a01f3a0a91b20cc67868660
- tag: v20220916-gd32f8c343
- digest: sha256:39c5b2e3310dc4264d638ad28d9d1d96c4cbb2b2dcfb52368fe4e3c63f61e10f
+ tag: v1.5.2
pullPolicy: IfNotPresent
# -- Provide a priority class name to the webhook patching job
##
@@ -757,12 +752,11 @@
@@ -772,12 +767,11 @@

name: defaultbackend
image:
- registry: k8s.gcr.io
- registry: registry.k8s.io
- image: defaultbackend-amd64
+ repository: rancher/nginx-ingress-controller-defaultbackend
## for backwards compatibility consider setting the full image url via the repository value below
Expand All @@ -119,7 +120,7 @@
pullPolicy: IfNotPresent
# nobody user -> uid 65534
runAsUser: 65534
@@ -924,3 +918,6 @@
@@ -943,3 +937,6 @@
# This can be generated with: `openssl dhparam 4096 2> /dev/null | base64`
## Ref: https://github.com/kubernetes/ingress-nginx/tree/main/docs/examples/customization/ssl-dh-param
dhParam:
Expand Down
4 changes: 2 additions & 2 deletions packages/rke2-ingress-nginx/package.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
url: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-4.1.0/ingress-nginx-4.1.0.tgz
packageVersion: 08
url: https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-4.3.0/ingress-nginx-4.3.0.tgz
packageVersion: 00
# This repository does not use releaseCandidateVersions, so you can leave this as 00.
releaseCandidateVersion: 00

0 comments on commit e4f7254

Please sign in to comment.