Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pkg/controller/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@ func TestFSTypeProvision(t *testing.T) {
volOpts: controller.ProvisionOptions{
StorageClass: &storagev1.StorageClass{
ReclaimPolicy: &deletePolicy,
Parameters: map[string]string{
Parameters: map[string]string{
// We deliberately skip fsType in sc param
// "fstype": "",
},
Expand Down Expand Up @@ -1028,7 +1028,7 @@ func TestFSTypeProvision(t *testing.T) {
volOpts: controller.ProvisionOptions{
StorageClass: &storagev1.StorageClass{
ReclaimPolicy: &deletePolicy,
Parameters: map[string]string{
Parameters: map[string]string{
// We deliberately skip fsType in sc param
// "fstype": "xfs",
},
Expand Down Expand Up @@ -6680,9 +6680,11 @@ func TestProvisionFromPVC(t *testing.T) {
if tc.volOpts.PVC.Spec.DataSourceRef != nil || tc.volOpts.PVC.Spec.DataSource != nil {
var claim *v1.PersistentVolumeClaim
if tc.volOpts.PVC.Spec.DataSourceRef != nil {
claim, _ = claimLister.PersistentVolumeClaims(tc.volOpts.PVC.Namespace).Get(tc.volOpts.PVC.Spec.DataSourceRef.Name)
claim, _ = clientSet.CoreV1().PersistentVolumeClaims(tc.volOpts.PVC.Namespace).Get(context.Background(),
tc.volOpts.PVC.Spec.DataSourceRef.Name, metav1.GetOptions{})
} else if tc.volOpts.PVC.Spec.DataSource != nil {
claim, _ = claimLister.PersistentVolumeClaims(tc.volOpts.PVC.Namespace).Get(tc.volOpts.PVC.Spec.DataSource.Name)
claim, _ = clientSet.CoreV1().PersistentVolumeClaims(tc.volOpts.PVC.Namespace).Get(context.Background(),
tc.volOpts.PVC.Spec.DataSource.Name, metav1.GetOptions{})
}
if claim != nil {
set := checkFinalizer(claim, pvcCloneFinalizer)
Expand Down