Generates and labels `VolumeGroupSnapshotClass` #168

raaizik · 2024-06-03T12:41:23Z

Changes

Have storage claim controller own VolumeGroupSnapshotClass with the required labels for RDR added to both VGSC and VSC.
Adds Available CRDs functionality to k8sutils
- Resolves compatibility issue
Upgrades k8s-csi
- Requires go >= 1.22.0 which uses client-go v0.30 which works with CR v0.18 and CG v0.14

RHSTOR-5795

TODO

Change to v1beta1 once available for VolumeGroupSnapshotClass #1150
Test complete workflow

raaizik · 2024-06-04T13:50:41Z

/cc @rewantsoni

rewantsoni · 2024-06-10T04:57:47Z

controllers/storageclaim_controller.go

+				labels["ramendr.openshift.io/replicationID"] = r.storageClaimHash
+				labels["ramendr.openshift.io/storageID"] = storageID
 				if resource.Name == "cephfs" {
 					volumeSnapshotClass = r.getCephFSVolumeSnapshotClass(data)


The labels are not being applied to the cephfs or rbd VolumeSnapshotClass

Suggested change

labels["ramendr.openshift.io/replicationID"] = r.storageClaimHash

labels["ramendr.openshift.io/storageID"] = storageID

if resource.Name == "cephfs" {

volumeSnapshotClass = r.getCephFSVolumeSnapshotClass(data)

labels["ramendr.openshift.io/replicationID"] = r.storageClaimHash

labels["ramendr.openshift.io/storageID"] = storageID

if resource.Name == "cephfs" {

volumeSnapshotClass = r.getCephFSVolumeSnapshotClass(data,labels)

rewantsoni · 2024-06-10T05:01:01Z

controllers/storageclaim_controller.go

+	if reflect.DeepEqual(existing.Parameters, volumeGroupSnapshotClass.Parameters) {
+		return nil
+	}


Should we also check for labels?

internal/controller/storageclaim_controller.go

rewantsoni

Could also test this PR on a cluster to see if the VGSC is created with the required fields

rewantsoni · 2024-12-18T10:40:34Z

internal/controller/storageclaim_controller.go

@@ -401,7 +454,35 @@ func (r *StorageClaimReconciler) reconcilePhases() (reconcile.Result, error) {
 					return nil
 				})
 				if err != nil {
-					return reconcile.Result{}, fmt.Errorf("failed to create or update VolumeSnapshotClass: %s", err)
+					return reconcile.Result{}, fmt.Errorf("failed to create or update StorageClass: %s", err)


Suggested change

return reconcile.Result{}, fmt.Errorf("failed to create or update StorageClass: %s", err)

return reconcile.Result{}, fmt.Errorf("failed to create or update VolumeSnapshotClass: %s", err)

You are under the VolumeSnapshotClass case here not StorageClass

rewantsoni · 2024-12-18T10:42:00Z

internal/controller/storageclaim_controller.go

+					data := map[string]string{}
+					err = json.Unmarshal(resource.Data, &data)
+					if err != nil {
+						return reconcile.Result{}, fmt.Errorf("failed to unmarshal StorageClaim configuration response: %v", err)
+					}
+					data["csi.storage.k8s.io/group-snapshotter-secret-namespace"] = r.OperatorNamespace
+					// generate a new clusterID for cephfs subvolumegroup, as
+					// storageclaim is clusterscoped resources using its
+					// hash as the clusterID
+					data["clusterID"] = r.storageClaimHash
+					driverName := templates.CephFsDriverName
+					if strings.Contains(strings.ToLower(resource.Name), "rbd") {
+						driverName = templates.RBDDriverName
+					}
+					volumeGroupSnapshotClass = r.getCephDriverVolumeGroupSnapshotClass(resource.Labels, resource.Annotations, driverName)
+					utils.AddAnnotation(volumeGroupSnapshotClass, storageClaimAnnotation, r.storageClaim.Name)


Let's move everything under CreateOrReplace

The CreateOrReplace body should contain only part of this snippet, as seen in current code

rewantsoni · 2024-12-18T10:43:11Z

internal/controller/storageclaim_controller.go

@@ -550,6 +636,20 @@ func (r *StorageClaimReconciler) getCephRBDVolumeSnapshotClass() *snapapi.Volume
 	return volumesnapshotclass
 }

+func (r *StorageClaimReconciler) getCephDriverVolumeGroupSnapshotClass(
+	labels map[string]string, annotations map[string]string, driver string) *groupsnapapi.VolumeGroupSnapshotClass {


We could add the labels/annotations directly in the CreateOrReplace

We might not need this function, we could have everything under CreateOrReplace.

We do need it to create the VGSC resource prior to applying its labels, annotations, etc. I've altered it

rewantsoni · 2025-01-21T05:41:13Z

@raaizik Are the changes tested?

Madhu-1 · 2025-01-22T15:23:54Z

internal/controller/storageclaim_controller.go

+	driver string) *groupsnapapi.VolumeGroupSnapshotClass {
+	volumegroupsnapshotclass := &groupsnapapi.VolumeGroupSnapshotClass{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: r.storageClaim.Name,


please make sure we use the same class names as internal mode

I will do that, keeping track of 2859

internal/controller/storageclaim_controller.go

Signed-off-by: raaizik <132667934+raaizik@users.noreply.github.com>

Madhu-1

/lgtm

openshift-ci · 2025-01-23T13:52:21Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Madhu-1, raaizik

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [Madhu-1]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Madhu-1 · 2025-01-23T13:53:07Z

Added hold, @rewantsoni any final comments, if changes looks good, please remove the hold

raaizik · 2025-01-23T13:53:56Z

Added hold, @rewantsoni any final comments, if changes looks good, please remove the hold

Local testing still WIP @Madhu-1

Madhu-1 · 2025-01-23T13:57:11Z

Added hold, @rewantsoni any final comments, if changes looks good, please remove the hold

Local testing still WIP @Madhu-1

Thank you , Lets do a final testing and update the results.

openshift-ci bot added the do-not-merge/work-in-progress label Jun 3, 2024

pull-request-size bot added the size/M label Jun 3, 2024

raaizik force-pushed the RHSTOR-5795 branch 4 times, most recently from d68c5d2 to 7e993b3 Compare June 3, 2024 13:59

pull-request-size bot added size/L and removed size/M labels Jun 3, 2024

raaizik force-pushed the RHSTOR-5795 branch from 7e993b3 to 15b46ec Compare June 3, 2024 14:00

pull-request-size bot added size/M and removed size/L labels Jun 3, 2024

raaizik force-pushed the RHSTOR-5795 branch 2 times, most recently from 38c58d7 to b148266 Compare June 4, 2024 10:21

raaizik changed the title ~~[WIP] Generates VolumeGroupSnapshotClass~~ [WIP] Generates and labels Volume*SnapshotClass Jun 4, 2024

raaizik changed the title ~~[WIP] Generates and labels Volume*SnapshotClass~~ Generates and labels Volume*SnapshotClass Jun 4, 2024

openshift-ci bot removed the do-not-merge/work-in-progress label Jun 4, 2024

openshift-ci bot requested a review from rewantsoni June 4, 2024 13:50

raaizik force-pushed the RHSTOR-5795 branch from b148266 to da0d4b5 Compare June 4, 2024 14:53

raaizik changed the title ~~Generates and labels Volume*SnapshotClass~~ [WIP] Generates and labels Volume*SnapshotClass Jun 5, 2024

openshift-ci bot added the do-not-merge/work-in-progress label Jun 5, 2024

raaizik changed the title ~~[WIP] Generates and labels Volume*SnapshotClass~~ Generates and labels Volume*SnapshotClass Jun 6, 2024

openshift-ci bot removed the do-not-merge/work-in-progress label Jun 6, 2024

raaizik force-pushed the RHSTOR-5795 branch 2 times, most recently from 63d1586 to 0af9ddc Compare June 6, 2024 13:04

raaizik mentioned this pull request Jun 9, 2024

Sends VolumeGroupSnapshotClass to client red-hat-storage/ocs-operator#2661

Merged

rewantsoni suggested changes Jun 10, 2024

View reviewed changes

openshift-ci bot assigned rewantsoni Jun 10, 2024

raaizik force-pushed the RHSTOR-5795 branch from 0af9ddc to 099b7a8 Compare June 10, 2024 07:51

pull-request-size bot removed the size/M label Jun 10, 2024

raaizik force-pushed the RHSTOR-5795 branch from 523d103 to 1652c39 Compare November 25, 2024 12:48

openshift-merge-robot removed the needs-rebase label Nov 25, 2024

raaizik force-pushed the RHSTOR-5795 branch 2 times, most recently from 6356b95 to 27dc75c Compare November 25, 2024 14:12

raaizik requested a review from leelavg November 25, 2024 14:12

raaizik force-pushed the RHSTOR-5795 branch 2 times, most recently from d1858ea to 5af8ff3 Compare December 11, 2024 10:49

Madhu-1 reviewed Dec 12, 2024

View reviewed changes

internal/controller/storageclaim_controller.go Outdated Show resolved Hide resolved

internal/controller/storageclaim_controller.go Outdated Show resolved Hide resolved

internal/controller/storageclaim_controller.go Outdated Show resolved Hide resolved

raaizik force-pushed the RHSTOR-5795 branch from 5af8ff3 to 212956b Compare December 17, 2024 11:23

raaizik requested a review from Madhu-1 December 17, 2024 11:23

rewantsoni reviewed Dec 18, 2024

View reviewed changes

raaizik force-pushed the RHSTOR-5795 branch 2 times, most recently from b8e5f4f to f449325 Compare January 12, 2025 15:36

raaizik requested a review from rewantsoni January 12, 2025 16:00

Madhu-1 reviewed Jan 22, 2025

View reviewed changes

internal/controller/storageclaim_controller.go Show resolved Hide resolved

internal/controller/storageclaim_controller.go Outdated Show resolved Hide resolved

controllers: Generates VGSClass

5c53b73

Signed-off-by: raaizik <132667934+raaizik@users.noreply.github.com>

raaizik force-pushed the RHSTOR-5795 branch from f449325 to 5c53b73 Compare January 23, 2025 13:31

raaizik requested a review from Madhu-1 January 23, 2025 13:46

Madhu-1 reviewed Jan 23, 2025

View reviewed changes

openshift-ci bot added the lgtm label Jan 23, 2025

openshift-ci bot added the approved label Jan 23, 2025

Madhu-1 added the do-not-merge/hold label Jan 23, 2025

rewantsoni mentioned this pull request Jan 29, 2025

controllers: generate VGSClass #296

Merged

openshift-merge-bot bot closed this in #296 Jan 30, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Generates and labels `VolumeGroupSnapshotClass` #168

Generates and labels `VolumeGroupSnapshotClass` #168

raaizik commented Jun 3, 2024 •

edited

Loading

raaizik commented Jun 4, 2024

rewantsoni Jun 10, 2024

rewantsoni Jun 10, 2024

rewantsoni left a comment

rewantsoni Dec 18, 2024

rewantsoni Dec 18, 2024

raaizik Jan 12, 2025

rewantsoni Dec 18, 2024

rewantsoni Dec 18, 2024

raaizik Jan 12, 2025 •

edited

Loading

rewantsoni commented Jan 21, 2025

Madhu-1 Jan 22, 2025

raaizik Jan 23, 2025 •

edited

Loading

Madhu-1 left a comment

openshift-ci bot commented Jan 23, 2025

Madhu-1 commented Jan 23, 2025

raaizik commented Jan 23, 2025 •

edited

Loading

Madhu-1 commented Jan 23, 2025

	return reconcile.Result{}, fmt.Errorf("failed to create or update StorageClass: %s", err)
	return reconcile.Result{}, fmt.Errorf("failed to create or update VolumeSnapshotClass: %s", err)

Generates and labels VolumeGroupSnapshotClass #168

Generates and labels VolumeGroupSnapshotClass #168

Conversation

raaizik commented Jun 3, 2024 • edited Loading

Changes

TODO

raaizik commented Jun 4, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rewantsoni left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

raaizik Jan 12, 2025 • edited Loading

Choose a reason for hiding this comment

rewantsoni commented Jan 21, 2025

Choose a reason for hiding this comment

raaizik Jan 23, 2025 • edited Loading

Choose a reason for hiding this comment

Madhu-1 left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Jan 23, 2025

Madhu-1 commented Jan 23, 2025

raaizik commented Jan 23, 2025 • edited Loading

Madhu-1 commented Jan 23, 2025

Generates and labels `VolumeGroupSnapshotClass` #168

Generates and labels `VolumeGroupSnapshotClass` #168

raaizik commented Jun 3, 2024 •

edited

Loading

raaizik Jan 12, 2025 •

edited

Loading

raaizik Jan 23, 2025 •

edited

Loading

raaizik commented Jan 23, 2025 •

edited

Loading