Skip to content

Commit 27598b5

Browse files
aledbfaledbf
committed
Update chart requirements
1 parent 4dd206b commit 27598b5

File tree

11 files changed

+190
-184
lines changed

11 files changed

+190
-184
lines changed

‎charts/ingress-nginx/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v1
22
name: ingress-nginx
3-
version: 2.16.0
3+
version: 3.0.0
44
appVersion: 0.35.0
55
home: https://github.com/kubernetes/ingress-nginx
66
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
@@ -13,4 +13,4 @@ sources:
1313
maintainers:
1414
- name: ChiefAlexander
1515
engine: gotpl
16-
kubeVersion: ">=1.10.0-0"
16+
kubeVersion: ">=1.16.0-0"

‎charts/ingress-nginx/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This chart bootstraps an ingress-nginx deployment on a [Kubernetes](http://kuber
88

99
## Prerequisites
1010

11-
- Kubernetes 1.6+
11+
- Kubernetes v1.16+
1212

1313
## Get Repo Info
1414

‎charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{- if .Values.controller.admissionWebhooks.enabled -}}
22
# before changing this value, check the required kubernetes version
33
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
4-
apiVersion: admissionregistration.k8s.io/v1beta1
4+
apiVersion: admissionregistration.k8s.io/v1
55
kind: ValidatingWebhookConfiguration
66
metadata:
77
labels:
@@ -12,10 +12,10 @@ webhooks:
1212
- name: validate.nginx.ingress.kubernetes.io
1313
rules:
1414
- apiGroups:
15-
- extensions
1615
- networking.k8s.io
1716
apiVersions:
1817
- v1beta1
18+
- v1
1919
operations:
2020
- CREATE
2121
- UPDATE
@@ -25,10 +25,9 @@ webhooks:
2525
sideEffects: None
2626
admissionReviewVersions:
2727
- v1
28-
- v1beta1
2928
clientConfig:
3029
service:
3130
namespace: {{ .Release.Namespace }}
3231
name: {{ include "ingress-nginx.controller.fullname" . }}-admission
33-
path: /extensions/v1beta1/ingresses
32+
path: /networking/v1beta1/ingresses
3433
{{- end }}

‎charts/ingress-nginx/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ controller:
293293
## Enable mimalloc as a drop-in replacement for malloc.
294294
## ref: https://github.com/microsoft/mimalloc
295295
##
296-
enableMimalloc: false
296+
enableMimalloc: true
297297

298298
## Override NGINX template
299299
customTemplate:
@@ -423,7 +423,7 @@ controller:
423423
enabled: true
424424
image:
425425
repository: docker.io/jettech/kube-webhook-certgen
426-
tag: v1.2.2
426+
tag: v1.3.0
427427
pullPolicy: IfNotPresent
428428
## Provide a priority class name to the webhook patching job
429429
##

‎deploy/static/provider/aws/deploy-tls-termination.yaml

