diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 15d33176449..9f038b6fa42 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -98,7 +98,7 @@ func (s *ProxyServerConfig) AddFlags(fs *pflag.FlagSet) { const ( proxyModeUserspace = "userspace" proxyModeIptables = "iptables" - experimentalProxyModeAnnotation = "net.extensions.kubernetes.io/proxy-mode" + experimentalProxyModeAnnotation = "net.experimental.kubernetes.io/proxy-mode" ) func checkKnownProxyMode(proxyMode string) bool { diff --git a/cmd/kube-proxy/app/server_test.go b/cmd/kube-proxy/app/server_test.go index d15c46bd0c1..8bb7a22fc55 100644 --- a/cmd/kube-proxy/app/server_test.go +++ b/cmd/kube-proxy/app/server_test.go @@ -40,15 +40,15 @@ func Test_mayTryIptablesProxy(t *testing.T) { {"userspace", "", "", false}, {"iptables", "", "", true}, {"", "", "", false}, - {"", "net.extensions.kubernetes.io/proxy-mode", "userspace", false}, - {"", "net.extensions.kubernetes.io/proxy-mode", "iptables", true}, - {"", "net.extensions.kubernetes.io/proxy-mode", "other", false}, - {"", "net.extensions.kubernetes.io/proxy-mode", "", 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.extensions.kubernetes.io/proxy-mode", "userspace", false}, - {"userspace", "net.extensions.kubernetes.io/proxy-mode", "iptables", false}, - {"iptables", "net.extensions.kubernetes.io/proxy-mode", "userspace", true}, - {"iptables", "net.extensions.kubernetes.io/proxy-mode", "iptables", true}, + {"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{}