Merge pull request #28247 from girishkalele/skydns_godep_up

Automatic merge from submit-queue

Bump skydns godeps to latest

Update Godeps for github.com/skynetservices/skydns and miekg/dns.

Bump kubedns version to 1.6 with latest skynetservices/skydns code
    
Built kube-dns for all architectures and pushed containers to gcr.io.
This commit is contained in:
k8s-merge-robot
2016-06-30 11:19:46 -07:00
committed by GitHub
69 changed files with 5182 additions and 1489 deletions

View File

@@ -21,27 +21,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v17
name: kube-dns-v18
namespace: kube-system
labels:
k8s-app: kube-dns
version: v17
version: v18
kubernetes.io/cluster-service: "true"
spec:
replicas: __PILLAR__DNS__REPLICAS__
selector:
k8s-app: kube-dns
version: v17
version: v18
template:
metadata:
labels:
k8s-app: kube-dns
version: v17
version: v18
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.5
image: gcr.io/google_containers/kubedns-amd64:1.6
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in

View File

@@ -21,27 +21,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v17
name: kube-dns-v18
namespace: kube-system
labels:
k8s-app: kube-dns
version: v17
version: v18
kubernetes.io/cluster-service: "true"
spec:
replicas: {{ pillar['dns_replicas'] }}
selector:
k8s-app: kube-dns
version: v17
version: v18
template:
metadata:
labels:
k8s-app: kube-dns
version: v17
version: v18
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.5
image: gcr.io/google_containers/kubedns-amd64:1.6
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in

View File

@@ -21,27 +21,27 @@
apiVersion: v1
kind: ReplicationController
metadata:
name: kube-dns-v17
name: kube-dns-v18
namespace: kube-system
labels:
k8s-app: kube-dns
version: v17
version: v18
kubernetes.io/cluster-service: "true"
spec:
replicas: $DNS_REPLICAS
selector:
k8s-app: kube-dns
version: v17
version: v18
template:
metadata:
labels:
k8s-app: kube-dns
version: v17
version: v18
kubernetes.io/cluster-service: "true"
spec:
containers:
- name: kubedns
image: gcr.io/google_containers/kubedns-amd64:1.5
image: gcr.io/google_containers/kubedns-amd64:1.6
resources:
# TODO: Set memory limits when we've profiled the container for large
# clusters, then set request = limit to keep this container in