Skip to content

K
k3s
Commit 4342e1d7 authored by Chao Xu's avatar Chao Xu
Browse files
Options

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

parent 7c9f4cc4
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
cmd/kube-proxy/app/server.go
View file @ 4342e1d7
...@@ -98,7 +98,7 @@ func (s *ProxyServerConfig) AddFlags(fs *pflag.FlagSet) { ...@@ -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 {
......
cmd/kube-proxy/app/server_test.go
View file @ 4342e1d7
...@@ -40,15 +40,15 @@ func Test_mayTryIptablesProxy(t *testing.T) { ...@@ -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{}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment