github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106878 from humblec/rbd-1

Browse Source 
rbd: initialize ceph monitors slice with an empty value.
This commit is contained in:
Kubernetes Prow Robot 2021-12-08 11:47:55 -08:00 committed by GitHub
commit 8f91d09865
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 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

@ -219,7 +219,7 @@ func (p rbdCSITranslator) TranslateCSIPVToInTree(pv *v1.PersistentVolume) (*v1.P
return nil, fmt.Errorf("pv is nil or CSI source not defined on pv") return nil, fmt.Errorf("pv is nil or CSI source not defined on pv")
} }
var rbdImageName string var rbdImageName string
var monSlice []string monSlice := []string{""}
csiSource := pv.Spec.CSI csiSource := pv.Spec.CSI
rbdImageName = csiSource.VolumeAttributes[imgNameKey] rbdImageName = csiSource.VolumeAttributes[imgNameKey]

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

@ -415,7 +415,7 @@ func TestTranslateCSIPvToInTree(t *testing.T) {
}, },
PersistentVolumeSource: v1.PersistentVolumeSource{ PersistentVolumeSource: v1.PersistentVolumeSource{
RBD: &v1.RBDPersistentVolumeSource{ RBD: &v1.RBDPersistentVolumeSource{
CephMonitors: nil, CephMonitors: []string{""},
RBDPool: "replicapool", RBDPool: "replicapool",
RBDImage: "kubernetes-dynamic-pvc-e4111eb6-4088-11ec-b823-0242ac110003", RBDImage: "kubernetes-dynamic-pvc-e4111eb6-4088-11ec-b823-0242ac110003",
RadosUser: "admin", RadosUser: "admin",