From 608b4e54397a0ef46a73d7dd06da94d43c5efac9 Mon Sep 17 00:00:00 2001
From: Kelsey Hightower <kelsey.hightower@gmail.com>
Date: Sun, 11 Sep 2016 06:20:02 -0700
Subject: [PATCH] update kubedns add-on

---
 skydns-rc.yaml => deployments/kubedns.yaml | 38 ++++++++++------------
 docs/08-dns-addon.md                       | 10 +++---
 skydns-svc.yaml => services/kubedns.yaml   |  0
 3 files changed, 23 insertions(+), 25 deletions(-)
 rename skydns-rc.yaml => deployments/kubedns.yaml (82%)
 rename skydns-svc.yaml => services/kubedns.yaml (100%)

diff --git a/skydns-rc.yaml b/deployments/kubedns.yaml
similarity index 82%
rename from skydns-rc.yaml
rename to deployments/kubedns.yaml
index d6765ab..f696bde 100644
--- a/skydns-rc.yaml
+++ b/deployments/kubedns.yaml
@@ -12,36 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
-
-# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
-
-# Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
-
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
-  name: kube-dns-v18
+  name: kube-dns-v19
   namespace: kube-system
   labels:
     k8s-app: kube-dns
-    version: v18
+    version: v19
     kubernetes.io/cluster-service: "true"
 spec:
-  replicas: 2 
+  replicas: 2
   selector:
-    k8s-app: kube-dns
-    version: v18
+    matchLabels:
+      k8s-app: kube-dns
+      version: v19
   template:
     metadata:
       labels:
         k8s-app: kube-dns
-        version: v18
+        version: v19
         kubernetes.io/cluster-service: "true"
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ''
+        scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
       containers:
       - name: kubedns
-        image: gcr.io/google_containers/kubedns-amd64:1.6
+        image: gcr.io/google_containers/kubedns-amd64:1.7
         resources:
           # TODO: Set memory limits when we've profiled the container for large
           # clusters, then set request = limit to keep this container in
@@ -49,10 +47,10 @@ spec:
           # "burstable" category so the kubelet doesn't backoff from restarting it.
           limits:
             cpu: 100m
-            memory: 200Mi
+            memory: 170Mi
           requests:
             cpu: 100m
-            memory: 100Mi
+            memory: 70Mi
         livenessProbe:
           httpGet:
             path: /healthz
@@ -96,15 +94,15 @@ spec:
           name: dns-tcp
           protocol: TCP
       - name: healthz
-        image: gcr.io/google_containers/exechealthz-amd64:1.0
+        image: gcr.io/google_containers/exechealthz-amd64:1.1
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:
             cpu: 10m
-            memory: 20Mi
+            memory: 50Mi
           requests:
             cpu: 10m
-            memory: 20Mi
+            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
diff --git a/docs/08-dns-addon.md b/docs/08-dns-addon.md
index ebaa271..e344774 100644
--- a/docs/08-dns-addon.md
+++ b/docs/08-dns-addon.md
@@ -7,10 +7,10 @@ In this lab you will deploy the DNS add-on which is required for every Kubernete
 
 ## Cluster DNS Add-on
 
-### Create the `skydns` service:
+### Create the `kubedns` service:
 
 ```
-kubectl create -f https://raw.githubusercontent.com/kelseyhightower/kubernetes-the-hard-way/master/skydns-svc.yaml
+kubectl create -f https://raw.githubusercontent.com/kelseyhightower/kubernetes-the-hard-way/master/services/kubedns.yaml
 ```
 
 #### Verification
@@ -23,10 +23,10 @@ NAME       CLUSTER-IP   EXTERNAL-IP   PORT(S)         AGE
 kube-dns   10.32.0.10   <none>        53/UDP,53/TCP   1m
 ```
 
-### Create the `skydns` replication controller:
+### Create the `kubedns` deployment:
 
 ```
-kubectl create -f https://raw.githubusercontent.com/kelseyhightower/kubernetes-the-hard-way/master/skydns-rc.yaml
+kubectl create -f https://raw.githubusercontent.com/kelseyhightower/kubernetes-the-hard-way/master/deployments/kubedns.yaml
 ```
 
 #### Verification
@@ -38,4 +38,4 @@ kubectl --namespace=kube-system get pods
 NAME                 READY     STATUS    RESTARTS   AGE
 kube-dns-v18-79maa   3/3       Running   0          41s
 kube-dns-v18-bcs1f   3/3       Running   0          41s
-```
\ No newline at end of file
+```
diff --git a/skydns-svc.yaml b/services/kubedns.yaml
similarity index 100%
rename from skydns-svc.yaml
rename to services/kubedns.yaml