Merge pull request #14310 from thockin/kube-proxy-mode-annotation

Auto commit by PR queue bot

cmd/kube-proxy/app/server.go

@@ -60,7 +60,7 @@ type ProxyServer struct {
 	PortRange          util.PortRange
 	Recorder           record.EventRecorder
 	HostnameOverride   string
-	ForceUserspaceProxy bool
+	ProxyMode          string
 	SyncPeriod         time.Duration
 	nodeRef            *api.ObjectReference // Reference to this node.
 	MasqueradeAll      bool
@@ -90,12 +90,26 @@ func (s *ProxyServer) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.Kubeconfig, "kubeconfig", s.Kubeconfig, "Path to kubeconfig file with authorization information (the master location is set by the master flag).")
 	fs.Var(&s.PortRange, "proxy-port-range", "Range of host ports (beginPort-endPort, inclusive) that may be consumed in order to proxy service traffic. If unspecified (0-0) then ports will be randomly chosen.")
 	fs.StringVar(&s.HostnameOverride, "hostname-override", s.HostnameOverride, "If non-empty, will use this string as identification instead of the actual hostname.")
-	fs.BoolVar(&s.ForceUserspaceProxy, "legacy-userspace-proxy", true, "Use the legacy userspace proxy (instead of the pure iptables proxy).")
+	fs.StringVar(&s.ProxyMode, "proxy-mode", "", "Which proxy mode to use: 'userspace' (older, stable) or 'iptables' (experimental). If blank, look at the Node object on the Kubernetes API and respect the '"+experimentalProxyModeAnnotation+"' annotation if provided.  Otherwise use the best-available proxy (currently userspace, 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.")
 	fs.DurationVar(&s.SyncPeriod, "iptables-sync-period", 5*time.Second, "How often iptables rules are refreshed (e.g. '5s', '1m', '2h22m').  Must be greater than 0.")
 	fs.BoolVar(&s.MasqueradeAll, "masquerade-all", false, "If using the pure iptables proxy, SNAT everything")
 	fs.BoolVar(&s.CleanupAndExit, "cleanup-iptables", false, "If true cleanup iptables rules and exit.")
 }
 
