github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 01:23:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18894 from luxas/update_master_multi

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-01-11 20:38:41 -08:00
parent c4d46adc5e 7d497441b3
commit d246ed00fa
7 changed files with 191 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/images/hyperkube/Dockerfile
View File

@@ -19,6 +19,8 @@ COPY hyperkube /hyperkube
RUN chmod a+rx /hyperkube
COPY master-multi.json /etc/kubernetes/manifests-multi/master.json
COPY kube-proxy.json /etc/kubernetes/manifests-multi/kube-proxy.json
COPY master.json /etc/kubernetes/manifests/master.json
COPY etcd.json /etc/kubernetes/manifests/etcd.json
COPY kube-proxy.json /etc/kubernetes/manifests/kube-proxy.json