diff --git a/deployments/kubedns.yaml b/deployments/kubedns.yaml index f696bde..d744346 100644 --- a/deployments/kubedns.yaml +++ b/deployments/kubedns.yaml @@ -15,23 +15,23 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: kube-dns-v19 + name: kube-dns-v20 namespace: kube-system labels: k8s-app: kube-dns - version: v19 + version: v20 kubernetes.io/cluster-service: "true" spec: replicas: 2 selector: matchLabels: k8s-app: kube-dns - version: v19 + version: v20 template: metadata: labels: k8s-app: kube-dns - version: v19 + version: v20 kubernetes.io/cluster-service: "true" annotations: scheduler.alpha.kubernetes.io/critical-pod: '' @@ -39,21 +39,20 @@ spec: spec: containers: - name: kubedns - image: gcr.io/google_containers/kubedns-amd64:1.7 + image: gcr.io/google_containers/kubedns-amd64:1.8 resources: # TODO: Set memory limits when we've profiled the container for large # clusters, then set request = limit to keep this container in # guaranteed class. Currently, this container falls into the # "burstable" category so the kubelet doesn't backoff from restarting it. limits: - cpu: 100m memory: 170Mi requests: cpu: 100m memory: 70Mi livenessProbe: httpGet: - path: /healthz + path: /healthz-kubedns port: 8080 scheme: HTTP initialDelaySeconds: 60 @@ -67,7 +66,7 @@ spec: scheme: HTTP # we poll on pod startup for the Kubernetes master service and # only setup the /readiness HTTP server once that's available. - initialDelaySeconds: 30 + initialDelaySeconds: 3 timeoutSeconds: 5 args: # command = "/kube-dns" @@ -81,11 +80,21 @@ spec: name: dns-tcp-local protocol: TCP - name: dnsmasq - image: gcr.io/google_containers/kube-dnsmasq-amd64:1.3 + image: gcr.io/google_containers/kube-dnsmasq-amd64:1.4 + livenessProbe: + httpGet: + path: /healthz-dnsmasq + port: 8080 + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 args: - --cache-size=1000 - --no-resolv - --server=127.0.0.1#10053 + - --log-facility=- ports: - containerPort: 53 name: dns @@ -94,19 +103,20 @@ spec: name: dns-tcp protocol: TCP - name: healthz - image: gcr.io/google_containers/exechealthz-amd64:1.1 + image: gcr.io/google_containers/exechealthz-amd64:1.2 resources: - # keep request = limit to keep this container in guaranteed class limits: - cpu: 10m memory: 50Mi requests: cpu: 10m memory: 50Mi args: - - -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 - - -port=8080 - - -quiet + - --cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null + - --url=/healthz-dnsmasq + - --cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1:10053 >/dev/null + - --url=/healthz-kubedns + - --port=8080 + - --quiet ports: - containerPort: 8080 protocol: TCP