Merge pull request #10793 from olemarkus/automated-cherry-pick-of-#10…

…791-origin-release-1.20 Automated cherry pick of #10791: CSIMigrationAWSComplete feature gate does not work unless
kubernetes · Feb 11, 2021 · ed08c74 · ed08c74
2 parents 04f20fa + f79cf67
commit ed08c74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pkg/model/components/kubecontrollermanager.go b/pkg/model/components/kubecontrollermanager.go
@@ -158,6 +158,9 @@ func (b *KubeControllerManagerOptionsBuilder) BuildOptions(o interface{}) error
 		if _, found := kcm.FeatureGates["CSIMigrationAWSComplete"]; !found {
 			kcm.FeatureGates["CSIMigrationAWSComplete"] = "true"
 		}
+		if _, found := kcm.FeatureGates["CSIMigrationAWS"]; !found {
+			kcm.FeatureGates["CSIMigrationAWS"] = "true"
+		}
 	}
 
 	return nil

diff --git a/pkg/model/components/kubelet.go b/pkg/model/components/kubelet.go
@@ -209,6 +209,9 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
 	}
 
 	if clusterSpec.CloudConfig != nil && clusterSpec.CloudConfig.AWSEBSCSIDriver != nil && fi.BoolValue(clusterSpec.CloudConfig.AWSEBSCSIDriver.Enabled) {
+		if _, found := clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"]; !found {
+			clusterSpec.Kubelet.FeatureGates["CSIMigrationAWS"] = "true"
+		}
 		if _, found := clusterSpec.Kubelet.FeatureGates["CSIMigrationAWSComplete"]; !found {
 			clusterSpec.Kubelet.FeatureGates["CSIMigrationAWSComplete"] = "true"
 		}