Skip to content
This repository has been archived by the owner on Apr 7, 2020. It is now read-only.

Commit

Permalink
Remove KubeletPluginsWatcher feature gate
Browse files Browse the repository at this point in the history
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
  • Loading branch information
rfranzke committed Sep 20, 2019
1 parent d3d0343 commit ed6192b
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ func ensureKubeAPIServerCommandLineArgs(c *corev1.Container) {
"CSINodeInfo=true", ",")
c.Command = extensionswebhook.EnsureStringWithPrefixContains(c.Command, "--feature-gates=",
"CSIDriverRegistry=true", ",")
c.Command = extensionswebhook.EnsureStringWithPrefixContains(c.Command, "--feature-gates=",
"KubeletPluginsWatcher=true", ",")
}

func ensureKubeControllerManagerCommandLineArgs(c *corev1.Container) {
Expand Down Expand Up @@ -113,6 +111,5 @@ func (e *ensurer) EnsureKubeletConfiguration(ctx context.Context, kubeletConfig
kubeletConfig.FeatureGates["VolumeSnapshotDataSource"] = true
kubeletConfig.FeatureGates["CSINodeInfo"] = true
kubeletConfig.FeatureGates["CSIDriverRegistry"] = true
kubeletConfig.FeatureGates["KubeletPluginsWatcher"] = true
return nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ var _ = Describe("Ensurer", func() {
"VolumeSnapshotDataSource": true,
"CSINodeInfo": true,
"CSIDriverRegistry": true,
"KubeletPluginsWatcher": true,
},
}
)
Expand All @@ -245,7 +244,6 @@ func checkKubeAPIServerDeployment(dep *appsv1.Deployment) {
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "VolumeSnapshotDataSource=true", ","))
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "CSINodeInfo=true", ","))
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "CSIDriverRegistry=true", ","))
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "KubeletPluginsWatcher=true", ","))
}

func checkKubeControllerManagerDeployment(dep *appsv1.Deployment) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ func ensureKubeAPIServerCommandLineArgs(c *corev1.Container) {
"CSINodeInfo=true", ",")
c.Command = extensionswebhook.EnsureStringWithPrefixContains(c.Command, "--feature-gates=",
"CSIDriverRegistry=true", ",")
c.Command = extensionswebhook.EnsureStringWithPrefixContains(c.Command, "--feature-gates=",
"KubeletPluginsWatcher=true", ",")
}

func ensureKubeControllerManagerCommandLineArgs(c *corev1.Container) {
Expand Down Expand Up @@ -142,6 +140,5 @@ func (e *ensurer) EnsureKubeletConfiguration(ctx context.Context, kubeletConfig
kubeletConfig.FeatureGates["VolumeSnapshotDataSource"] = true
kubeletConfig.FeatureGates["CSINodeInfo"] = true
kubeletConfig.FeatureGates["CSIDriverRegistry"] = true
kubeletConfig.FeatureGates["KubeletPluginsWatcher"] = true
return nil
}
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,6 @@ var _ = Describe("Ensurer", func() {
"VolumeSnapshotDataSource": true,
"CSINodeInfo": true,
"CSIDriverRegistry": true,
"KubeletPluginsWatcher": true,
},
}
)
Expand All @@ -280,7 +279,6 @@ func checkKubeAPIServerDeployment(dep *appsv1.Deployment, annotations map[string
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "VolumeSnapshotDataSource=true", ","))
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "CSINodeInfo=true", ","))
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "CSIDriverRegistry=true", ","))
Expect(c.Command).To(test.ContainElementWithPrefixContaining("--feature-gates=", "KubeletPluginsWatcher=true", ","))

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

0 comments on commit ed6192b

Please sign in to comment.