Merge pull request kubernetes#92836 from aojea/minsyncperiod

k8s-ci-robot · web-flow · commit 76e3b255e19a · 2020-07-11T20:56:03.000-07:00
kube-proxy iptables min-sync-period default 1sec
diff --git a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/v1alpha1.yaml b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/after/v1alpha1.yaml
@@ -21,7 +21,7 @@ hostnameOverride: ""
 iptables:
   masqueradeAll: false
   masqueradeBit: 14
-  minSyncPeriod: 0s
+  minSyncPeriod: 1s
   syncPeriod: 30s
 ipvs:
   excludeCIDRs: null
diff --git a/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/roundtrip/default/v1alpha1.yaml b/pkg/proxy/apis/config/scheme/testdata/KubeProxyConfiguration/roundtrip/default/v1alpha1.yaml
@@ -21,7 +21,7 @@ hostnameOverride: ""
 iptables:
   masqueradeAll: false
   masqueradeBit: 14
-  minSyncPeriod: 0s
+  minSyncPeriod: 1s
   syncPeriod: 30s
 ipvs:
   excludeCIDRs: null
diff --git a/pkg/proxy/apis/config/v1alpha1/defaults.go b/pkg/proxy/apis/config/v1alpha1/defaults.go
@@ -61,6 +61,9 @@ func SetDefaults_KubeProxyConfiguration(obj *kubeproxyconfigv1alpha1.KubeProxyCo
 	if obj.IPTables.SyncPeriod.Duration == 0 {
 		obj.IPTables.SyncPeriod = metav1.Duration{Duration: 30 * time.Second}
 	}
+	if obj.IPTables.MinSyncPeriod.Duration == 0 {
+		obj.IPTables.MinSyncPeriod = metav1.Duration{Duration: 1 * time.Second}
+	}
 	if obj.IPVS.SyncPeriod.Duration == 0 {
 		obj.IPVS.SyncPeriod = metav1.Duration{Duration: 30 * time.Second}
 	}

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ func SetDefaults_KubeProxyConfiguration(obj *kubeproxyconfigv1alpha1.KubeProxyCo`
`61`	`61`	`if obj.IPTables.SyncPeriod.Duration == 0 {`
`62`	`62`	`obj.IPTables.SyncPeriod = metav1.Duration{Duration: 30 * time.Second}`
`63`	`63`	`}`
	`64`	`+ if obj.IPTables.MinSyncPeriod.Duration == 0 {`
	`65`	`+ obj.IPTables.MinSyncPeriod = metav1.Duration{Duration: 1 * time.Second}`
	`66`	`+ }`
`64`	`67`	`if obj.IPVS.SyncPeriod.Duration == 0 {`
`65`	`68`	`obj.IPVS.SyncPeriod = metav1.Duration{Duration: 30 * time.Second}`
`66`	`69`	`}`