Add the CSIMigration and CSIMigrationComplete fields to the API

pkg/apis/kubeone/types.go

@@ -152,6 +152,28 @@ type APIEndpoint struct {
 type CloudProviderSpec struct {
 	// External
 	External bool `json:"external,omitempty"`
+	// CSIMigration enables the CSIMigration and CSIMigration{Provider} feature gates
+	// for providers that support the CSI migration.
+	// The CSI migration stability depends on the provider.
+	// More details about stability can be found in the Feature Gates document:
+	// https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/
+	//
+	// Note: Azure has two type of CSI drivers (AzureFile and AzureDisk) and two different
+	// feature gates (CSIMigrationAzureDisk and CSIMigrationAzureFile). Enabling CSI migration
+	// enables both feature gates. If one CSI driver is not deployed, the volume operations
+	// for volumes with missing CSI driver will fallback to the in-tree volume plugin.
+	CSIMigration bool `json:"csiMigration,omitempty"`
+	// CSIMigrationComplete enables the CSIMigration{Provider}Complete feature gate
+	// for providers that support the CSI migration.
+	// This feature gate disables fallback to the in-tree volume plugins, therefore,
+	// it should be enabled only if the CSI driver is deploy on all nodes, and after
+	// ensuring that the CSI driver works properly.
+	//
+	// Note: If you're running on Azure, make sure that you have both AzureFile
+	// and AzureDisk CSI drivers deployed, as enabling this feature disables the fallback
+	// to the in-tree volume plugins. See description for the CSIMigration field for
+	// more details.
+	CSIMigrationComplete bool `json:"csiMigrationComplete,omitempty"`
 	// CloudConfig
 	CloudConfig string `json:"cloudConfig,omitempty"`
 	// AWS

pkg/apis/kubeone/v1beta1/types.go

@@ -152,6 +152,28 @@ type APIEndpoint struct {
 type CloudProviderSpec struct {
 	// External
 	External bool `json:"external,omitempty"`
+	// CSIMigration enables the CSIMigration and CSIMigration{Provider} feature gates
+	// for providers that support the CSI migration.
+	// The CSI migration stability depends on the provider.
+	// More details about stability can be found in the Feature Gates document:
+	// https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/
+	//
+	// Note: Azure has two type of CSI drivers (AzureFile and AzureDisk) and two different
+	// feature gates (CSIMigrationAzureDisk and CSIMigrationAzureFile). Enabling CSI migration
+	// enables both feature gates. If one CSI driver is not deployed, the volume operations
+	// for volumes with missing CSI driver will fallback to the in-tree volume plugin.
+	CSIMigration bool `json:"csiMigration,omitempty"`
+	// CSIMigrationComplete enables the CSIMigration{Provider}Complete feature gate
+	// for providers that support the CSI migration.
+	// This feature gate disables fallback to the in-tree volume plugins, therefore,
+	// it should be enabled only if the CSI driver is deploy on all nodes, and after
+	// ensuring that the CSI driver works properly.
+	//
+	// Note: If you're running on Azure, make sure that you have both AzureFile
+	// and AzureDisk CSI drivers deployed, as enabling this feature disables the fallback
+	// to the in-tree volume plugins. See description for the CSIMigration field for
+	// more details.
+	CSIMigrationComplete bool `json:"csiMigrationComplete,omitempty"`
 	// CloudConfig
 	CloudConfig string `json:"cloudConfig,omitempty"`
 	// AWS

pkg/apis/kubeone/validation/validation.go

@@ -157,6 +157,10 @@ func ValidateCloudProviderSpec(p kubeone.CloudProviderSpec, fldPath *field.Path)
 		allErrs = append(allErrs, field.Invalid(fldPath, "", "provider must be specified"))
 	}
 
+	if p.CSIMigrationComplete && !p.CSIMigration {
+		allErrs = append(allErrs, field.Forbidden(fldPath.Child("csiMigrationComplete"), "csiMigrationComplete requires csiMigration to be enabled"))
+	}
+
 	return allErrs
 }
 

pkg/apis/kubeone/validation/validation_test.go

@@ -512,6 +512,32 @@ func TestValidateCloudProviderSpec(t *testing.T) {
 			providerConfig: kubeone.CloudProviderSpec{},
 			expectedError:  true,
 		},
+		{
+			name: "CSIMigration enabled",
+			providerConfig: kubeone.CloudProviderSpec{
+				CSIMigration: true,
+				AWS:          &kubeone.AWSSpec{},
+			},
+			expectedError: false,
+		},
+		{
+			name: "CSIMigration and CSIMigrationComplete enabled",
+			providerConfig: kubeone.CloudProviderSpec{
+				CSIMigration:         true,
+				CSIMigrationComplete: true,
+				AWS:                  &kubeone.AWSSpec{},
+			},
+			expectedError: false,
+		},
+		{
+			name: "CSIMigrationComplete enabled without CSIMigration",
+			providerConfig: kubeone.CloudProviderSpec{
+				CSIMigration:         false,
+				CSIMigrationComplete: true,
+				AWS:                  &kubeone.AWSSpec{},
+			},
+			expectedError: true,
+		},
 	}
 	for _, tc := range tests {
 		tc := tc

pkg/cmd/config.go

@@ -539,6 +539,28 @@ cloudProvider:
   {{ .CloudProviderName }}: {}
   # Set the kubelet flag '--cloud-provider=external' and deploy the external CCM for supported providers
   external: {{ .CloudProviderExternal }}
+  # csiMigration enables the CSIMigration and CSIMigration{Provider} feature gates
+  # for providers that support the CSI migration.
+  # The CSI migration stability depends on the provider.
+  # More details about stability can be found in the Feature Gates document:
+  # https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/
+  #
+  # Note: Azure has two type of CSI drivers (AzureFile and AzureDisk) and two different
+  # feature gates (CSIMigrationAzureDisk and CSIMigrationAzureFile). Enabling CSI migration
+  # enables both feature gates. If one CSI driver is not deployed, the volume operations
+  # for volumes with missing CSI driver will fallback to the in-tree volume plugin.
+  csiMigration: false
+  # csiMigrationComplete enables the CSIMigration{Provider}Complete feature gate
+  # for providers that support the CSI migration.
+  # This feature gate disables fallback to the in-tree volume plugins, therefore,
+  # it should be enabled only if the CSI driver is deploy on all nodes, and after
+  # ensuring that the CSI driver works properly.
+  #
+  # Note: If you're running on Azure, make sure that you have both AzureFile
+  # and AzureDisk CSI drivers deployed, as enabling this feature disables the fallback
+  # to the in-tree volume plugins. See description for the CSIMigration field for
+  # more details.
+  csiMigrationComplete: false 
   # Path to file that will be uploaded and used as custom '--cloud-config' file.
   cloudConfig: "{{ .CloudProviderCloudCfg }}"