Merge pull request #16708 from rifelpet/aws-plugin-unregister

Fix InTreePluginAWSUnregister feature gate removal in 1.31

Author: k8s-ci-robot

pkg/model/components/apiserver.go

@@ -183,10 +183,8 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
 
 	if clusterSpec.CloudProvider.AWS != nil {
 
-		if _, found := c.FeatureGates["InTreePluginAWSUnregister"]; !found {
+		if _, found := c.FeatureGates["InTreePluginAWSUnregister"]; !found && b.IsKubernetesLT("1.31") {
 			c.FeatureGates["InTreePluginAWSUnregister"] = "true"
-		} else if b.IsKubernetesGTE("1.31") {
-			delete(c.FeatureGates, "InTreePluginAWSUnregister")
 		}
 
 		if _, found := c.FeatureGates["CSIMigrationAWS"]; !found && b.IsKubernetesLT("1.27") {

pkg/model/components/kubecontrollermanager.go

@@ -149,10 +149,8 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
 			kcm.FeatureGates = make(map[string]string)
 		}
 
-		if _, found := kcm.FeatureGates["InTreePluginAWSUnregister"]; !found {
+		if _, found := kcm.FeatureGates["InTreePluginAWSUnregister"]; !found && b.IsKubernetesLT("1.31") {
 			kcm.FeatureGates["InTreePluginAWSUnregister"] = "true"
-		} else if b.IsKubernetesGTE("1.31") {
-			delete(kcm.FeatureGates, "InTreePluginAWSUnregister")
 		}
 
 		if _, found := kcm.FeatureGates["CSIMigrationAWS"]; !found && b.IsKubernetesLT("1.27") {

pkg/model/components/kubelet.go

@@ -172,14 +172,12 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 	}
 
 	if clusterSpec.CloudProvider.AWS != nil {
-		if _, found := clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"]; !found && b.IsKubernetesLT("1.27") {
-			clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"] = "true"
+		if _, found := clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"]; !found && b.IsKubernetesLT("1.31") {
+			clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"] = "true"
 		}
 
-		if _, found := clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"]; !found {
-			clusterSpec.Kubelet.FeatureGates["InTreePluginAWSUnregister"] = "true"
-		} else if b.IsKubernetesGTE("1.31") {
-			delete(clusterSpec.Kubelet.FeatureGates, "InTreePluginAWSUnregister")
+		if _, found := clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"]; !found && b.IsKubernetesLT("1.27") {
+			clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"] = "true"
 		}
 	}
 

pkg/model/components/kubescheduler.go

@@ -63,10 +63,8 @@ func (b *KubeSchedulerOptionsBuilder) BuildOptions(o interface{}) error {
 			config.FeatureGates = make(map[string]string)
 		}
 
-		if _, found := config.FeatureGates["InTreePluginAWSUnregister"]; !found {
+		if _, found := config.FeatureGates["InTreePluginAWSUnregister"]; !found && b.IsKubernetesLT("1.31") {
 			config.FeatureGates["InTreePluginAWSUnregister"] = "true"
-		} else if b.IsKubernetesGTE("1.31") {
-			delete(clusterSpec.Kubelet.FeatureGates, "InTreePluginAWSUnregister")
 		}
 
 		if _, found := config.FeatureGates["CSIMigrationAWS"]; !found && b.IsKubernetesLT("1.27") {