+const (
+	proxyModeUserspace              = "userspace"
+	proxyModeIptables               = "iptables"
+	experimentalProxyModeAnnotation = "net.experimental.kubernetes.io/proxy-mode"
+)
+
+func checkKnownProxyMode(proxyMode string) bool {
+	switch proxyMode {
+	case "", proxyModeUserspace, proxyModeIptables:
+		return true
+	}
+	return false
+}
+
 // Run runs the specified ProxyServer.  This should never exit (unless CleanupAndExit is set).
 func (s *ProxyServer) Run(_ []string) error {
 	protocol := utiliptables.ProtocolIpv4
@@ -149,15 +163,15 @@ func (s *ProxyServer) Run(_ []string) error {
 	}
 
 	// Add event recorder
-	Hostname := nodeutil.GetHostname(s.HostnameOverride)
+	hostname := nodeutil.GetHostname(s.HostnameOverride)
 	eventBroadcaster := record.NewBroadcaster()
-	s.Recorder = eventBroadcaster.NewRecorder(api.EventSource{Component: "kube-proxy", Host: Hostname})
+	s.Recorder = eventBroadcaster.NewRecorder(api.EventSource{Component: "kube-proxy", Host: hostname})
 	eventBroadcaster.StartRecordingToSink(client.Events(""))
 
 	s.nodeRef = &api.ObjectReference{
 		Kind:      "Node",
-		Name:      Hostname,
+		Name:      hostname,
-		UID:       types.UID(Hostname),
+		UID:       types.UID(hostname),
 		Namespace: "",
 	}
 
@@ -171,17 +185,21 @@ func (s *ProxyServer) Run(_ []string) error {
 	dbus := utildbus.New()
 	ipt := utiliptables.New(execer, dbus, protocol)
 
-	shouldUseIptables := false
+	if !checkKnownProxyMode(s.ProxyMode) {
-	if !s.ForceUserspaceProxy {
+		glog.Fatalf("Unknown proxy-mode flag: %s", s.ProxyMode)
+	}
+
+	useIptablesProxy := false
+	if mayTryIptablesProxy(s.ProxyMode, client.Nodes(), hostname) {
 		var err error
 		// guaranteed false on error, error only necessary for debugging
-		shouldUseIptables, err = iptables.ShouldUseIptablesProxier()
+		useIptablesProxy, err = iptables.ShouldUseIptablesProxier()
 		if err != nil {
 			glog.Errorf("Can't determine whether to use iptables proxy, using userspace proxier: %v", err)
 		}
 	}
 
-	if shouldUseIptables {
+	if useIptablesProxy {
 		glog.V(2).Info("Using iptables Proxier.")
 
 		proxierIptables, err := iptables.NewProxier(ipt, execer, s.SyncPeriod, s.MasqueradeAll)
@@ -193,7 +211,6 @@ func (s *ProxyServer) Run(_ []string) error {
 		// No turning back. Remove artifacts that might still exist from the userspace Proxier.
 		glog.V(2).Info("Tearing down userspace rules. Errors here are acceptable.")
 		userspace.CleanupLeftovers(ipt)
-
 	} else {
 		glog.V(2).Info("Using userspace Proxier.")
 		// This is a proxy.LoadBalancer which NewProxier needs but has methods we don't need for
@@ -247,6 +264,44 @@ func (s *ProxyServer) Run(_ []string) error {
 	return nil
 }
 
+type nodeGetter interface {
+	Get(hostname string) (*api.Node, error)
+}
+
+func mayTryIptablesProxy(proxyMode string, client nodeGetter, hostname string) bool {
+	if proxyMode == proxyModeIptables {
+		glog.V(1).Infof("Flag proxy-mode allows iptables proxy")
+		return true
+	} else if proxyMode != "" {
+		glog.V(1).Infof("Flag proxy-mode=%q forbids iptables proxy", proxyMode)
+		return false
+	}
+	// proxyMode == "" - choose the best option.
+	if client == nil {
+		glog.Errorf("Not trying iptables proxy: nodeGetter is nil")
+		return false
+	}
+	node, err := client.Get(hostname)
+	if err != nil {
+		glog.Errorf("Not trying iptables proxy: can't get Node %q: %v", hostname, err)
+		return false
+	}
+	if node == nil {
+		glog.Errorf("Not trying iptables proxy: got nil Node %q", hostname)
+		return false
+	}
+	proxyMode, found := node.Annotations[experimentalProxyModeAnnotation]
+	if found {
+		glog.V(1).Infof("Found experimental annotation %q = %q", experimentalProxyModeAnnotation, proxyMode)
+	}
+	if proxyMode == proxyModeIptables {
+		glog.V(1).Infof("Annotation allows iptables proxy")
+		return true
+	}
+	glog.V(1).Infof("Not trying iptables proxy: %+v", node)
+	return false
+}
+
 func (s *ProxyServer) birthCry() {
 	s.Recorder.Eventf(s.nodeRef, "Starting", "Starting kube-proxy.")
 }

cmd/kube-proxy/app/server_test.go

@@ -0,0 +1,61 @@
+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package app
+
+import (
+	"testing"
+
+	"k8s.io/kubernetes/pkg/api"
+)
+
+type fakeNodeInterface struct {
+	node api.Node
+}
+
+func (fake *fakeNodeInterface) Get(hostname string) (*api.Node, error) {
+	return &fake.node, nil
+}
+
+func Test_mayTryIptablesProxy(t *testing.T) {
+	var cases = []struct {
+		flag     string
+		annKey   string
+		annVal   string
+		expected bool
+	}{
+		{"userspace", "", "", false},
+		{"iptables", "", "", true},
+		{"", "", "", false},
+		{"", "net.experimental.kubernetes.io/proxy-mode", "userspace", false},
+		{"", "net.experimental.kubernetes.io/proxy-mode", "iptables", true},
+		{"", "net.experimental.kubernetes.io/proxy-mode", "other", false},
+		{"", "net.experimental.kubernetes.io/proxy-mode", "", false},
+		{"", "proxy-mode", "iptables", false},
+		{"userspace", "net.experimental.kubernetes.io/proxy-mode", "userspace", false},
+		{"userspace", "net.experimental.kubernetes.io/proxy-mode", "iptables", false},
+		{"iptables", "net.experimental.kubernetes.io/proxy-mode", "userspace", true},
+		{"iptables", "net.experimental.kubernetes.io/proxy-mode", "iptables", true},
+	}
+	for i, c := range cases {
+		getter := &fakeNodeInterface{}
+		getter.node.Annotations = map[string]string{c.annKey: c.annVal}
+		r := mayTryIptablesProxy(c.flag, getter, "host")
+		if r != c.expected {
+			t.Errorf("Case[%d] Expected %t, got %t", i, c.expected, r)
+		}
+	}
+}

hack/verify-flags/known-flags.txt

@@ -143,7 +143,6 @@ kubelet-timeout
 kube-master
 label-columns
 last-release-pr
-legacy-userspace-proxy
 limit-bytes
 load-balancer-ip
 log-flush-frequency
@@ -210,6 +209,7 @@ private-mountns
 prom-push-gateway
 proxy-bindall
 proxy-logv
+proxy-mode
 proxy-port-range
 public-address-override
 pvclaimbinder-sync-period