Skip to content

Commit 67b4b08

Browse files
feat: upgrade ingress-nginx (#537)
Signed-off-by: Caleb Boylan <[email protected]> Co-authored-by: Pankaj Walke <[email protected]>
1 parent 222861d commit 67b4b08

File tree

3 files changed

+51
-24
lines changed

3 files changed

+51
-24
lines changed

hack/ingress-nginx/cm-ingress-nginx-controller.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ metadata:
66
data:
77
allow-snippet-annotations: "true"
88
proxy-buffer-size: "32k"
9+
proxy-busy-buffers-size: "32k"
910
use-forwarded-headers: "true"

hack/ingress-nginx/kustomization.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.11.2/deploy/static/provider/kind/deploy.yaml
4+
- https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.13.0/deploy/static/provider/kind/deploy.yaml
55

66
patches:
77
- path: deployment-ingress-nginx.yaml
@@ -17,3 +17,22 @@ patches:
1717
kind: Kustomization
1818
metadata:
1919
name: ingress-nginx-controller
20+
# ArgoCD has poor support for ttlSecondsAfterFinished and it shouldn't be essential to clean these up
21+
- target:
22+
group: batch
23+
version: v1
24+
kind: Job
25+
name: ingress-nginx-admission-create
26+
namespace: ingress-nginx
27+
patch: |
28+
- op: remove
29+
path: /spec/ttlSecondsAfterFinished
30+
- target:
31+
group: batch
32+
version: v1
33+
kind: Job
34+
name: ingress-nginx-admission-patch
35+
namespace: ingress-nginx
36+
patch: |
37+
- op: remove
38+
path: /spec/ttlSecondsAfterFinished

pkg/controllers/localbuild/resources/nginx/k8s/ingress-nginx.yaml

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ metadata:
1717
app.kubernetes.io/instance: ingress-nginx
1818
app.kubernetes.io/name: ingress-nginx
1919
app.kubernetes.io/part-of: ingress-nginx
20-
app.kubernetes.io/version: 1.11.2
20+
app.kubernetes.io/version: 1.13.0
2121
name: ingress-nginx
2222
namespace: ingress-nginx
2323
---
@@ -30,7 +30,7 @@ metadata:
3030
app.kubernetes.io/instance: ingress-nginx
3131
app.kubernetes.io/name: ingress-nginx
3232
app.kubernetes.io/part-of: ingress-nginx
33-
app.kubernetes.io/version: 1.11.2
33+
app.kubernetes.io/version: 1.13.0
3434
name: ingress-nginx-admission
3535
namespace: ingress-nginx
3636
---
@@ -42,7 +42,7 @@ metadata:
4242
app.kubernetes.io/instance: ingress-nginx
4343
app.kubernetes.io/name: ingress-nginx
4444
app.kubernetes.io/part-of: ingress-nginx
45-
app.kubernetes.io/version: 1.11.2
45+
app.kubernetes.io/version: 1.13.0
4646
name: ingress-nginx
4747
namespace: ingress-nginx
4848
rules:
@@ -132,7 +132,7 @@ metadata:
132132
app.kubernetes.io/instance: ingress-nginx
133133
app.kubernetes.io/name: ingress-nginx
134134
app.kubernetes.io/part-of: ingress-nginx
135-
app.kubernetes.io/version: 1.11.2
135+
app.kubernetes.io/version: 1.13.0
136136
name: ingress-nginx-admission
137137
namespace: ingress-nginx
138138
rules:
@@ -151,7 +151,7 @@ metadata:
151151
app.kubernetes.io/instance: ingress-nginx
152152
app.kubernetes.io/name: ingress-nginx
153153
app.kubernetes.io/part-of: ingress-nginx
154-
app.kubernetes.io/version: 1.11.2
154+
app.kubernetes.io/version: 1.13.0
155155
name: ingress-nginx
156156
rules:
157157
- apiGroups:
@@ -233,7 +233,7 @@ metadata:
233233
app.kubernetes.io/instance: ingress-nginx
234234
app.kubernetes.io/name: ingress-nginx
235235
app.kubernetes.io/part-of: ingress-nginx
236-
app.kubernetes.io/version: 1.11.2
236+
app.kubernetes.io/version: 1.13.0
237237
name: ingress-nginx-admission
238238
rules:
239239
- apiGroups:
@@ -252,7 +252,7 @@ metadata:
252252
app.kubernetes.io/instance: ingress-nginx
253253
app.kubernetes.io/name: ingress-nginx
254254
app.kubernetes.io/part-of: ingress-nginx
255-
app.kubernetes.io/version: 1.11.2
255+
app.kubernetes.io/version: 1.13.0
256256
name: ingress-nginx
257257
namespace: ingress-nginx
258258
roleRef:
@@ -272,7 +272,7 @@ metadata:
272272
app.kubernetes.io/instance: ingress-nginx
273273
app.kubernetes.io/name: ingress-nginx
274274
app.kubernetes.io/part-of: ingress-nginx
275-
app.kubernetes.io/version: 1.11.2
275+
app.kubernetes.io/version: 1.13.0
276276
name: ingress-nginx-admission
277277
namespace: ingress-nginx
278278
roleRef:
@@ -291,7 +291,7 @@ metadata:
291291
app.kubernetes.io/instance: ingress-nginx
292292
app.kubernetes.io/name: ingress-nginx
293293
app.kubernetes.io/part-of: ingress-nginx
294-
app.kubernetes.io/version: 1.11.2
294+
app.kubernetes.io/version: 1.13.0
295295
name: ingress-nginx
296296
roleRef:
297297
apiGroup: rbac.authorization.k8s.io
@@ -310,7 +310,7 @@ metadata:
310310
app.kubernetes.io/instance: ingress-nginx
311311
app.kubernetes.io/name: ingress-nginx
312312
app.kubernetes.io/part-of: ingress-nginx
313-
app.kubernetes.io/version: 1.11.2
313+
app.kubernetes.io/version: 1.13.0
314314
name: ingress-nginx-admission
315315
roleRef:
316316
apiGroup: rbac.authorization.k8s.io
@@ -325,6 +325,7 @@ apiVersion: v1
325325
data:
326326
allow-snippet-annotations: "true"
327327
proxy-buffer-size: 32k
328+
proxy-busy-buffers-size: 32k
328329
use-forwarded-headers: "true"
329330
kind: ConfigMap
330331
metadata:
@@ -333,7 +334,7 @@ metadata:
333334
app.kubernetes.io/instance: ingress-nginx
334335
app.kubernetes.io/name: ingress-nginx
335336
app.kubernetes.io/part-of: ingress-nginx
336-
app.kubernetes.io/version: 1.11.2
337+
app.kubernetes.io/version: 1.13.0
337338
name: ingress-nginx-controller
338339
namespace: ingress-nginx
339340
---
@@ -345,7 +346,7 @@ metadata:
345346
app.kubernetes.io/instance: ingress-nginx
346347
app.kubernetes.io/name: ingress-nginx
347348
app.kubernetes.io/part-of: ingress-nginx
348-
app.kubernetes.io/version: 1.11.2
349+
app.kubernetes.io/version: 1.13.0
349350
name: ingress-nginx-controller-admission
350351
namespace: ingress-nginx
351352
spec:
@@ -368,7 +369,7 @@ metadata:
368369
app.kubernetes.io/instance: ingress-nginx
369370
app.kubernetes.io/name: ingress-nginx
370371
app.kubernetes.io/part-of: ingress-nginx
371-
app.kubernetes.io/version: 1.11.2
372+
app.kubernetes.io/version: 1.13.0
372373
name: ingress-nginx-controller
373374
namespace: ingress-nginx
374375
spec:
@@ -392,6 +393,7 @@ spec:
392393
app.kubernetes.io/part-of: ingress-nginx
393394
app.kubernetes.io/version: 1.8.1
394395
spec:
396+
automountServiceAccountToken: true
395397
containers:
396398
- args:
397399
- /nginx-ingress-controller
@@ -417,7 +419,7 @@ spec:
417419
fieldPath: metadata.namespace
418420
- name: LD_PRELOAD
419421
value: /usr/local/lib/libmimalloc.so
420-
image: registry.k8s.io/ingress-nginx/controller:v1.11.2@sha256:d5f8217feeac4887cb1ed21f27c2674e58be06bd8f5184cacea2a69abaf78dce
422+
image: registry.k8s.io/ingress-nginx/controller:v1.13.0@sha256:dc75a7baec7a3b827a5d7ab0acd10ab507904c7dad692365b3e3b596eca1afd2
421423
imagePullPolicy: IfNotPresent
422424
lifecycle:
423425
preStop:
@@ -469,6 +471,7 @@ spec:
469471
drop:
470472
- ALL
471473
readOnlyRootFilesystem: false
474+
runAsGroup: 82
472475
runAsNonRoot: true
473476
runAsUser: 101
474477
seccompProfile:
@@ -479,7 +482,6 @@ spec:
479482
readOnly: true
480483
dnsPolicy: ClusterFirst
481484
nodeSelector:
482-
ingress-ready: "true"
483485
kubernetes.io/os: linux
484486
serviceAccountName: ingress-nginx
485487
terminationGracePeriodSeconds: 0
@@ -503,7 +505,7 @@ metadata:
503505
app.kubernetes.io/instance: ingress-nginx
504506
app.kubernetes.io/name: ingress-nginx
505507
app.kubernetes.io/part-of: ingress-nginx
506-
app.kubernetes.io/version: 1.11.2
508+
app.kubernetes.io/version: 1.13.0
507509
name: ingress-nginx-admission-create
508510
namespace: ingress-nginx
509511
spec:
@@ -514,9 +516,10 @@ spec:
514516
app.kubernetes.io/instance: ingress-nginx
515517
app.kubernetes.io/name: ingress-nginx
516518
app.kubernetes.io/part-of: ingress-nginx
517-
app.kubernetes.io/version: 1.11.2
519+
app.kubernetes.io/version: 1.13.0
518520
name: ingress-nginx-admission-create
519521
spec:
522+
automountServiceAccountToken: true
520523
containers:
521524
- args:
522525
- create
@@ -528,7 +531,7 @@ spec:
528531
valueFrom:
529532
fieldRef:
530533
fieldPath: metadata.namespace
531-
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.3@sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3
534+
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
532535
imagePullPolicy: IfNotPresent
533536
name: create
534537
securityContext:
@@ -537,6 +540,7 @@ spec:
537540
drop:
538541
- ALL
539542
readOnlyRootFilesystem: true
543+
runAsGroup: 65532
540544
runAsNonRoot: true
541545
runAsUser: 65532
542546
seccompProfile:
@@ -554,7 +558,7 @@ metadata:
554558
app.kubernetes.io/instance: ingress-nginx
555559
app.kubernetes.io/name: ingress-nginx
556560
app.kubernetes.io/part-of: ingress-nginx
557-
app.kubernetes.io/version: 1.11.2
561+
app.kubernetes.io/version: 1.13.0
558562
name: ingress-nginx-admission-patch
559563
namespace: ingress-nginx
560564
spec:
@@ -565,9 +569,10 @@ spec:
565569
app.kubernetes.io/instance: ingress-nginx
566570
app.kubernetes.io/name: ingress-nginx
567571
app.kubernetes.io/part-of: ingress-nginx
568-
app.kubernetes.io/version: 1.11.2
572+
app.kubernetes.io/version: 1.13.0
569573
name: ingress-nginx-admission-patch
570574
spec:
575+
automountServiceAccountToken: true
571576
containers:
572577
- args:
573578
- patch
@@ -581,7 +586,7 @@ spec:
581586
valueFrom:
582587
fieldRef:
583588
fieldPath: metadata.namespace
584-
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.3@sha256:a320a50cc91bd15fd2d6fa6de58bd98c1bd64b9a6f926ce23a600d87043455a3
589+
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.6.0@sha256:c9f76a75fd00e975416ea1b73300efd413116de0de8570346ed90766c5b5cefb
585590
imagePullPolicy: IfNotPresent
586591
name: patch
587592
securityContext:
@@ -590,6 +595,7 @@ spec:
590595
drop:
591596
- ALL
592597
readOnlyRootFilesystem: true
598+
runAsGroup: 65532
593599
runAsNonRoot: true
594600
runAsUser: 65532
595601
seccompProfile:
@@ -607,7 +613,7 @@ metadata:
607613
app.kubernetes.io/instance: ingress-nginx
608614
app.kubernetes.io/name: ingress-nginx
609615
app.kubernetes.io/part-of: ingress-nginx
610-
app.kubernetes.io/version: 1.11.2
616+
app.kubernetes.io/version: 1.13.0
611617
name: nginx
612618
spec:
613619
controller: k8s.io/ingress-nginx
@@ -620,7 +626,7 @@ metadata:
620626
app.kubernetes.io/instance: ingress-nginx
621627
app.kubernetes.io/name: ingress-nginx
622628
app.kubernetes.io/part-of: ingress-nginx
623-
app.kubernetes.io/version: 1.11.2
629+
app.kubernetes.io/version: 1.13.0
624630
name: ingress-nginx-admission
625631
webhooks:
626632
- admissionReviewVersions:
@@ -630,6 +636,7 @@ webhooks:
630636
name: ingress-nginx-controller-admission
631637
namespace: ingress-nginx
632638
path: /networking/v1/ingresses
639+
port: 443
633640
failurePolicy: Fail
634641
matchPolicy: Equivalent
635642
name: validate.nginx.ingress.kubernetes.io

0 commit comments

Comments
 (0)