github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27895 from nikhiljindal/pushDNSImage

Browse Source 
Automatic merge from submit-queue

Pushing a new KubeDNS image and updating the YAML files

Updating KubeDNS image to include https://github.com/kubernetes/kubernetes/pull/27845

@kubernetes/sig-cluster-federation @girishkalele @mml
This commit is contained in:
k8s-merge-robot
2016-06-22 16:56:31 -07:00
committed by GitHub
parent c5afca10f4 ff1264bc33
commit 70fc517f79
5 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
View File

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

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
View File

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

10
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
View File

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