github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

rbd: try to tolerate the images without 'kubernetes-dynamic-pvc' prefix

Browse Source 
The image hash which are dynamically provisioned by the intree driver
would contain this prefix. however if its statically provisioned image
it may not be the case. In such cases while retrieving the hash the
translation library should not try to index the splitted string based
on the assumed prefix.

Also added unit test for image name without dynamic provisioner prefix

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2022-09-21 18:47:26 +05:30
parent 0f582f7c3f
commit c4b67ed646
2 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/csi-translation-lib/plugins/rbd.go
View File

@ -294,7 +294,7 @@ func composeMigVolID(mons string, pool string, image string) string {
clusterIDInHandle := md5.Sum([]byte(mons))
clusterField := monsPfx + fmt.Sprintf("%x", clusterIDInHandle)
poolHashInHandle := hex.EncodeToString([]byte(pool))
imageHashInHandle := strings.Split(image, defaultIntreeImagePfx)[1]
imageHashInHandle := strings.TrimPrefix(image, defaultIntreeImagePfx)
imageField := imgPfx + imageHashInHandle
volHash := strings.Join([]string{migVolPfx, clusterField, imageField, poolHashInHandle}, "_")
return volHash

73
staging/src/k8s.io/csi-translation-lib/plugins/rbd_test.go
View File

@ -305,6 +305,79 @@ func TestTranslateRBDInTreePVToCSI(t *testing.T) {
},
errExpected: false,
},
{
name: "normal-pvc-without-dynamic-provisioner-pfx-set",
inTree: &v1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{
Name: RBDDriverName,
},
Spec: v1.PersistentVolumeSpec{
AccessModes: []v1.PersistentVolumeAccessMode{
v1.ReadWriteOnce,
},
ClaimRef: &v1.ObjectReference{
Name: "test-pvc",
Namespace: "default",
},
PersistentVolumeSource: v1.PersistentVolumeSource{
RBD: &v1.RBDPersistentVolumeSource{
CephMonitors: []string{"10.70.53.126:6789"},
RBDPool: "replicapool",
RBDImage: "e4111eb6-4088-11ec-b823-0242ac110003",
RadosUser: "admin",
FSType: "ext4",
ReadOnly: false,
SecretRef: &v1.SecretReference{
Name: "ceph-secret",
Namespace: "default",
},
},
},
},
},
csi: &v1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{
Name: RBDDriverName,
},
Spec: v1.PersistentVolumeSpec{
AccessModes: []v1.PersistentVolumeAccessMode{
v1.ReadWriteOnce,
},
ClaimRef: &v1.ObjectReference{
Name: "test-pvc",
Namespace: "default",
},
PersistentVolumeSource: v1.PersistentVolumeSource{
CSI: &v1.CSIPersistentVolumeSource{
Driver: RBDDriverName,
VolumeHandle: "mig_mons-b7f67366bb43f32e07d8a261a7840da9_image-e4111eb6-4088-11ec-b823-0242ac110003_7265706c696361706f6f6c",
ReadOnly: false,
FSType: "ext4",
VolumeAttributes: map[string]string{
"clusterID": "b7f67366bb43f32e07d8a261a7840da9",
"imageFeatures": "layering",
"imageFormat": "",
"imageName": "e4111eb6-4088-11ec-b823-0242ac110003",
"journalPool": "",
"migration": "true",
"pool": "replicapool",
"staticVolume": "true",
"tryOtherMounters": "true",
},
NodeStageSecretRef: &v1.SecretReference{
Name: "ceph-secret",
Namespace: "default",
},
ControllerExpandSecretRef: &v1.SecretReference{
Name: "ceph-secret",
Namespace: "default",
},
},
},
},
},
errExpected: false,
},
{
name: "nil PV",
inTree: nil,