
This changes the --legacy-userspace-proxy flag to be a string flag --proxy-mode. If specified, the flag will be respected ('userspace' and 'iptables' being valid values). If left blank (default) we will choose the "best". best means userspace for now UNLESS the user adds an annotation (net.experimental.kubernetes.io/proxy-mode) to their node, in which case we will try to use that. This allows people to try it on a single machine without fear of global failure and without it getting rolled back on reboots. It is a poor-man's config blob.
62 lines
1.9 KiB
Go
62 lines
1.9 KiB
Go
/*
|
|
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)
|
|
}
|
|
}
|
|
}
|