Add storageClassName in the placementPolicy; get storage capacity from feedback rule

Signed-off-by: souravbiswassanto <[email protected]>

Author: souravbiswassanto

apis/apps/v1/placementpolicy_types.go

@@ -86,8 +86,9 @@ type ClusterSpreadConstraint struct {
 }
 
 type DistributionRule struct {
-	ClusterName    string  `json:"clusterName"`
-	ReplicaIndices []int32 `json:"replicaIndices"`
+	ClusterName      string  `json:"clusterName"`
+	ReplicaIndices   []int32 `json:"replicaIndices"`
+	StorageClassName string  `json:"storageClassName,omitempty"`
 }
 
 type KubeSliceConfig struct {

crds/apps.k8s.appscode.com_placementpolicies.yaml

@@ -101,6 +101,8 @@ spec:
                             format: int32
                             type: integer
                           type: array
+                        storageClassName:
+                          type: string
                       required:
                       - clusterName
                       - replicaIndices

pkg/controller/petset/pet_manifest_work_control.go

@@ -46,6 +46,7 @@ func (om *realStatefulPodControlObjectManager) CreatePodManifestWork(ctx context
 	pod.APIVersion = "v1"
 	pod.Kind = "Pod"
 	pod.ObjectMeta.GenerateName = ""
+	pod.ObjectMeta.OwnerReferences = nil
 	podUnstructured, err := runtime.DefaultUnstructuredConverter.ToUnstructured(pod)
 	if err != nil {
 		return fmt.Errorf("failed to convert pod to unstructured: %w", err)
@@ -337,6 +338,17 @@ func (om *realStatefulPodControlObjectManager) CreateClaimManifestWork(set *api.
 						Name:      claim.Name,
 						Namespace: claim.Namespace,
 					},
+					FeedbackRules: []apiworkv1.FeedbackRule{
+						{
+							Type: apiworkv1.JSONPathsType,
+							JsonPaths: []apiworkv1.JsonPath{
+								{
+									Name: "Capacity",
+									Path: ".status.capacity.storage",
+								},
+							},
+						},
+					},
 					UpdateStrategy: &apiworkv1.UpdateStrategy{
 						Type: apiworkv1.UpdateStrategyTypeServerSideApply,
 						ServerSideApply: &apiworkv1.ServerSideApplyConfig{
@@ -525,3 +537,19 @@ func getOcmClusterName(pp *api.PlacementPolicy, ordinal int) string {
 
 	return clusterName
 }
+
+func getStorageClassName(pp *api.PlacementPolicy, ordinal int) string {
+	if pp == nil || pp.Spec.ClusterSpreadConstraint == nil || pp.Spec.ClusterSpreadConstraint.DistributionRules == nil {
+		klog.Errorf("can't get storageClassName for distributed petset, ClusterSpreadConstraint is nil")
+		return ""
+	}
+	for i := 0; i < len(pp.Spec.ClusterSpreadConstraint.DistributionRules); i++ {
+		for j := 0; j < len(pp.Spec.ClusterSpreadConstraint.DistributionRules[i].ReplicaIndices); j++ {
+			if ordinal == int(pp.Spec.ClusterSpreadConstraint.DistributionRules[i].ReplicaIndices[j]) {
+				return pp.Spec.ClusterSpreadConstraint.DistributionRules[i].StorageClassName
+			}
+		}
+	}
+
+	return ""
+}

pkg/controller/petset/pet_pod_control.go

@@ -413,7 +413,8 @@ func (spc *StatefulPodControl) createPersistentVolumeClaims(set *api.PetSet, pod
 					errs = append(errs, err)
 				}
 				ordinal, _ := strconv.Atoi(getOrdinalFromResource(claim.Name))
-				setOCMPlacementForPVC(set, ordinal, &claim, placementPolicy)
+				setOCMPlacementForPVC(ordinal, &claim, placementPolicy)
+				setStorageClassNameForPVC(ordinal, &claim, placementPolicy)
 			}
 
 			err = spc.objectMgr.CreateClaim(&claim, set)

pkg/controller/petset/pet_set_utils.go

@@ -501,7 +501,7 @@ func setOCMPlacement(set *api.PetSet, ordinal int, pod *v1.Pod, pp *api.Placemen
 	}
 }
 
-func setOCMPlacementForPVC(set *api.PetSet, ordinal int, pvc *v1.PersistentVolumeClaim, placementPolicy *api.PlacementPolicy) {
+func setOCMPlacementForPVC(ordinal int, pvc *v1.PersistentVolumeClaim, placementPolicy *api.PlacementPolicy) {
 	if placementPolicy == nil || placementPolicy.Spec.ClusterSpreadConstraint == nil || placementPolicy.Spec.ClusterSpreadConstraint.DistributionRules == nil {
 		return
 	}
@@ -512,6 +512,17 @@ func setOCMPlacementForPVC(set *api.PetSet, ordinal int, pvc *v1.PersistentVolum
 	pvc.Annotations[api.ManifestWorkClusterNameLabel] = clusterName
 }
 
+func setStorageClassNameForPVC(ordinal int, pvc *v1.PersistentVolumeClaim, placementPolicy *api.PlacementPolicy) {
+	if placementPolicy == nil || placementPolicy.Spec.ClusterSpreadConstraint == nil || placementPolicy.Spec.ClusterSpreadConstraint.DistributionRules == nil {
+		return
+	}
+	storageClassName := getStorageClassName(placementPolicy, ordinal)
+	if storageClassName != "" {
+		// overwrite the storageClassName only when it's set in placementPolicy
+		pvc.Spec.StorageClassName = &storageClassName
+	}
+}
+
 // getPatch returns a strategic merge patch that can be applied to restore a PetSet to a
 // previous version. If the returned error is nil the patch is valid. The current state that we save is just the
 // PodSpecTemplate. We can modify this later to encompass more state (or less) and remain compatible with previously