mirrors
/
kubernetes-the-hard-way
mirror of https://github.com/kelseyhightower/kubernetes-the-hard-way
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update kube-dns add-on from v19 to v20

pull/87/head
Chris Kim 2016-10-06 14:39:21 -04:00 committed by Kelsey Hightower
parent e7feed75a3
commit 0450e2b3b7
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
deployments/kubedns.yaml
View File

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