Skip to content

Commit 31783cf

Browse files
committed
Upgrade to nginx-ingress-controller 1.12.0 and kube-state-metrics 2.14.0
- need to allow snippet server annotations of severity "Critical" for proper operation of most of our services - removed --enable-metrics=false since this is now the default (changed upstream) - other changes coming from upstream have less explanations
1 parent d4c9446 commit 31783cf

File tree

2 files changed

+30
-26
lines changed

2 files changed

+30
-26
lines changed

grafana/grafana.values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ logs:
4949
kube-state-metrics:
5050
enabled: true
5151
image:
52-
tag: v2.13.0
52+
tag: v2.14.0
5353

5454
prometheus-node-exporter:
5555
enabled: true

nginx-ingress/deploy.yaml

+29-25
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ metadata:
1515
app.kubernetes.io/instance: ingress-nginx
1616
app.kubernetes.io/name: ingress-nginx
1717
app.kubernetes.io/part-of: ingress-nginx
18-
app.kubernetes.io/version: 1.11.1
18+
app.kubernetes.io/version: 1.12.0
1919
name: ingress-nginx
2020
namespace: ingress-nginx
2121
---
@@ -28,7 +28,7 @@ metadata:
2828
app.kubernetes.io/instance: ingress-nginx
2929
app.kubernetes.io/name: ingress-nginx
3030
app.kubernetes.io/part-of: ingress-nginx
31-
app.kubernetes.io/version: 1.11.1
31+
app.kubernetes.io/version: 1.12.0
3232
name: ingress-nginx-admission
3333
namespace: ingress-nginx
3434
---
@@ -40,7 +40,7 @@ metadata:
4040
app.kubernetes.io/instance: ingress-nginx
4141
app.kubernetes.io/name: ingress-nginx
4242
app.kubernetes.io/part-of: ingress-nginx
43-
app.kubernetes.io/version: 1.11.1
43+
app.kubernetes.io/version: 1.12.0
4444
name: ingress-nginx
4545
namespace: ingress-nginx
4646
rules:
@@ -130,7 +130,7 @@ metadata:
130130
app.kubernetes.io/instance: ingress-nginx
131131
app.kubernetes.io/name: ingress-nginx
132132
app.kubernetes.io/part-of: ingress-nginx
133-
app.kubernetes.io/version: 1.11.1
133+
app.kubernetes.io/version: 1.12.0
134134
name: ingress-nginx-admission
135135
namespace: ingress-nginx
136136
rules:
@@ -149,7 +149,7 @@ metadata:
149149
app.kubernetes.io/instance: ingress-nginx
150150
app.kubernetes.io/name: ingress-nginx
151151
app.kubernetes.io/part-of: ingress-nginx
152-
app.kubernetes.io/version: 1.11.1
152+
app.kubernetes.io/version: 1.12.0
153153
name: ingress-nginx
154154
rules:
155155
- apiGroups:
@@ -231,7 +231,7 @@ metadata:
231231
app.kubernetes.io/instance: ingress-nginx
232232
app.kubernetes.io/name: ingress-nginx
233233
app.kubernetes.io/part-of: ingress-nginx
234-
app.kubernetes.io/version: 1.11.1
234+
app.kubernetes.io/version: 1.12.0
235235
name: ingress-nginx-admission
236236
rules:
237237
- apiGroups:
@@ -250,7 +250,7 @@ metadata:
250250
app.kubernetes.io/instance: ingress-nginx
251251
app.kubernetes.io/name: ingress-nginx
252252
app.kubernetes.io/part-of: ingress-nginx
253-
app.kubernetes.io/version: 1.11.1
253+
app.kubernetes.io/version: 1.12.0
254254
name: ingress-nginx
255255
namespace: ingress-nginx
256256
roleRef:
@@ -270,7 +270,7 @@ metadata:
270270
app.kubernetes.io/instance: ingress-nginx
271271
app.kubernetes.io/name: ingress-nginx
272272
app.kubernetes.io/part-of: ingress-nginx
273-
app.kubernetes.io/version: 1.11.1
273+
app.kubernetes.io/version: 1.12.0
274274
name: ingress-nginx-admission
275275
namespace: ingress-nginx
276276
roleRef:
@@ -289,7 +289,7 @@ metadata:
289289
app.kubernetes.io/instance: ingress-nginx
290290
app.kubernetes.io/name: ingress-nginx
291291
app.kubernetes.io/part-of: ingress-nginx
292-
app.kubernetes.io/version: 1.11.1
292+
app.kubernetes.io/version: 1.12.0
293293
name: ingress-nginx
294294
roleRef:
295295
apiGroup: rbac.authorization.k8s.io
@@ -308,7 +308,7 @@ metadata:
308308
app.kubernetes.io/instance: ingress-nginx
309309
app.kubernetes.io/name: ingress-nginx
310310
app.kubernetes.io/part-of: ingress-nginx
311-
app.kubernetes.io/version: 1.11.1
311+
app.kubernetes.io/version: 1.12.0
312312
name: ingress-nginx-admission
313313
roleRef:
314314
apiGroup: rbac.authorization.k8s.io
@@ -323,14 +323,15 @@ apiVersion: v1
323323
data:
324324
allow-snippet-annotations: "true"
325325
use-proxy-protocol: "false"
326+
annotations-risk-level: "Critical"
326327
kind: ConfigMap
327328
metadata:
328329
labels:
329330
app.kubernetes.io/component: controller
330331
app.kubernetes.io/instance: ingress-nginx
331332
app.kubernetes.io/name: ingress-nginx
332333
app.kubernetes.io/part-of: ingress-nginx
333-
app.kubernetes.io/version: 1.11.1
334+
app.kubernetes.io/version: 1.12.0
334335
name: ingress-nginx-controller
335336
namespace: ingress-nginx
336337
# ---
@@ -344,7 +345,7 @@ metadata:
344345
# app.kubernetes.io/instance: ingress-nginx
345346
# app.kubernetes.io/name: ingress-nginx
346347
# app.kubernetes.io/part-of: ingress-nginx
347-
# app.kubernetes.io/version: 1.11.1
348+
# app.kubernetes.io/version: 1.12.0
348349
# name: ingress-nginx-controller
349350
# namespace: ingress-nginx
350351
# spec:
@@ -377,7 +378,7 @@ metadata:
377378
app.kubernetes.io/instance: ingress-nginx
378379
app.kubernetes.io/name: ingress-nginx
379380
app.kubernetes.io/part-of: ingress-nginx
380-
app.kubernetes.io/version: 1.11.1
381+
app.kubernetes.io/version: 1.12.0
381382
name: ingress-nginx-controller-admission
382383
namespace: ingress-nginx
383384
spec:
@@ -400,7 +401,7 @@ metadata:
400401
app.kubernetes.io/instance: ingress-nginx
401402
app.kubernetes.io/name: ingress-nginx
402403
app.kubernetes.io/part-of: ingress-nginx
403-
app.kubernetes.io/version: 1.11.1
404+
app.kubernetes.io/version: 1.12.0
404405
name: ingress-nginx-controller
405406
namespace: ingress-nginx
406407
spec:
@@ -418,7 +419,7 @@ spec:
418419
app.kubernetes.io/instance: ingress-nginx
419420
app.kubernetes.io/name: ingress-nginx
420421
app.kubernetes.io/part-of: ingress-nginx
421-
app.kubernetes.io/version: 1.11.1
422+
app.kubernetes.io/version: 1.12.0
422423
spec:
423424
containers:
424425
- args:
@@ -430,7 +431,6 @@ spec:
430431
- --validating-webhook=:8443
431432
- --validating-webhook-certificate=/usr/local/certificates/cert
432433
- --validating-webhook-key=/usr/local/certificates/key
433-
- --enable-metrics=false
434434
env:
435435
- name: POD_NAME
436436
valueFrom:
@@ -442,7 +442,7 @@ spec:
442442
fieldPath: metadata.namespace
443443
- name: LD_PRELOAD
444444
value: /usr/local/lib/libmimalloc.so
445-
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
445+
image: registry.k8s.io/ingress-nginx/controller:v1.12.0@sha256:e6b8de175acda6ca913891f0f727bca4527e797d52688cbe9fec9040d6f6b6fa
446446
imagePullPolicy: IfNotPresent
447447
lifecycle:
448448
preStop:
@@ -494,6 +494,7 @@ spec:
494494
drop:
495495
- ALL
496496
readOnlyRootFilesystem: false
497+
runAsGroup: 82
497498
runAsNonRoot: true
498499
runAsUser: 101
499500
seccompProfile:
@@ -520,7 +521,7 @@ metadata:
520521
app.kubernetes.io/instance: ingress-nginx
521522
app.kubernetes.io/name: ingress-nginx
522523
app.kubernetes.io/part-of: ingress-nginx
523-
app.kubernetes.io/version: 1.11.1
524+
app.kubernetes.io/version: 1.12.0
524525
name: ingress-nginx-admission-create
525526
namespace: ingress-nginx
526527
spec:
@@ -531,7 +532,7 @@ spec:
531532
app.kubernetes.io/instance: ingress-nginx
532533
app.kubernetes.io/name: ingress-nginx
533534
app.kubernetes.io/part-of: ingress-nginx
534-
app.kubernetes.io/version: 1.11.1
535+
app.kubernetes.io/version: 1.12.0
535536
name: ingress-nginx-admission-create
536537
spec:
537538
containers:
@@ -545,7 +546,7 @@ spec:
545546
valueFrom:
546547
fieldRef:
547548
fieldPath: metadata.namespace
548-
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.1@sha256:36d05b4077fb8e3d13663702fa337f124675ba8667cbd949c03a8e8ea6fa4366
549+
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.0@sha256:aaafd456bda110628b2d4ca6296f38731a3aaf0bf7581efae824a41c770a8fc4
549550
imagePullPolicy: IfNotPresent
550551
name: create
551552
securityContext:
@@ -554,6 +555,7 @@ spec:
554555
drop:
555556
- ALL
556557
readOnlyRootFilesystem: true
558+
runAsGroup: 65532
557559
runAsNonRoot: true
558560
runAsUser: 65532
559561
seccompProfile:
@@ -571,7 +573,7 @@ metadata:
571573
app.kubernetes.io/instance: ingress-nginx
572574
app.kubernetes.io/name: ingress-nginx
573575
app.kubernetes.io/part-of: ingress-nginx
574-
app.kubernetes.io/version: 1.11.1
576+
app.kubernetes.io/version: 1.12.0
575577
name: ingress-nginx-admission-patch
576578
namespace: ingress-nginx
577579
spec:
@@ -582,7 +584,7 @@ spec:
582584
app.kubernetes.io/instance: ingress-nginx
583585
app.kubernetes.io/name: ingress-nginx
584586
app.kubernetes.io/part-of: ingress-nginx
585-
app.kubernetes.io/version: 1.11.1
587+
app.kubernetes.io/version: 1.12.0
586588
name: ingress-nginx-admission-patch
587589
spec:
588590
containers:
@@ -598,7 +600,7 @@ spec:
598600
valueFrom:
599601
fieldRef:
600602
fieldPath: metadata.namespace
601-
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.4.1@sha256:36d05b4077fb8e3d13663702fa337f124675ba8667cbd949c03a8e8ea6fa4366
603+
image: registry.k8s.io/ingress-nginx/kube-webhook-certgen:v1.5.0@sha256:aaafd456bda110628b2d4ca6296f38731a3aaf0bf7581efae824a41c770a8fc4
602604
imagePullPolicy: IfNotPresent
603605
name: patch
604606
securityContext:
@@ -607,6 +609,7 @@ spec:
607609
drop:
608610
- ALL
609611
readOnlyRootFilesystem: true
612+
runAsGroup: 65532
610613
runAsNonRoot: true
611614
runAsUser: 65532
612615
seccompProfile:
@@ -626,7 +629,7 @@ metadata:
626629
app.kubernetes.io/instance: ingress-nginx
627630
app.kubernetes.io/name: ingress-nginx
628631
app.kubernetes.io/part-of: ingress-nginx
629-
app.kubernetes.io/version: 1.11.1
632+
app.kubernetes.io/version: 1.12.0
630633
name: nginx
631634
spec:
632635
controller: k8s.io/ingress-nginx
@@ -639,7 +642,7 @@ metadata:
639642
app.kubernetes.io/instance: ingress-nginx
640643
app.kubernetes.io/name: ingress-nginx
641644
app.kubernetes.io/part-of: ingress-nginx
642-
app.kubernetes.io/version: 1.11.1
645+
app.kubernetes.io/version: 1.12.0
643646
name: ingress-nginx-admission
644647
webhooks:
645648
- admissionReviewVersions:
@@ -649,6 +652,7 @@ webhooks:
649652
name: ingress-nginx-controller-admission
650653
namespace: ingress-nginx
651654
path: /networking/v1/ingresses
655+
port: 443
652656
failurePolicy: Fail
653657
matchPolicy: Equivalent
654658
name: validate.nginx.ingress.kubernetes.io

0 commit comments

Comments
 (0)