Make kube-proxy default to iptables (regression)

This was accidentally introduced as part of the component config changes.
This commit is contained in:
Tim Hockin
2016-02-01 17:34:47 -08:00
parent ba13454430
commit 7ed83ad4f9
6 changed files with 25 additions and 8 deletions

View File

@@ -63,9 +63,9 @@ type KubeProxyConfiguration struct {
}
// Currently two modes of proxying are available: 'userspace' (older, stable) or 'iptables'
// (experimental). If blank, look at the Node object on the Kubernetes API and respect the
// (newer, faster). If blank, look at the Node object on the Kubernetes API and respect the
// 'net.experimental.kubernetes.io/proxy-mode' annotation if provided. Otherwise use the
// best-available proxy (currently userspace, but may change in future versions). If the
// best-available proxy (currently iptables, but may change in future versions). If the
// iptables proxy is selected, regardless of how, but the system's kernel or iptables
// versions are insufficient, this always falls back to the userspace proxy.
type ProxyMode string