forked from ceph/ceph-csi
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #380 from red-hat-storage/sync_us--devel
Syncing latest changes from upstream devel for ceph-csi
- Loading branch information
Showing
38 changed files
with
1,465 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /* | ||
| Copyright 2024 The Ceph-CSI Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package e2e | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| groupsnapapi "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1alpha1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/kubernetes/test/e2e/framework" | ||
| ) | ||
|
|
||
| type cephFSVolumeGroupSnapshot struct { | ||
| *volumeGroupSnapshotterBase | ||
| } | ||
|
|
||
| var _ VolumeGroupSnapshotter = &cephFSVolumeGroupSnapshot{} | ||
|
|
||
| func newCephFSVolumeGroupSnapshot(f *framework.Framework, namespace, | ||
| storageClass string, | ||
| blockPVC bool, | ||
| timeout, totalPVCCount int, | ||
| ) (VolumeGroupSnapshotter, error) { | ||
| base, err := newVolumeGroupSnapshotBase(f, namespace, storageClass, blockPVC, timeout, totalPVCCount) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to create volumeGroupSnapshotterBase: %w", err) | ||
| } | ||
|
|
||
| return &cephFSVolumeGroupSnapshot{ | ||
| volumeGroupSnapshotterBase: base, | ||
| }, nil | ||
| } | ||
|
|
||
| func (c *cephFSVolumeGroupSnapshot) TestVolumeGroupSnapshot() error { | ||
| return c.volumeGroupSnapshotterBase.testVolumeGroupSnapshot(c) | ||
| } | ||
|
|
||
| func (c *cephFSVolumeGroupSnapshot) GetVolumeGroupSnapshotClass() (*groupsnapapi.VolumeGroupSnapshotClass, error) { | ||
| vgscPath := fmt.Sprintf("%s/%s", cephFSExamplePath, "groupsnapshotclass.yaml") | ||
| vgsc := &groupsnapapi.VolumeGroupSnapshotClass{} | ||
| err := unmarshal(vgscPath, vgsc) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to unmarshal VolumeGroupSnapshotClass: %w", err) | ||
| } | ||
|
|
||
| vgsc.Parameters["csi.storage.k8s.io/group-snapshotter-secret-namespace"] = cephCSINamespace | ||
| vgsc.Parameters["csi.storage.k8s.io/group-snapshotter-secret-name"] = cephFSProvisionerSecretName | ||
| vgsc.Parameters["fsName"] = fileSystemName | ||
|
|
||
| fsID, err := getClusterID(c.framework) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to get clusterID: %w", err) | ||
| } | ||
| vgsc.Parameters["clusterID"] = fsID | ||
|
|
||
| return vgsc, nil | ||
| } | ||
|
|
||
| func (c *cephFSVolumeGroupSnapshot) ValidateResourcesForCreate(vgs *groupsnapapi.VolumeGroupSnapshot) error { | ||
| ctx := context.TODO() | ||
| metadataPool, err := getCephFSMetadataPoolName(c.framework, fileSystemName) | ||
| if err != nil { | ||
| return fmt.Errorf("failed getting cephFS metadata pool name: %w", err) | ||
| } | ||
|
|
||
| sourcePVCCount := len(vgs.Status.PVCVolumeSnapshotRefList) | ||
| // we are creating clones for each source PVC | ||
| clonePVCCount := len(vgs.Status.PVCVolumeSnapshotRefList) | ||
| totalPVCCount := sourcePVCCount + clonePVCCount | ||
| validateSubvolumeCount(c.framework, totalPVCCount, fileSystemName, subvolumegroup) | ||
|
|
||
| // we are creating 1 snapshot for each source PVC, validate the snapshot count | ||
| for _, pvcSnap := range vgs.Status.PVCVolumeSnapshotRefList { | ||
| pvc, err := c.framework.ClientSet.CoreV1().PersistentVolumeClaims(vgs.Namespace).Get(ctx, | ||
| pvcSnap.PersistentVolumeClaimRef.Name, | ||
| metav1.GetOptions{}) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to get PVC: %w", err) | ||
| } | ||
| pv := pvc.Spec.VolumeName | ||
| pvObj, err := c.framework.ClientSet.CoreV1().PersistentVolumes().Get(ctx, pv, metav1.GetOptions{}) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to get PV: %w", err) | ||
| } | ||
| validateCephFSSnapshotCount(c.framework, 1, subvolumegroup, pvObj) | ||
| } | ||
| validateOmapCount(c.framework, totalPVCCount, cephfsType, metadataPool, volumesType) | ||
| validateOmapCount(c.framework, sourcePVCCount, cephfsType, metadataPool, snapsType) | ||
| validateOmapCount(c.framework, 1, cephfsType, metadataPool, groupSnapsType) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (c *cephFSVolumeGroupSnapshot) ValidateResourcesForDelete() error { | ||
| metadataPool, err := getCephFSMetadataPoolName(c.framework, fileSystemName) | ||
| if err != nil { | ||
| return fmt.Errorf("failed getting cephFS metadata pool name: %w", err) | ||
| } | ||
| validateOmapCount(c.framework, 0, cephfsType, metadataPool, volumesType) | ||
| validateOmapCount(c.framework, 0, cephfsType, metadataPool, snapsType) | ||
| validateOmapCount(c.framework, 0, cephfsType, metadataPool, groupSnapsType) | ||
|
|
||
| return nil | ||
| } |
Oops, something went wrong.