Create rotate member plan when pvc have a file system resize pending.

Author: lamai93

pkg/deployment/reconcile/plan_builder_storage.go

@@ -57,10 +57,6 @@ func createRotateServerStoragePlan(log zerolog.Logger, apiObject k8sutil.APIObje
 			}
 			groupSpec := spec.GetServerGroupSpec(group)
 			storageClassName := groupSpec.GetStorageClassName()
-			if storageClassName == "" {
-				// Using default storage class name
-				continue
-			}
 			// Load PVC
 			pvc, err := getPVC(m.PersistentVolumeClaimName)
 			if err != nil {
@@ -71,10 +67,17 @@ func createRotateServerStoragePlan(log zerolog.Logger, apiObject k8sutil.APIObje
 				continue
 			}
 			replacementNeeded := false
-			if util.StringOrDefault(pvc.Spec.StorageClassName) != storageClassName {
+			if util.StringOrDefault(pvc.Spec.StorageClassName) != storageClassName && storageClassName != "" {
 				// Storageclass has changed
+				log.Debug().Str("pod-name", m.PodName).
+					Str("pvc-storage-class", util.StringOrDefault(pvc.Spec.StorageClassName)).
+					Str("group-storage-class", storageClassName).Msg("Storage class has changed - pod needs replacement")
 				replacementNeeded = true
 			}
+			rotationNeeded := false
+			if k8sutil.IsPersistentVolumeClaimFileSystemResizePending(pvc) {
+				rotationNeeded = true
+			}
 			if replacementNeeded {
 				if group != api.ServerGroupAgents && group != api.ServerGroupDBServers {
 					// Only agents & dbservers are allowed to change their storage class.
@@ -107,6 +110,8 @@ func createRotateServerStoragePlan(log zerolog.Logger, apiObject k8sutil.APIObje
 						)
 					}
 				}
+			} else if rotationNeeded {
+				plan = createRotateMemberPlan(log, m, group, "Filesystem resize pending")
 			}
 		}
 		return nil

pkg/util/k8sutil/pvc.go

@@ -37,11 +37,21 @@ type PersistentVolumeClaimInterface interface {
 	Get(name string, options metav1.GetOptions) (*v1.PersistentVolumeClaim, error)
 }
 
-// IsPersistentVolumeClaimMarkedForDeletion returns true if the pod has been marked for deletion.
+// IsPersistentVolumeClaimMarkedForDeletion returns true if the pvc has been marked for deletion.
 func IsPersistentVolumeClaimMarkedForDeletion(pvc *v1.PersistentVolumeClaim) bool {
 	return pvc.DeletionTimestamp != nil
 }
 
+// IsPersistentVolumeClaimFileSystemResizePending returns true if the pvc has FileSystemResizePending set to true
+func IsPersistentVolumeClaimFileSystemResizePending(pvc *v1.PersistentVolumeClaim) bool {
+	for _, c := range pvc.Status.Conditions {
+		if c.Type == v1.PersistentVolumeClaimFileSystemResizePending && c.Status == v1.ConditionTrue {
+			return true
+		}
+	}
+	return false
+}
+
 // CreatePersistentVolumeClaimName returns the name of the persistent volume claim for a member with
 // a given id in a deployment with a given name.
 func CreatePersistentVolumeClaimName(deploymentName, role, id string) string {