cleanup: Support matrix update and code cleanup #4262

karthik-us · 2023-11-16T14:21:27Z

Updating the support matrix to point to the suppotred ceph release.
Cleanup the cephfs resize code.

Fixes: #4168

karthik-us · 2023-11-16T14:21:53Z

@Madhu-1 @Rakshith-R PTAL.

karthik-us · 2023-11-16T14:23:47Z

Note to self: Link the upstream issue in the next update.

Madhu-1 · 2023-11-16T14:28:20Z

README.md

-|        | Creating and deleting snapshot                            | Alpha          | >= v3.7.0          | >= v1.1.0        | Pacific (>=16.2.0)   | >= v1.17.0         |
-|        | Provision volume from snapshot                            | Alpha          | >= v3.7.0          | >= v1.1.0        | Pacific (>=16.2.0)   | >= v1.17.0         |
-|        | Provision volume from another volume                      | Alpha          | >= v3.7.0          | >= v1.1.0        | Pacific (>=16.2.0)   | >= v1.16.0         |
+| RBD    | Dynamically provision, de-provision Block mode RWO volume | GA             | >= v1.0.0          | >= v1.0.0        | Pacific (>=v16.0.0)  | >= v1.14.0         |


Feature Status need to be updated to change the status to next version based on the support we have (This is for followup PR)

Madhu-1 · 2023-11-16T14:30:39Z

