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

Merge pull request #17121 from mikedanese/kube-proxy-static

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-20 07:19:26 -08:00
parent c8d2ec6ffd 1d9d11c836
commit ac65782e03
15 changed files with 281 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/common.sh
View File

@@ -99,6 +99,7 @@ readonly KUBE_DOCKER_WRAPPED_BINARIES=(
kube-apiserver,busybox
kube-controller-manager,busybox
kube-scheduler,busybox
kube-proxy,gcr.io/google_containers/debian-iptables:v1
)
# The set of addons images that should be prepopulated