Add CG support to VolumeReplicationGroupStatus and VRGResourceMeta.

Signed-off-by: Elena Gershkovich <[email protected]>
RamenDR · Nov 14, 2024 · 9af300c · 9af300c
1 parent b8b94ca
commit 9af300c
Show file tree

Hide file tree

Showing 12 changed files with 880 additions and 131 deletions.
diff --git a/api/v1alpha1/drplacementcontrol_types.go b/api/v1alpha1/drplacementcontrol_types.go
@@ -167,6 +167,16 @@ type PlacementDecision struct {
 	ClusterNamespace string `json:"clusterNamespace,omitempty"`
 }
 
+// ProtectedPVCsList defines a group of ProtectedPVCs
+type ProtectedPVCsList struct {
+	// Name of the VolRep/PVC resource
+	//+optional
+	Name string `json:"name,omitempty"`
+
+	// All the protected pvcs
+	ProtectedPVCs []string `json:"protectedpvcs,omitempty"`
+}
+
 // VRGResourceMeta represents the VRG resource.
 type VRGResourceMeta struct {
 	// Kind is the kind of the Kubernetes resource.
@@ -185,6 +195,10 @@ type VRGResourceMeta struct {
 	//+optional
 	ProtectedPVCs []string `json:"protectedpvcs,omitempty"`
 
+	// List of CGs that are protected by the VRG resource
+	//+optional
+	ProtectedCGs []ProtectedPVCsList `json:"protectedcgs,omitempty"`
+
 	// ResourceVersion is a value used to identify the version of the
 	// VRG resource object
 	//+optional

diff --git a/api/v1alpha1/volumereplicationgroup_types.go b/api/v1alpha1/volumereplicationgroup_types.go
@@ -307,6 +307,14 @@ type ProtectedPVC struct {
 	VolumeMode *corev1.PersistentVolumeMode `json:"volumeMode,omitempty"`
 }
 
+// ProtectedCG defines a group of ProtectedPVCs
+type ProtectedCG struct {
+	ProtectedPVC `json:",inline"`
+
+	// List the protected pvcs names
+	PVCs []string `json:"protectedPVCs,omitempty"`
+}
+
 type KubeObjectsCaptureIdentifier struct {
 	Number int64 `json:"number"`
 	//+nullable
@@ -325,8 +333,9 @@ type KubeObjectProtectionStatus struct {
 type VolumeReplicationGroupStatus struct {
 	State State `json:"state,omitempty"`
 
-	// All the protected pvcs
+	// One of ProtectedPVCs or ProtectedCGs must be set
 	ProtectedPVCs []ProtectedPVC `json:"protectedPVCs,omitempty"`
+	ProtectedCGs  []ProtectedCG  `json:"protectedCGs,omitempty"`
 
 	// Conditions are the list of VRG's summary conditions and their status.
 	Conditions []metav1.Condition `json:"conditions,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/ramendr.openshift.io_drplacementcontrols.yaml b/config/crd/bases/ramendr.openshift.io_drplacementcontrols.yaml
@@ -535,6 +535,21 @@ spec:
                         description: Namespace is the namespace of the Kubernetes
                           resource.
                         type: string
+                      protectedcgs:
+                        description: List of CGs that are protected by the VRG resource
+                        items:
+                          description: ProtectedPVCsList defines a group of ProtectedPVCs
+                          properties:
+                            name:
+                              description: Name of the VolRep/PVC resource
+                              type: string
+                            protectedpvcs:
+                              description: All the protected pvcs
+                              items:
+                                type: string
+                              type: array
+                          type: object
+                        type: array
                       protectedpvcs:
                         description: List of PVCs that are protected by the VRG resource
                         items: