k3s/cmd/kubeadm
Kubernetes Submit Queue 7ad835d74b Merge pull request #47598 from luxas/kubeadm_fix_proxy
Automatic merge from submit-queue (batch tested with PRs 47451, 47410, 47598, 47616, 47473)

kubeadm: Fix kube-proxy regression caused by #46372

**What this PR does / why we need it**:

Fixes: https://github.com/kubernetes/kubeadm/issues/306

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

Required for kubeadm v1.7 to work

**Release note**:

```release-note
NONE
```
@kubernetes/sig-cluster-lifecycle-pr-reviews @cmluciano
2017-06-15 19:52:09 -07:00
..
app Merge pull request #47598 from luxas/kubeadm_fix_proxy 2017-06-15 19:52:09 -07:00
test/cmd Merge pull request #44628 from dmmcquay/kubeadm_join_tests 2017-04-28 08:41:36 -07:00
BUILD Convert go_binary linkstamp to x_defs 2017-06-08 14:59:55 -07:00
OWNERS kubeadm: remove maintainer @pires. 2017-04-18 12:11:08 -07:00
kubeadm.go