Fix name of ec data pool StorageClass parameter

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
This commit is contained in:
Alexander Trost committed 2018-12-17 23:29:57 +01:00
1 parent e8d7b03ddb
commit cdf73a2d15
4 files changed
+15 -15

No files matched your search

@@ -51,7 +51,7 @@ const (
// PoolKey key for image name option.
ImageKey = "image"
// PoolKey key for data pool name option.
DataPoolKey = "dataPool"
DataBlockPoolKey = "dataBlockPool"
kubeletDefaultRootDir = "/var/lib/kubelet"
)
@@ -721,10 +721,10 @@ func TestGetAttachInfoFromMountDir(t *testing.T) {
FSType: "ext4",
ReadOnly: false,
Options: map[string]string{
StorageClassKey: "storageClass1",
PoolKey: "pool123",
ImageKey: "pvc-123",
DataPoolKey: "",
StorageClassKey: "storageClass1",
PoolKey: "pool123",
ImageKey: "pvc-123",
DataBlockPoolKey: "",
},
},
},
+5 -5
View File
@@ -59,7 +59,7 @@ type provisionerConfig struct {
fstype string
// Optional: For erasure coded pools the data pool must be given
dataPool string
dataBlockPool string
}
// New creates RookVolumeProvisioner
@@ -95,7 +95,7 @@ func (p *RookVolumeProvisioner) Provision(options controller.VolumeOptions) (*v1
return nil, err
}
blockImage, err := p.createVolume(imageName, cfg.blockPool, cfg.dataPool, cfg.clusterNamespace, requestBytes)
blockImage, err := p.createVolume(imageName, cfg.blockPool, cfg.dataBlockPool, cfg.clusterNamespace, requestBytes)
if err != nil {
return nil, err
}
@@ -133,7 +133,7 @@ func (p *RookVolumeProvisioner) Provision(options controller.VolumeOptions) (*v1
flexvolume.PoolKey: cfg.blockPool,
flexvolume.ImageKey: imageName,
flexvolume.ClusterNamespaceKey: cfg.clusterNamespace,
flexvolume.DataPoolKey: cfg.dataPool,
flexvolume.DataBlockPoolKey: cfg.dataBlockPool,
},
},
},
@@ -207,8 +207,8 @@ func parseClassParameters(params map[string]string) (*provisionerConfig, error)
cfg.clusterNamespace = v
case "fstype":
cfg.fstype = v
case "datapool":
cfg.dataPool = v
case "datablockpool":
cfg.dataBlockPool = v
default:
return nil, fmt.Errorf("invalid option %q for volume plugin %s", k, "rookVolumeProvisioner")
}
@@ -70,7 +70,7 @@ func TestProvisionImage(t *testing.T) {
}
provisioner := New(context, "foo.io")
volume := newVolumeOptions(newStorageClass("class-1", "foo.io/block", map[string]string{"pool": "testpool", "clusterNamespace": "testCluster", "fsType": "ext3", "dataPool": ""}, v1.PersistentVolumeReclaimRetain), newClaim("claim-1", "uid-1-1", "class-1", "", "class-1", nil), v1.PersistentVolumeReclaimRetain)
volume := newVolumeOptions(newStorageClass("class-1", "foo.io/block", map[string]string{"pool": "testpool", "clusterNamespace": "testCluster", "fsType": "ext3", "dataBlockPool": ""}, v1.PersistentVolumeReclaimRetain), newClaim("claim-1", "uid-1-1", "class-1", "", "class-1", nil), v1.PersistentVolumeReclaimRetain)
pv, err := provisioner.Provision(volume)
assert.Nil(t, err)
@@ -84,9 +84,9 @@ func TestProvisionImage(t *testing.T) {
assert.Equal(t, "class-1", pv.Spec.PersistentVolumeSource.FlexVolume.Options["storageClass"])
assert.Equal(t, "testpool", pv.Spec.PersistentVolumeSource.FlexVolume.Options["pool"])
assert.Equal(t, "pvc-uid-1-1", pv.Spec.PersistentVolumeSource.FlexVolume.Options["image"])
assert.Equal(t, "", pv.Spec.PersistentVolumeSource.FlexVolume.Options["dataPool"])
assert.Equal(t, "", pv.Spec.PersistentVolumeSource.FlexVolume.Options["dataBlockPool"])
volume = newVolumeOptions(newStorageClass("class-1", "foo.io/block", map[string]string{"pool": "testpool", "clusterNamespace": "testCluster", "fsType": "ext3", "dataPool": "iamdatapool"}, v1.PersistentVolumeReclaimRecycle), newClaim("claim-1", "uid-1-1", "class-1", "", "class-1", nil), v1.PersistentVolumeReclaimRecycle)
volume = newVolumeOptions(newStorageClass("class-1", "foo.io/block", map[string]string{"pool": "testpool", "clusterNamespace": "testCluster", "fsType": "ext3", "dataBlockPool": "iamdatapool"}, v1.PersistentVolumeReclaimRecycle), newClaim("claim-1", "uid-1-1", "class-1", "", "class-1", nil), v1.PersistentVolumeReclaimRecycle)
pv, err = provisioner.Provision(volume)
assert.Nil(t, err)
@@ -100,7 +100,7 @@ func TestProvisionImage(t *testing.T) {
assert.Equal(t, "class-1", pv.Spec.PersistentVolumeSource.FlexVolume.Options["storageClass"])
assert.Equal(t, "testpool", pv.Spec.PersistentVolumeSource.FlexVolume.Options["pool"])
assert.Equal(t, "pvc-uid-1-1", pv.Spec.PersistentVolumeSource.FlexVolume.Options["image"])
assert.Equal(t, "iamdatapool", pv.Spec.PersistentVolumeSource.FlexVolume.Options["dataPool"])
assert.Equal(t, "iamdatapool", pv.Spec.PersistentVolumeSource.FlexVolume.Options["dataBlockPool"])
}
func TestReclaimPolicyForProvisionedImages(t *testing.T) {
@@ -137,7 +137,7 @@ func TestReclaimPolicyForProvisionedImages(t *testing.T) {
provisioner := New(context, "foo.io")
for _, reclaimPolicy := range []v1.PersistentVolumeReclaimPolicy{v1.PersistentVolumeReclaimDelete, v1.PersistentVolumeReclaimRetain, v1.PersistentVolumeReclaimRecycle} {
volume := newVolumeOptions(newStorageClass("class-1", "foo.io/block", map[string]string{"pool": "testpool", "clusterNamespace": "testCluster", "fsType": "ext3", "dataPool": "iamdatapool"}, reclaimPolicy), newClaim("claim-1", "uid-1-1", "class-1", "", "class-1", nil), reclaimPolicy)
volume := newVolumeOptions(newStorageClass("class-1", "foo.io/block", map[string]string{"pool": "testpool", "clusterNamespace": "testCluster", "fsType": "ext3", "dataBlockPool": "iamdatapool"}, reclaimPolicy), newClaim("claim-1", "uid-1-1", "class-1", "", "class-1", nil), reclaimPolicy)
pv, err := provisioner.Provision(volume)
assert.Nil(t, err)