Properly annotate OpenStack PVs on CCM/CSI migration

pkg/tasks/ccm_csi_migration.go

@@ -37,6 +37,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+const (
+	provisionedByAnnotation            = "pv.kubernetes.io/provisioned-by"
+	provisionedByOpenStackInTreeCinder = "kubernetes.io/cinder"
+	provisionedByOpenStackCSICinder    = "cinder.csi.openstack.org"
+)
+
 func validateExternalCloudProviderConfig(s *state.State) error {
 	if !s.Cluster.CloudProvider.External {
 		return errors.New(".cloudProvider.external must be enabled to start the migration")
@@ -210,3 +216,33 @@ func waitForStaticPodReady(s *state.State, timeout time.Duration, staticPodName,
 		return true, nil
 	})
 }
+
+func migrateOpenStackPVs(s *state.State) error {
+	if s.DynamicClient == nil {
+		return errors.New("dynamic client is not initialized")
+	}
+
+	s.Logger.Infof("Patching OpenStack PersistentVolumes with annotation \"%s=%s\"...", provisionedByAnnotation, provisionedByOpenStackCSICinder)
+
+	pvList := corev1.PersistentVolumeList{}
+	if err := s.DynamicClient.List(s.Context, &pvList, &client.ListOptions{}); err != nil {
+		return errors.Wrap(err, "failed to list persistentvolumes")
+	}
+
+	for i, pv := range pvList.Items {
+		if pv.Annotations[provisionedByAnnotation] == provisionedByOpenStackInTreeCinder {
+			if s.Verbose {
+				s.Logger.Debugf("Patching PersistentVolume \"%s/%s\"...", pv.Namespace, pv.Name)
+			}
+
+			oldPv := pv.DeepCopy()
+			pv.Annotations[provisionedByAnnotation] = provisionedByOpenStackCSICinder
+
+			if err := s.DynamicClient.Patch(s.Context, &pvList.Items[i], client.MergeFrom(oldPv)); err != nil {
+				return errors.Wrapf(err, "failed to patch persistnetvolume %q with annotation \"%s=%s\"", pv.Name, provisionedByAnnotation, provisionedByOpenStackCSICinder)
+			}
+		}
+	}
+
+	return nil
+}

pkg/tasks/tasks.go

@@ -474,14 +474,21 @@ func WithCCMCSIMigration(t Tasks) Tasks {
 			Task{Fn: updateKubeletConfig, ErrMsg: "failed to update kubelet config"},
 		).
 		append(WithResources(nil)...).
-		append(Task{
-			Fn: func(s *state.State) error {
-				s.Logger.Warn("Now please rolling restart your machineDeployments to migrate to ccm/csi")
-				s.Logger.Warn("see more at: https://docs.kubermatic.com/kubeone/v1.3/cheat_sheets/rollout_machinedeployment/")
-				s.Logger.Warn("Once you're done, please run this command again with the '--complete' flag to finish migration")
-				return nil
-			},
-			ErrMsg:    "failed to show next steps",
-			Predicate: func(s *state.State) bool { return s.Cluster.MachineController.Deploy && !s.CCMMigrationComplete },
-		})
+		append(
+			Task{
+				Fn:        migrateOpenStackPVs,
+				ErrMsg:    "failed to migrate openstack persistentvolumes",
+				Predicate: func(s *state.State) bool { return s.Cluster.CloudProvider.Openstack != nil },
+			},
+			Task{
+				Fn: func(s *state.State) error {
+					s.Logger.Warn("Now please rolling restart your machineDeployments to migrate to ccm/csi")
+					s.Logger.Warn("see more at: https://docs.kubermatic.com/kubeone/v1.3/cheat_sheets/rollout_machinedeployment/")
+					s.Logger.Warn("Once you're done, please run this command again with the '--complete' flag to finish migration")
+					return nil
+				},
+				ErrMsg:    "failed to show next steps",
+				Predicate: func(s *state.State) bool { return s.Cluster.MachineController.Deploy && !s.CCMMigrationComplete },
+			},
+		)
 }