Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit 68426a5

Browse files
committed
Bump kube-dns addon v20
1 parent 8d7ca6c commit 68426a5

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

pkg/asset/internal/templates.go

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -281,27 +281,26 @@ spec:
281281
DNSDeploymentTemplate = []byte(`apiVersion: extensions/v1beta1
282282
kind: Deployment
283283
metadata:
284-
name: kube-dns-v19
284+
name: kube-dns-v20
285285
namespace: kube-system
286286
labels:
287287
k8s-app: kube-dns
288-
version: v19
288+
version: v20
289289
kubernetes.io/cluster-service: "true"
290290
spec:
291291
replicas: 1
292292
template:
293293
metadata:
294294
labels:
295295
k8s-app: kube-dns
296-
version: v19
297-
kubernetes.io/cluster-service: "true"
296+
version: v20
298297
annotations:
299298
scheduler.alpha.kubernetes.io/critical-pod: ''
300299
scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
301300
spec:
302301
containers:
303302
- name: kubedns
304-
image: gcr.io/google_containers/kubedns-amd64:1.7
303+
image: gcr.io/google_containers/kubedns-amd64:1.8
305304
resources:
306305
# TODO: Set memory limits when we've profiled the container for large
307306
# clusters, then set request = limit to keep this container in
@@ -314,7 +313,7 @@ spec:
314313
memory: 70Mi
315314
livenessProbe:
316315
httpGet:
317-
path: /healthz
316+
path: /healthz-kubedns
318317
port: 8080
319318
scheme: HTTP
320319
initialDelaySeconds: 60
@@ -328,7 +327,7 @@ spec:
328327
scheme: HTTP
329328
# we poll on pod startup for the Kubernetes master service and
330329
# only setup the /readiness HTTP server once that's available.
331-
initialDelaySeconds: 30
330+
initialDelaySeconds: 3
332331
timeoutSeconds: 5
333332
args:
334333
# command = "/kube-dns"
@@ -342,11 +341,21 @@ spec:
342341
name: dns-tcp-local
343342
protocol: TCP
344343
- name: dnsmasq
345-
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3
344+
image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4
345+
livenessProbe:
346+
httpGet:
347+
path: /healthz-dnsmasq
348+
port: 8080
349+
scheme: HTTP
350+
initialDelaySeconds: 60
351+
timeoutSeconds: 5
352+
successThreshold: 1
353+
failureThreshold: 5
346354
args:
347355
- --cache-size=1000
348356
- --no-resolv
349357
- --server=127.0.0.1#10053
358+
- --log-facility=-
350359
ports:
351360
- containerPort: 53
352361
name: dns
@@ -355,7 +364,7 @@ spec:
355364
name: dns-tcp
356365
protocol: TCP
357366
- name: healthz
358-
image: gcr.io/google_containers/exechealthz-amd64:1.1
367+
image: gcr.io/google_containers/exechealthz-amd64:1.2
359368
resources:
360369
limits:
361370
memory: 50Mi
@@ -367,9 +376,12 @@ spec:
367376
# net memory requested by the pod constant.
368377
memory: 50Mi
369378
args:
370-
- -cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null && nslookup kubernetes.default.svc.cluster.local 127.0.0.1:10053 >/dev/null
371-
- -port=8080
372-
- -quiet
379+
- --cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null
380+
- --url=/healthz-dnsmasq
381+
- --cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1:10053 >/dev/null
382+
- --url=/healthz-kubedns
383+
- --port=8080
384+
- --quiet
373385
ports:
374386
- containerPort: 8080
375387
protocol: TCP

0 commit comments

Comments
 (0)