+26-25
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ apiVersion: v1
1313
kind: ServiceAccount
1414
metadata:
1515
labels:
16-
helm.sh/chart: ingress-nginx-2.13.0
16+
helm.sh/chart: ingress-nginx-3.0.0
1717
app.kubernetes.io/name: ingress-nginx
1818
app.kubernetes.io/instance: ingress-nginx
1919
app.kubernetes.io/version: 0.35.0
@@ -27,7 +27,7 @@ apiVersion: v1
2727
kind: ConfigMap
2828
metadata:
2929
labels:
30-
helm.sh/chart: ingress-nginx-2.13.0
30+
helm.sh/chart: ingress-nginx-3.0.0
3131
app.kubernetes.io/name: ingress-nginx
3232
app.kubernetes.io/instance: ingress-nginx
3333
app.kubernetes.io/version: 0.35.0
@@ -49,7 +49,7 @@ apiVersion: rbac.authorization.k8s.io/v1
4949
kind: ClusterRole
5050
metadata:
5151
labels:
52-
helm.sh/chart: ingress-nginx-2.13.0
52+
helm.sh/chart: ingress-nginx-3.0.0
5353
app.kubernetes.io/name: ingress-nginx
5454
app.kubernetes.io/instance: ingress-nginx
5555
app.kubernetes.io/version: 0.35.0
@@ -119,7 +119,7 @@ apiVersion: rbac.authorization.k8s.io/v1
119119
kind: ClusterRoleBinding
120120
metadata:
121121
labels:
122-
helm.sh/chart: ingress-nginx-2.13.0
122+
helm.sh/chart: ingress-nginx-3.0.0
123123
app.kubernetes.io/name: ingress-nginx
124124
app.kubernetes.io/instance: ingress-nginx
125125
app.kubernetes.io/version: 0.35.0
@@ -139,7 +139,7 @@ apiVersion: rbac.authorization.k8s.io/v1
139139
kind: Role
140140
metadata:
141141
labels:
142-
helm.sh/chart: ingress-nginx-2.13.0
142+
helm.sh/chart: ingress-nginx-3.0.0
143143
app.kubernetes.io/name: ingress-nginx
144144
app.kubernetes.io/instance: ingress-nginx
145145
app.kubernetes.io/version: 0.35.0
@@ -234,7 +234,7 @@ apiVersion: rbac.authorization.k8s.io/v1
234234
kind: RoleBinding
235235
metadata:
236236
labels:
237-
helm.sh/chart: ingress-nginx-2.13.0
237+
helm.sh/chart: ingress-nginx-3.0.0
238238
app.kubernetes.io/name: ingress-nginx
239239
app.kubernetes.io/instance: ingress-nginx
240240
app.kubernetes.io/version: 0.35.0
@@ -256,7 +256,7 @@ apiVersion: v1
256256
kind: Service
257257
metadata:
258258
labels:
259-
helm.sh/chart: ingress-nginx-2.13.0
259+
helm.sh/chart: ingress-nginx-3.0.0
260260
app.kubernetes.io/name: ingress-nginx
261261
app.kubernetes.io/instance: ingress-nginx
262262
app.kubernetes.io/version: 0.35.0
@@ -287,7 +287,7 @@ metadata:
287287
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https
288288
service.beta.kubernetes.io/aws-load-balancer-type: elb
289289
labels:
290-
helm.sh/chart: ingress-nginx-2.13.0
290+
helm.sh/chart: ingress-nginx-3.0.0
291291
app.kubernetes.io/name: ingress-nginx
292292
app.kubernetes.io/instance: ingress-nginx
293293
app.kubernetes.io/version: 0.35.0
@@ -317,7 +317,7 @@ apiVersion: apps/v1
317317
kind: Deployment
318318
metadata:
319319
labels:
320-
helm.sh/chart: ingress-nginx-2.13.0
320+
helm.sh/chart: ingress-nginx-3.0.0
321321
app.kubernetes.io/name: ingress-nginx
322322
app.kubernetes.io/instance: ingress-nginx
323323
app.kubernetes.io/version: 0.35.0
@@ -376,6 +376,8 @@ spec:
376376
valueFrom:
377377
fieldRef:
378378
fieldPath: metadata.namespace
379+
- name: LD_PRELOAD
380+
value: /usr/local/lib/libmimalloc.so
379381
livenessProbe:
380382
httpGet:
381383
path: /healthz
@@ -427,11 +429,11 @@ spec:
427429
# Source: ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
428430
# before changing this value, check the required kubernetes version
429431
# https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#prerequisites
430-
apiVersion: admissionregistration.k8s.io/v1beta1
432+
apiVersion: admissionregistration.k8s.io/v1
431433
kind: ValidatingWebhookConfiguration
432434
metadata:
433435
labels:
434-
helm.sh/chart: ingress-nginx-2.13.0
436+
helm.sh/chart: ingress-nginx-3.0.0
435437
app.kubernetes.io/name: ingress-nginx
436438
app.kubernetes.io/instance: ingress-nginx
437439
app.kubernetes.io/version: 0.35.0
@@ -442,10 +444,10 @@ webhooks:
442444
- name: validate.nginx.ingress.kubernetes.io
443445
rules:
444446
- apiGroups:
445-
- extensions
446447
- networking.k8s.io
447448
apiVersions:
448449
- v1beta1
450+
- v1
449451
operations:
450452
- CREATE
451453
- UPDATE
@@ -455,12 +457,11 @@ webhooks:
455457
sideEffects: None
456458
admissionReviewVersions:
457459
- v1
458-
- v1beta1
459460
clientConfig:
460461
service:
461462
namespace: ingress-nginx
462463
name: ingress-nginx-controller-admission
463-
path: /extensions/v1beta1/ingresses
464+
path: /networking/v1beta1/ingresses
464465
---
465466
# Source: ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
466467
apiVersion: v1
@@ -471,7 +472,7 @@ metadata:
471472
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
472473
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
473474
labels:
474-
helm.sh/chart: ingress-nginx-2.13.0
475+
helm.sh/chart: ingress-nginx-3.0.0
475476
app.kubernetes.io/name: ingress-nginx
476477
app.kubernetes.io/instance: ingress-nginx
477478
app.kubernetes.io/version: 0.35.0
@@ -488,7 +489,7 @@ metadata:
488489
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
489490
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
490491
labels:
491-
helm.sh/chart: ingress-nginx-2.13.0
492+
helm.sh/chart: ingress-nginx-3.0.0
492493
app.kubernetes.io/name: ingress-nginx
493494
app.kubernetes.io/instance: ingress-nginx
494495
app.kubernetes.io/version: 0.35.0
@@ -512,7 +513,7 @@ metadata:
512513
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
513514
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
514515
labels:
515-
helm.sh/chart: ingress-nginx-2.13.0
516+
helm.sh/chart: ingress-nginx-3.0.0
516517
app.kubernetes.io/name: ingress-nginx
517518
app.kubernetes.io/instance: ingress-nginx
518519
app.kubernetes.io/version: 0.35.0
@@ -536,7 +537,7 @@ metadata:
536537
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
537538
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
538539
labels:
539-
helm.sh/chart: ingress-nginx-2.13.0
540+
helm.sh/chart: ingress-nginx-3.0.0
540541
app.kubernetes.io/name: ingress-nginx
541542
app.kubernetes.io/instance: ingress-nginx
542543
app.kubernetes.io/version: 0.35.0
@@ -561,7 +562,7 @@ metadata:
561562
helm.sh/hook: pre-install,pre-upgrade,post-install,post-upgrade
562563
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
563564
labels:
564-
helm.sh/chart: ingress-nginx-2.13.0
565+
helm.sh/chart: ingress-nginx-3.0.0
565566
app.kubernetes.io/name: ingress-nginx
566567
app.kubernetes.io/instance: ingress-nginx
567568
app.kubernetes.io/version: 0.35.0
@@ -586,7 +587,7 @@ metadata:
586587
helm.sh/hook: pre-install,pre-upgrade
587588
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
588589
labels:
589-
helm.sh/chart: ingress-nginx-2.13.0
590+
helm.sh/chart: ingress-nginx-3.0.0
590591
app.kubernetes.io/name: ingress-nginx
591592
app.kubernetes.io/instance: ingress-nginx
592593
app.kubernetes.io/version: 0.35.0
@@ -598,7 +599,7 @@ spec:
598599
metadata:
599600
name: ingress-nginx-admission-create
600601
labels:
601-
helm.sh/chart: ingress-nginx-2.13.0
602+
helm.sh/chart: ingress-nginx-3.0.0
602603
app.kubernetes.io/name: ingress-nginx
603604
app.kubernetes.io/instance: ingress-nginx
604605
app.kubernetes.io/version: 0.35.0
@@ -607,7 +608,7 @@ spec:
607608
spec:
608609
containers:
609610
- name: create
610-
image: docker.io/jettech/kube-webhook-certgen:v1.2.2
611+
image: docker.io/jettech/kube-webhook-certgen:v1.3.0
611612
imagePullPolicy: IfNotPresent
612613
args:
613614
- create
@@ -634,7 +635,7 @@ metadata:
634635
helm.sh/hook: post-install,post-upgrade
635636
helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
636637
labels:
637-
helm.sh/chart: ingress-nginx-2.13.0
638+
helm.sh/chart: ingress-nginx-3.0.0
638639
app.kubernetes.io/name: ingress-nginx
639640
app.kubernetes.io/instance: ingress-nginx
640641
app.kubernetes.io/version: 0.35.0
@@ -646,7 +647,7 @@ spec:
646647
metadata:
647648
name: ingress-nginx-admission-patch
648649
labels:
649-
helm.sh/chart: ingress-nginx-2.13.0
650+
helm.sh/chart: ingress-nginx-3.0.0
650651
app.kubernetes.io/name: ingress-nginx
651652
app.kubernetes.io/instance: ingress-nginx
652653
app.kubernetes.io/version: 0.35.0
@@ -655,7 +656,7 @@ spec:
655656
spec:
656657
containers:
657658
- name: patch
658-
image: docker.io/jettech/kube-webhook-certgen:v1.2.2
659+
image: docker.io/jettech/kube-webhook-certgen:v1.3.0
659660
imagePullPolicy: IfNotPresent
660661
args:
661662
- patch

0 commit comments

Comments
 (0)