Merge pull request #70896 from ksubrmnn/overlay_dsr

Adding Windows Overlay support to Kube Proxy

cmd/kube-proxy/app/init_windows.go

@@ -37,4 +37,7 @@ func initForOS(windowsService bool) error {
 
 func (o *Options) addOSFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&o.WindowsService, "windows-service", o.WindowsService, "Enable Windows Service Control Manager API integration")
+	fs.StringVar(&o.config.Winkernel.SourceVip, "source-vip", o.config.Winkernel.SourceVip, "The IP address of the source VIP for non-DSR.")
+	fs.StringVar(&o.config.Winkernel.NetworkName, "network-name", o.config.Winkernel.NetworkName, "The name of the cluster network.")
+	fs.BoolVar(&o.config.Winkernel.EnableDSR, "enable-dsr", o.config.Winkernel.EnableDSR, "If true make kube-proxy apply DSR policies for service VIP")
 }

cmd/kube-proxy/app/server_windows.go

@@ -110,6 +110,7 @@ func newProxyServer(config *proxyconfigapi.KubeProxyConfiguration, cleanupAndExi
 			utilnode.GetNodeIP(client, hostname),
 			recorder,
 			healthzUpdater,
+			config.Winkernel,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("unable to create proxier: %v", err)

cmd/kubeadm/app/util/config/testdata/conversion/master/internal.yaml

@@ -67,6 +67,10 @@ ComponentConfigs:
     PortRange: ""
     ResourceContainer: /kube-proxy
     UDPIdleTimeout: 250ms
+    Winkernel:
+      EnableDSR: false
+      NetworkName: ""
+      SourceVip: ""
   Kubelet:
     Address: 1.2.3.4
     Authentication:

cmd/kubeadm/app/util/config/testdata/conversion/master/v1beta1.yaml

@@ -90,6 +90,10 @@ oomScoreAdj: -999
 portRange: ""
 resourceContainer: /kube-proxy
 udpIdleTimeout: 250ms
+winkernel:
+  enableDSR: false
+  networkName: ""
+  sourceVip: ""
 ---
 address: 1.2.3.4
 apiVersion: kubelet.config.k8s.io/v1beta1

cmd/kubeadm/app/util/config/testdata/defaulting/master/defaulted.yaml

@@ -76,6 +76,10 @@ oomScoreAdj: -999
 portRange: ""
 resourceContainer: /kube-proxy
 udpIdleTimeout: 250ms
+winkernel:
+  enableDSR: false
+  networkName: ""
+  sourceVip: ""
 ---
 address: 0.0.0.0
 apiVersion: kubelet.config.k8s.io/v1beta1