Skip to content

Commit 6451ef6

Browse files
committed
Remove KubeletPluginsWatcher feature gate
The feature gate was already beta in 1.13 (least supported version of Alicloud/Packet which were using it) and enabled by default, it graduated to GA in 1.14. We never needed to explicitly enable it, we just have to make sure that it's not disabled. See kubernetes/kubernetes#79310
1 parent e97ba0c commit 6451ef6

File tree

4 files changed

+0
-10
lines changed

4 files changed

+0
-10
lines changed

controllers/provider-alicloud/pkg/webhook/controlplane/ensurer.go

-3
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ func ensureKubeAPIServerCommandLineArgs(c *corev1.Container) {
7979
"CSINodeInfo=true", ",")
8080
c.Command = extensionswebhook.EnsureStringWithPrefixContains(c.Command, "--feature-gates=",
8181
"CSIDriverRegistry=true", ",")
82-
c.Command = extensionswebhook.EnsureStringWithPrefixContains(c.Command, "--feature-gates=",
83-
"KubeletPluginsWatcher=true", ",")
8482
}
8583

8684
func ensureKubeControllerManagerCommandLineArgs(c *corev1.Container) {
@@ -113,6 +111,5 @@ func (e *ensurer) EnsureKubeletConfiguration(ctx context.Context, kubeletConfig
113111
kubeletConfig.FeatureGates["VolumeSnapshotDataSource"] = true
114112
kubeletConfig.FeatureGates["CSINodeInfo"] = true
115113
kubeletConfig.FeatureGates["CSIDriverRegistry"] = true
116-
kubeletConfig.FeatureGates["KubeletPluginsWatcher"] = true
117114
return nil
118115
}

controllers/provider-alicloud/pkg/webhook/controlplane/ensurer_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ var _ = Describe("Ensurer", func() {
218218
"VolumeSnapshotDataSource": true,
219219
"CSINodeInfo": true,
220220
"CSIDriverRegistry": true,
221-
"KubeletPluginsWatcher": true,
222221
},
223222
}
224223
)
@@ -245,7 +244,6 @@ func checkKubeAPIServerDeployment(dep *appsv1.Deployment) {
245244
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "VolumeSnapshotDataSource=true", ","))
246245
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "CSINodeInfo=true", ","))
247246
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "CSIDriverRegistry=true", ","))
248-
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "KubeletPluginsWatcher=true", ","))
249247
}
250248

251249
func checkKubeControllerManagerDeployment(dep *appsv1.Deployment) {

controllers/provider-packet/pkg/webhook/controlplane/ensurer.go

-3
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ func ensureKubeAPIServerCommandLineArgs(c *corev1.Container) {
9191
"CSINodeInfo=true", ",")
9292
c.Command = extensionswebhook.EnsureStringWithPrefixContains(c.Command, "--feature-gates=",
9393
"CSIDriverRegistry=true", ",")
94-
c.Command = extensionswebhook.EnsureStringWithPrefixContains(c.Command, "--feature-gates=",
95-
"KubeletPluginsWatcher=true", ",")
9694
}
9795

9896
func ensureKubeControllerManagerCommandLineArgs(c *corev1.Container) {
@@ -142,6 +140,5 @@ func (e *ensurer) EnsureKubeletConfiguration(ctx context.Context, kubeletConfig
142140
kubeletConfig.FeatureGates["VolumeSnapshotDataSource"] = true
143141
kubeletConfig.FeatureGates["CSINodeInfo"] = true
144142
kubeletConfig.FeatureGates["CSIDriverRegistry"] = true
145-
kubeletConfig.FeatureGates["KubeletPluginsWatcher"] = true
146143
return nil
147144
}

controllers/provider-packet/pkg/webhook/controlplane/ensurer_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ var _ = Describe("Ensurer", func() {
253253
"VolumeSnapshotDataSource": true,
254254
"CSINodeInfo": true,
255255
"CSIDriverRegistry": true,
256-
"KubeletPluginsWatcher": true,
257256
},
258257
}
259258
)
@@ -280,7 +279,6 @@ func checkKubeAPIServerDeployment(dep *appsv1.Deployment, annotations map[string
280279
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "VolumeSnapshotDataSource=true", ","))
281280
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "CSINodeInfo=true", ","))
282281
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "CSIDriverRegistry=true", ","))
283-
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "KubeletPluginsWatcher=true", ","))
284282

285283
// Check that the Pod template contains all needed checksum annotations
286284
Expect(dep.Spec.Template.Annotations).To(Equal(annotations))

0 commit comments

Comments
 (0)