Merge pull request #90878 from saikat-royc/snapshotter-provisioner

Pickup Snapshot Provisioner from the snapshot class "driver" info.
This commit is contained in:
Kubernetes Prow Robot 2020-05-08 13:43:51 -07:00 committed by GitHub
commit 13010d199c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -339,6 +339,10 @@ func (d *driverDefinition) GetSnapshotClass(e2econfig *testsuites.PerTestConfig)
parameters[k] = v.(string)
}
}
if snapshotProvider, ok := snapshotClass.Object["driver"]; ok {
snapshotter = snapshotProvider.(string)
}
case d.SnapshotClass.FromFile != "":
snapshotClass, err := loadSnapshotClass(d.SnapshotClass.FromFile)
framework.ExpectNoError(err, "load snapshot class from %s", d.SnapshotClass.FromFile)
@ -348,6 +352,10 @@ func (d *driverDefinition) GetSnapshotClass(e2econfig *testsuites.PerTestConfig)
parameters[k] = v.(string)
}
}
if snapshotProvider, ok := snapshotClass.Object["driver"]; ok {
snapshotter = snapshotProvider.(string)
}
}
return testsuites.GetSnapshotClass(snapshotter, parameters, ns, suffix)