Skip to content

Commit 686ffd3

Browse files
authored
Merge pull request kubernetes#94514 from tangwz/remove_SupportIPVSProxyMode
remove feature gate SupportIPVSProxyMode.
2 parents 058b4d6 + a143803 commit 686ffd3

File tree

2 files changed

+3
-23
lines changed

2 files changed

+3
-23
lines changed

pkg/features/kube_features.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,6 @@ const (
194194
// Postpone deletion of a PV or a PVC when they are being used
195195
StorageObjectInUseProtection featuregate.Feature = "StorageObjectInUseProtection"
196196

197-
// owner: @m1093782566
198-
// GA: v1.11
199-
//
200-
// Implement IPVS-based in-cluster service load balancing
201-
SupportIPVSProxyMode featuregate.Feature = "SupportIPVSProxyMode"
202-
203197
// owner: @dims, @derekwaynecarr
204198
// alpha: v1.10
205199
// beta: v1.14
@@ -682,7 +676,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
682676
CSINodeInfo: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.19
683677
BlockVolume: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.20
684678
StorageObjectInUseProtection: {Default: true, PreRelease: featuregate.GA},
685-
SupportIPVSProxyMode: {Default: true, PreRelease: featuregate.GA},
686679
SupportPodPidsLimit: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.21
687680
SupportNodePidsLimit: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.21
688681
HyperVContainer: {Default: false, PreRelease: featuregate.Alpha},

pkg/proxy/ipvs/README.md

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -334,29 +334,20 @@ export KUBE_PROXY_MODE=ipvs
334334

335335
### Cluster Created by Kubeadm
336336

337-
If you are using kubeadm with a [configuration file](https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file), you have to add `mode: ipvs` and also add `SupportIPVSProxyMode: true` below the `kubeProxy` field as part of the kubeadm configuration.
337+
If you are using kubeadm with a [configuration file](https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file), you have to add `mode: ipvs` below the `kubeProxy` field as part of the kubeadm configuration.
338338

339339
```yaml
340340
...
341341
kubeProxy:
342342
config:
343-
featureGates:
344-
SupportIPVSProxyMode: true
345343
mode: ipvs
346344
...
347345
```
348-
Note that in Kubernetes 1.11 and later, `SupportIPVSProxyMode` is set to `true` by default.
349346

350347
before running
351348

352349
`kube init --config <path_to_configuration_file>`
353350

354-
If you are using Kubernetes v1.8, you can also add the flag `--feature-gates=SupportIPVSProxyMode=true` (deprecated since v1.9) in `kubeadm init` command
355-
356-
```
357-
kubeadm init --feature-gates=SupportIPVSProxyMode=true
358-
```
359-
360351
to specify the ipvs mode before deploying the cluster.
361352

362353
**Notes**
@@ -412,14 +403,10 @@ UDP 10.0.0.10:53 rr
412403

413404
Use the following check list to help you solve the problems:
414405

415-
**1. Enable IPVS feature gateway**
416-
417-
For Kubernetes v1.10 and later, feature gate `SupportIPVSProxyMode` is set to `true` by default. However, you need to enable `--feature-gates=SupportIPVSProxyMode=true` explicitly for Kubernetes before v1.10.
418-
419-
**2. Specify proxy-mode=ipvs**
406+
**1. Specify proxy-mode=ipvs**
420407

421408
Check whether the kube-proxy mode has been set to `ipvs`.
422409

423-
**3. Install required kernel modules and packages**
410+
**2. Install required kernel modules and packages**
424411

425412
Check whether the IPVS required kernel modules have been compiled into the kernel and packages installed. (see Prerequisite)

0 commit comments

Comments
 (0)