Merge pull request #8273 from krousey/cluser_skydns

Updating some SkyDNS templates to v1beta3

cluster/libvirt-coreos/skydns-rc.yaml

@@ -1,44 +1,37 @@
+apiVersion: v1beta3
 kind: ReplicationController
-apiVersion: v1beta1
+metadata:
-id: skydns
+  labels:
-namespace: default
-labels:
-  k8s-app: skydns
-desiredState:
-  replicas: ${DNS_REPLICAS}
-  replicaSelector:
     k8s-app: skydns
-  podTemplate:
+  name: skydns
-    labels:
+  namespace: default
-      k8s-app: skydns
+spec:
-    desiredState:
+  replicas: ${DNS_REPLICAS}
-      manifest:
+  selector:
-        version: v1beta2
+    k8s-app: skydns
-        id: skydns
+  template:
-        dnsPolicy: "Default"  # Don't use cluster DNS.
+    metadata:
-        containers:
+      labels:
-          - name: etcd
+        k8s-app: skydns
-            image: quay.io/coreos/etcd:latest
+    spec:
-            command: [
+      containers:
-                    \"/etcd\",
+      - args:
-                    \"-bind-addr=127.0.0.1\",
+        - \"/etcd\"
-                    \"-peer-bind-addr=127.0.0.1\",
+        - \"-bind-addr=127.0.0.1\"
-            ]
+        - \"-peer-bind-addr=127.0.0.1\"
-          - name: kube2sky
+        image: quay.io/coreos/etcd:latest
-            image: kubernetes/kube2sky:1.0
+        name: etcd
-            command: [
+      - args:
-                    # entrypoint = \"/kube2sky\",
+        - \"-domain=${DNS_DOMAIN}\"
-                    \"-domain=${DNS_DOMAIN}\",
+        image: kubernetes/kube2sky:1.0
-            ]
+        name: kube2sky
-          - name: skydns
+      - args:
-            image: kubernetes/skydns:2014-12-23-001
+        - \"-machines=http://localhost:4001\"
-            command: [
+        - \"-addr=0.0.0.0:53\"
-                    # entrypoint = \"/skydns\",
+        - \"-domain=${DNS_DOMAIN}.\"
-                    \"-machines=http://localhost:4001\",
+        image: kubernetes/skydns:2014-12-23-001
-                    \"-addr=0.0.0.0:53\",
+        name: skydns
-                    \"-domain=${DNS_DOMAIN}.\",
+        ports:
-            ]
+        - containerPort: 53
-            ports:
+          name: dns
-              - name: dns
+          protocol: UDP
-                containerPort: 53
-                protocol: UDP

cluster/libvirt-coreos/skydns-svc.yaml

@@ -1,12 +1,15 @@
+apiVersion: v1beta3
 kind: Service
-apiVersion: v1beta1
+metadata:
-id: skydns
+  labels:
-namespace: default
+    k8s-app: skydns
-protocol: UDP
+  name: skydns
-port: 53
+  namespace: default
-portalIP: ${DNS_SERVER_IP}
+spec:
-containerPort: 53
+  portalIP: ${DNS_SERVER_IP}
-labels:
+  ports:
-  k8s-app: skydns
+  - port: 53
-selector:
+    protocol: UDP
-  k8s-app: skydns
+    targetPort: 53
+  selector:
+    k8s-app: skydns