github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated CSIDriver references

Browse Source
This commit is contained in:
Christian Huffman
2020-02-28 17:13:11 -05:00
parent 726af6bd7f
commit c6fd25d100
45 changed files with 1091 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/storage/utils/deployment.go
View File

@@ -23,7 +23,6 @@ import (
appsv1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
storagev1 "k8s.io/api/storage/v1"
storagev1beta1 "k8s.io/api/storage/v1beta1"
"k8s.io/kubernetes/test/e2e/framework"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
)
@@ -118,7 +117,7 @@ func PatchCSIDeployment(f *framework.Framework, o PatchCSIOptions, object interf
// as the provisioner name here.
object.Provisioner = o.NewDriverName
}
case *storagev1beta1.CSIDriver:
case *storagev1.CSIDriver:
if o.NewDriverName != "" {
object.Name = o.NewDriverName
}
@@ -173,5 +172,5 @@ type PatchCSIOptions struct {
// If not nil, the value to use for the CSIDriver.Spec.VolumeLifecycleModes
// field *if* the driver deploys a CSIDriver object. Ignored
// otherwise.
VolumeLifecycleModes *[]storagev1beta1.VolumeLifecycleMode
VolumeLifecycleModes *[]storagev1.VolumeLifecycleMode
}