internal/cephfs/core/volume.go

 	unsupported
 )

 type localClusterState struct {
 	// set the enum value i.e., unknown, supported,
 	// unsupported as per the state of the cluster.
-	resizeState                 operationState
-	subVolMetadataState         operationState
 	subVolSnapshotMetadataState operationState


please remove subVolSnapshotMetadataState as well?

can you also check do we have metadata support in v16.0.0 as well?

metadata & snapshot metadata support are added on pacific from v16.2.11 and on quincy it is from v17.2.1. Should we keep both these checks for some more time in that case, if someone uses versions lower than that?

If that is a supported version in ceph we need to keep it as well. ie (< 16.2.11) and (<17.2.1)

As per the docs 16.2.* and 17.2.* are still supported. So we need to keep these checks for some more time.
Will update support matrix as well to point to >=v16.2.0 for all the pacific versions.

i believe in ResizeSubVolume we can remove the check and also remove the call for createVolume. can you please check on that

Yes, the support for it is present in all the active releases. Removed it now.

Madhu-1 · 2023-11-16T14:31:25Z

internal/cephfs/core/volume.go

@@ -199,16 +199,13 @@ func (s *subVolumeClient) GetSubVolumeInfo(ctx context.Context) (*Subvolume, err
 type operationState int64

 const (
-	unknown operationState = iota
-	supported
+	supported operationState = iota
 	unsupported
 )

 type localClusterState struct {


localClusterState might need to be removed as well as we don't require it anymore.

Since the checks are needed, keeping it as it is for the time being.

Madhu-1 · 2023-11-16T14:32:29Z

internal/cephfs/core/volume.go

-// ResizeVolume will try to use ceph fs subvolume resize command to resize the
-// subvolume. If the command is not available as a fallback it will use
-// CreateVolume to resize the subvolume.
+// ResizeVolume will use ceph fs subvolume resize command to resize the subvolume.
 func (s *subVolumeClient) ResizeVolume(ctx context.Context, bytesQuota int64) error {
 	newLocalClusterState(s.clusterID)


newLocalClusterState(s.clusterID) also need to be removed

karthik-us · 2023-11-20T06:17:00Z

/test ci/centos/mini-e2e/k8s-1.28

karthik-us · 2023-11-22T06:42:17Z

@Rakshith-R @nixpanic @yati1998 PTAL.

iPraveenParihar

Thanks, LGTM!

Rakshith-R · 2023-11-22T09:02:20Z

@karthik-us
Can you please update PendingRelease.md too ?

karthik-us · 2023-11-22T09:49:33Z

@karthik-us Can you please update PendingRelease.md too ?

@Rakshith-R just the mention of removal of resize code with the reason suffice in the pending release notes as the desscription for the PR right? under the Breaking Chnages.

Rakshith-R · 2023-11-22T10:12:37Z

@karthik-us Can you please update PendingRelease.md too ?

@Rakshith-R just the mention of removal of resize code with the reason suffice in the pending release notes as the desscription for the PR right? under the Breaking Chnages.

The code change is internal only.
No, I meant regarding the support status change for ceph version.

Pull request has been modified.

karthik-us · 2023-11-22T11:06:05Z

@karthik-us Can you please update PendingRelease.md too ?

@Rakshith-R just the mention of removal of resize code with the reason suffice in the pending release notes as the desscription for the PR right? under the Breaking Chnages.

The code change is internal only. No, I meant regarding the support status change for ceph version.

Done.

nixpanic · 2023-11-23T08:49:59Z

@Mergifyio rebase

Updating the support matrix to point to the suppotred ceph release. Fixes: ceph#4168 Signed-off-by: karthik-us <ksubrahm@redhat.com>

The ceph fs subvolume resize support is available in all the active ceph releases. Hence removing the code to check the supportability of the feature. Signed-off-by: karthik-us <ksubrahm@redhat.com>

Adding a note on supported ceph releases. Signed-off-by: karthik-us <ksubrahm@redhat.com>

mergify · 2023-11-23T08:50:24Z

rebase

✅ Branch has been successfully rebased

nixpanic · 2023-11-23T08:50:35Z

@Mergifyio queue

mergify · 2023-11-23T08:50:40Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at b5d8bf0

ceph-csi-bot · 2023-11-23T08:51:08Z

/test ci/centos/k8s-e2e-external-storage/1.26

ceph-csi-bot · 2023-11-23T08:51:08Z

/test ci/centos/k8s-e2e-external-storage/1.28

ceph-csi-bot · 2023-11-23T08:51:08Z

/test ci/centos/k8s-e2e-external-storage/1.27

ceph-csi-bot · 2023-11-23T08:51:09Z

/test ci/centos/mini-e2e-helm/k8s-1.26

ceph-csi-bot · 2023-11-23T08:51:09Z

/test ci/centos/upgrade-tests-cephfs

ceph-csi-bot · 2023-11-23T08:51:09Z

/test ci/centos/mini-e2e-helm/k8s-1.28

ceph-csi-bot · 2023-11-23T08:51:09Z

/test ci/centos/mini-e2e-helm/k8s-1.27

ceph-csi-bot · 2023-11-23T08:51:10Z

/test ci/centos/upgrade-tests-rbd

ceph-csi-bot · 2023-11-23T08:51:10Z

/test ci/centos/mini-e2e/k8s-1.26

ceph-csi-bot · 2023-11-23T08:51:10Z

/test ci/centos/mini-e2e/k8s-1.28

ceph-csi-bot · 2023-11-23T08:51:10Z

/test ci/centos/mini-e2e/k8s-1.27

mergify bot added the cleanup label Nov 16, 2023

Madhu-1 reviewed Nov 16, 2023

View reviewed changes

karthik-us force-pushed the supported-version-changes branch from aa63d74 to 58a20cb Compare November 17, 2023 09:15

karthik-us changed the title ~~cleanup: Support matrix update and code cleanup~~ doc: Support matrix update Nov 17, 2023

mergify bot added ci/skip/e2e skip running e2e CI jobs ci/skip/multi-arch-build skip building on multiple architectures component/docs Issues and PRs related to documentation labels Nov 17, 2023

karthik-us force-pushed the supported-version-changes branch 2 times, most recently from c106681 to 82cf777 Compare November 17, 2023 14:03

karthik-us changed the title ~~doc: Support matrix update~~ cleanup: Support matrix update and code cleanup Nov 17, 2023

Rakshith-R requested review from nixpanic, yati1998 and Rakshith-R November 22, 2023 06:52

iPraveenParihar previously approved these changes Nov 22, 2023

View reviewed changes

karthik-us force-pushed the supported-version-changes branch from 82cf777 to f03cbb1 Compare November 22, 2023 11:04

Rakshith-R approved these changes Nov 22, 2023

View reviewed changes

nixpanic removed ci/skip/e2e skip running e2e CI jobs ci/skip/multi-arch-build skip building on multiple architectures labels Nov 23, 2023

nixpanic approved these changes Nov 23, 2023

View reviewed changes

doc: Support matrix update

478264c

Updating the support matrix to point to the suppotred ceph release. Fixes: ceph#4168 Signed-off-by: karthik-us <ksubrahm@redhat.com>

karthik-us added 2 commits November 23, 2023 08:50

cleanup: cephfs resize code cleanup

7a6fd69

The ceph fs subvolume resize support is available in all the active ceph releases. Hence removing the code to check the supportability of the feature. Signed-off-by: karthik-us <ksubrahm@redhat.com>

doc: update pending release notes

e9bcfe5

Adding a note on supported ceph releases. Signed-off-by: karthik-us <ksubrahm@redhat.com>

nixpanic force-pushed the supported-version-changes branch from f03cbb1 to e9bcfe5 Compare November 23, 2023 08:50

mergify bot added the ok-to-test Label to trigger E2E tests label Nov 23, 2023

ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Nov 23, 2023

mergify bot merged commit b5d8bf0 into ceph:devel Nov 23, 2023
34 checks passed

karthik-us deleted the supported-version-changes branch November 24, 2023 09:11

cleanup: Support matrix update and code cleanup #4262

cleanup: Support matrix update and code cleanup #4262

Conversation

karthik-us commented Nov 16, 2023 • edited

karthik-us commented Nov 16, 2023

karthik-us commented Nov 16, 2023

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

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

karthik-us Nov 17, 2023 • edited

Choose a reason for hiding this comment

karthik-us commented Nov 20, 2023

karthik-us commented Nov 22, 2023

iPraveenParihar left a comment

Choose a reason for hiding this comment

Rakshith-R commented Nov 22, 2023

karthik-us commented Nov 22, 2023

Rakshith-R commented Nov 22, 2023

karthik-us commented Nov 22, 2023

nixpanic commented Nov 23, 2023

mergify bot commented Nov 23, 2023

✅ Branch has been successfully rebased

nixpanic commented Nov 23, 2023

mergify bot commented Nov 23, 2023 • edited

✅ The pull request has been merged automatically

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

ceph-csi-bot commented Nov 23, 2023

karthik-us commented Nov 16, 2023 •

edited

karthik-us Nov 17, 2023 •

edited

mergify bot commented Nov 23, 2023 •

edited