Merge pull request #7619 from a-robinson/dns

cluster/addons/dns/skydns-rc.yaml.in

+apiVersion: v1beta3
 kind: ReplicationController
-apiVersion: v1beta1
-id: kube-dns
-namespace: default
-labels:
+metadata:
+  labels:
     k8s-app: kube-dns
     kubernetes.io/cluster-service: "true"
-desiredState:
+  name: kube-dns
+  namespace: default
+spec:
   replicas: {{ pillar['dns_replicas'] }}
-  replicaSelector:
+  selector:
     k8s-app: kube-dns
-  podTemplate:
+  template:
+    metadata:
       labels:
-      name: kube-dns
         k8s-app: kube-dns
         kubernetes.io/cluster-service: "true"
-    desiredState:
-      manifest:
-        version: v1beta2
-        id: kube-dns
-        dnsPolicy: "Default"  # Don't use cluster DNS.
+        name: kube-dns
+    spec:
       containers:
       - name: etcd
         image: gcr.io/google_containers/etcd:2.0.9
-            command: [
-                    "/usr/local/bin/etcd",
-                    "--addr",
-                    "127.0.0.1:4001",
-                    "--bind-addr",
-                    "127.0.0.1:4001",
-                    "-initial-cluster-token=skydns-etcd",
-            ]
+        command:
+        - /usr/local/bin/etcd
+        - --addr
+        - 127.0.0.1:4001
+        - --bind-addr
+        - 127.0.0.1:4001
+        - -initial-cluster-token=skydns-etcd
       - name: kube2sky
         image: gcr.io/google_containers/kube2sky:1.4
+        args:
+        # entrypoint = "/kube2sky"
+        - -domain={{ pillar['dns_domain'] }}
+        - -kubecfg_file=/etc/dns_token/kubeconfig
         volumeMounts:
-               - name: dns-token
-                 mountPath: /etc/dns_token
+        - mountPath: /etc/dns_token
+          name: dns-token
           readOnly: true
-            command: [
-                    # entrypoint = "/kube2sky",
-                    "-domain={{ pillar['dns_domain'] }}",
-                    "-kubecfg_file=/etc/dns_token/kubeconfig",
-            ]
       - name: skydns
         image: gcr.io/google_containers/skydns:2015-03-11-001
-            command: [
-                    # entrypoint = "/skydns",
-                    "-machines=http://localhost:4001",
-                    "-addr=0.0.0.0:53",
-                    "-domain={{ pillar['dns_domain'] }}.",
-            ]
+        args:
+        # entrypoint = "/skydns"
+        - -machines=http://localhost:4001
+        - -addr=0.0.0.0:53
+        - -domain={{ pillar['dns_domain'] }}.
         ports:
-              - name: dns
-                containerPort: 53
+        - containerPort: 53
+          name: dns
           protocol: UDP
+        livenessProbe:
+          exec:
+            command:
+            - "/bin/sh"
+            - "-c"
+            # The health check succeeds by virtue of not hanging. It'd be nice
+            # to also check local services are known, but if that's broken then
+            # etcd or kube2sky has to be restarted, not skydns.
+            - "nslookup foobar 127.0.0.1 &> /dev/null; echo ok"
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+      dnsPolicy: Default  # Don't use cluster DNS.
       volumes:
       - name: dns-token
-             source:
         secret:
-                 target:
-                   kind: Secret
-                   namespace: default
-                   name: token-system-dns
+          secretName: token-system-dns