net.extensions.kubernetes -> net.experimental.kubernetes

This commit is contained in:
Chao Xu 2015-10-09 15:49:42 -07:00
parent 7c9f4cc42f
commit 4342e1d789
2 changed files with 9 additions and 9 deletions

View File

@ -98,7 +98,7 @@ func (s *ProxyServerConfig) AddFlags(fs *pflag.FlagSet) {
const ( const (
proxyModeUserspace = "userspace" proxyModeUserspace = "userspace"
proxyModeIptables = "iptables" proxyModeIptables = "iptables"
experimentalProxyModeAnnotation = "net.extensions.kubernetes.io/proxy-mode" experimentalProxyModeAnnotation = "net.experimental.kubernetes.io/proxy-mode"
) )
func checkKnownProxyMode(proxyMode string) bool { func checkKnownProxyMode(proxyMode string) bool {

View File

@ -40,15 +40,15 @@ func Test_mayTryIptablesProxy(t *testing.T) {
{"userspace", "", "", false}, {"userspace", "", "", false},
{"iptables", "", "", true}, {"iptables", "", "", true},
{"", "", "", false}, {"", "", "", false},
{"", "net.extensions.kubernetes.io/proxy-mode", "userspace", false}, {"", "net.experimental.kubernetes.io/proxy-mode", "userspace", false},
{"", "net.extensions.kubernetes.io/proxy-mode", "iptables", true}, {"", "net.experimental.kubernetes.io/proxy-mode", "iptables", true},
{"", "net.extensions.kubernetes.io/proxy-mode", "other", false}, {"", "net.experimental.kubernetes.io/proxy-mode", "other", false},
{"", "net.extensions.kubernetes.io/proxy-mode", "", false}, {"", "net.experimental.kubernetes.io/proxy-mode", "", false},
{"", "proxy-mode", "iptables", false}, {"", "proxy-mode", "iptables", false},
{"userspace", "net.extensions.kubernetes.io/proxy-mode", "userspace", false}, {"userspace", "net.experimental.kubernetes.io/proxy-mode", "userspace", false},
{"userspace", "net.extensions.kubernetes.io/proxy-mode", "iptables", false}, {"userspace", "net.experimental.kubernetes.io/proxy-mode", "iptables", false},
{"iptables", "net.extensions.kubernetes.io/proxy-mode", "userspace", true}, {"iptables", "net.experimental.kubernetes.io/proxy-mode", "userspace", true},
{"iptables", "net.extensions.kubernetes.io/proxy-mode", "iptables", true}, {"iptables", "net.experimental.kubernetes.io/proxy-mode", "iptables", true},
} }
for i, c := range cases { for i, c := range cases {
getter := &fakeNodeInterface{} getter := &fakeNodeInterface{}