Merge pull request #58035 from m1093782566/windows-proxy-mode

Automatic merge from submit-queue (batch tested with PRs 58375, 58306, 58386, 57420, 58035). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix windows UT for proxy mode **What this PR does / why we need it**: /kind bug Fix windows UT for proxy mode. Run UTs for `kubeproxyconfig/validation` in windows, ``` === RUN TestValidateKubeProxyConfiguration --- FAIL: TestValidateKubeProxyConfiguration (0.00s) validation_test.go:83: expected success: [KubeProxyConfiguration.Mode.ProxyMode: Invalid value: "ipvs": must be kernelspace,userspace or blank (blank means the most-available proxy [currently userspace])] ``` That's because proxy mode "IPVS" is not valid in windows. **Which issue(s) this PR fixes**: Fixes #58037 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #58035 from m1093782566/windows-proxy-mode
550c0155 · Kubernetes Submit Queue · GitHub · 658ca939 · 988c4ae6 · 550c0155
Unverified Commit 550c0155 authored Jan 17, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

validation_test.go pkg/proxy/apis/kubeproxyconfig/validation/validation_test.go +7 -1

No files found.
--- a/pkg/proxy/apis/kubeproxyconfig/validation/validation_test.go
+++ b/pkg/proxy/apis/kubeproxyconfig/validation/validation_test.go
@@ -30,6 +30,12 @@ import (
 )

 func TestValidateKubeProxyConfiguration(t *testing.T) {
+	var proxyMode kubeproxyconfig.ProxyMode
+	if runtime.GOOS == "windows" {
+		proxyMode = kubeproxyconfig.ProxyModeKernelspace
+	} else {
+		proxyMode = kubeproxyconfig.ProxyModeIPVS
+	}
 	successCases := []kubeproxyconfig.KubeProxyConfiguration{
 		{
 			BindAddress:        "192.168.59.103",
@@ -43,7 +49,7 @@ func TestValidateKubeProxyConfiguration(t *testing.T) {
 				SyncPeriod:    metav1.Duration{Duration: 5 * time.Second},
 				MinSyncPeriod: metav1.Duration{Duration: 2 * time.Second},
 			},
-			Mode: kubeproxyconfig.ProxyModeIPVS,
+			Mode: proxyMode,
 			IPVS: kubeproxyconfig.KubeProxyIPVSConfiguration{
 				SyncPeriod:    metav1.Duration{Duration: 10 * time.Second},
 				MinSyncPeriod: metav1.Duration{Duration: 5 * time.Second},