Merge pull request #57550 from m1093782566/cleanup-mode

Automatic merge from submit-queue (batch tested with PRs 57550, 60089). 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 inconsistent comment message **What this PR does / why we need it**: remove dead code in `/pkg/proxy/apis/kubeproxyconfig/validation/validation.go` - see duplicated codes in https://github.com/kubernetes/kubernetes/blob/master/pkg/proxy/apis/kubeproxyconfig/types.go#L155-L169 **Which issue(s) this PR fixes**: **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #57550 from m1093782566/cleanup-mode
be2880d6 · Kubernetes Submit Queue · GitHub · d5aba0c6 · 18193079 · be2880d6
Unverified Commit be2880d6 authored Feb 23, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 16 deletions

types.go pkg/proxy/apis/kubeproxyconfig/types.go +12 -6

types.go pkg/proxy/apis/kubeproxyconfig/v1alpha1/types.go +13 -10

No files found.
--- a/pkg/proxy/apis/kubeproxyconfig/types.go
+++ b/pkg/proxy/apis/kubeproxyconfig/types.go
@@ -146,13 +146,19 @@ type KubeProxyConfiguration struct {
 	ConfigSyncPeriod metav1.Duration
 }
-// Currently, four modes of proxying are available total: 'userspace' (older, stable), 'iptables'
+// Currently, three modes of proxy are available in Linux platform: 'userspace' (older, going to be EOL), 'iptables'
-// (newer, faster), 'ipvs', and 'kernelspace' (Windows only, newer).
+// (newer, faster), 'ipvs'(newest, better in performance and scalability).
 //
-// If blank, use the best-available proxy (currently iptables, but may change in
+// Two modes of proxy are available in Windows platform: 'userspace'(older, stable) and 'kernelspace' (newer, faster).
-// future versions). If the iptables proxy is selected, regardless of how, but
+//
-// the system's kernel or iptables versions are insufficient, this always falls
+// In Linux platform, if proxy mode is blank, use the best-available proxy (currently iptables, but may change in the
-// back to the userspace proxy.
+// future). If the iptables proxy is selected, regardless of how, but the system's kernel or iptables versions are
+// insufficient, this always falls back to the userspace proxy. IPVS mode will be enabled when proxy mode is set to 'ipvs',
+// and the fall back path is firstly iptables and then userspace.
+// In Windows platform, if proxy mode is blank, use the best-available proxy (currently userspace, but may change in the
+// future). If winkernel proxy is selected, regardless of how, but the Windows kernel can't support this mode of proxy,
+// this always falls back to the userspace proxy.
 type ProxyMode string
 const (

--- a/pkg/proxy/apis/kubeproxyconfig/v1alpha1/types.go
+++ b/pkg/proxy/apis/kubeproxyconfig/v1alpha1/types.go
@@ -142,14 +142,17 @@ type KubeProxyConfiguration struct {
 	ConfigSyncPeriod metav1.Duration `json:"configSyncPeriod"`
 }
-// Currently two modes of proxying are available: 'userspace' (older, stable) or 'iptables'
+// Currently, three modes of proxy are available in Linux platform: 'userspace' (older, going to be EOL), 'iptables'
-// (newer, faster). If blank, use the best-available proxy (currently iptables, but may
+// (newer, faster), 'ipvs'(newest, better in performance and scalability).
-// change in future versions).  If the iptables proxy is selected, regardless of how, but
+//
-// the system's kernel or iptables versions are insufficient, this always falls back to the
+// Two modes of proxy are available in Windows platform: 'userspace'(older, stable) and 'kernelspace' (newer, faster).
-// userspace proxy.
+//
-type ProxyMode string
+// In Linux platform, if proxy mode is blank, use the best-available proxy (currently iptables, but may change in the
+// future). If the iptables proxy is selected, regardless of how, but the system's kernel or iptables versions are
+// insufficient, this always falls back to the userspace proxy. IPVS mode will be enabled when proxy mode is set to 'ipvs',
+// and the fall back path is firstly iptables and then userspace.
-const (
+// In Windows platform, if proxy mode is blank, use the best-available proxy (currently userspace, but may change in the
-	ProxyModeUserspace ProxyMode = "userspace"
+// future). If winkernel proxy is selected, regardless of how, but the Windows kernel can't support this mode of proxy,
-	ProxyModeIPTables  ProxyMode = "iptables"
+// this always falls back to the userspace proxy.
-)
+type ProxyMode string