diff --git a/cluster/libvirt-coreos/skydns-rc.yaml b/cluster/libvirt-coreos/skydns-rc.yaml index f2e033af540..7af68d93b45 100644 --- a/cluster/libvirt-coreos/skydns-rc.yaml +++ b/cluster/libvirt-coreos/skydns-rc.yaml @@ -1,44 +1,37 @@ +apiVersion: v1beta3 kind: ReplicationController -apiVersion: v1beta1 -id: skydns -namespace: default -labels: - k8s-app: skydns -desiredState: - replicas: ${DNS_REPLICAS} - replicaSelector: +metadata: + labels: k8s-app: skydns - podTemplate: - labels: - k8s-app: skydns - desiredState: - manifest: - version: v1beta2 - id: skydns - dnsPolicy: "Default" # Don't use cluster DNS. - containers: - - name: etcd - image: quay.io/coreos/etcd:latest - command: [ - \"/etcd\", - \"-bind-addr=127.0.0.1\", - \"-peer-bind-addr=127.0.0.1\", - ] - - name: kube2sky - image: kubernetes/kube2sky:1.0 - command: [ - # entrypoint = \"/kube2sky\", - \"-domain=${DNS_DOMAIN}\", - ] - - name: skydns - image: kubernetes/skydns:2014-12-23-001 - command: [ - # entrypoint = \"/skydns\", - \"-machines=http://localhost:4001\", - \"-addr=0.0.0.0:53\", - \"-domain=${DNS_DOMAIN}.\", - ] - ports: - - name: dns - containerPort: 53 - protocol: UDP + name: skydns + namespace: default +spec: + replicas: ${DNS_REPLICAS} + selector: + k8s-app: skydns + template: + metadata: + labels: + k8s-app: skydns + spec: + containers: + - args: + - \"/etcd\" + - \"-bind-addr=127.0.0.1\" + - \"-peer-bind-addr=127.0.0.1\" + image: quay.io/coreos/etcd:latest + name: etcd + - args: + - \"-domain=${DNS_DOMAIN}\" + image: kubernetes/kube2sky:1.0 + name: kube2sky + - args: + - \"-machines=http://localhost:4001\" + - \"-addr=0.0.0.0:53\" + - \"-domain=${DNS_DOMAIN}.\" + image: kubernetes/skydns:2014-12-23-001 + name: skydns + ports: + - containerPort: 53 + name: dns + protocol: UDP diff --git a/cluster/libvirt-coreos/skydns-svc.yaml b/cluster/libvirt-coreos/skydns-svc.yaml index d765f3f3fa9..65e6d43488a 100644 --- a/cluster/libvirt-coreos/skydns-svc.yaml +++ b/cluster/libvirt-coreos/skydns-svc.yaml @@ -1,12 +1,15 @@ +apiVersion: v1beta3 kind: Service -apiVersion: v1beta1 -id: skydns -namespace: default -protocol: UDP -port: 53 -portalIP: ${DNS_SERVER_IP} -containerPort: 53 -labels: - k8s-app: skydns -selector: - k8s-app: skydns +metadata: + labels: + k8s-app: skydns + name: skydns + namespace: default +spec: + portalIP: ${DNS_SERVER_IP} + ports: + - port: 53 + protocol: UDP + targetPort: 53 + selector: + k8s-app: skydns