Merge pull request #71313 from wozniakjan/kubectl/fix_pv_describe_openstack

kubectl: fix PV describe output for Cinder
This commit is contained in:
Kubernetes Prow Robot 2019-01-04 06:39:45 -08:00 committed by GitHub
commit 62e8a1bf40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1041,8 +1041,8 @@ func printCinderVolumeSource(cinder *corev1.CinderVolumeSource, w PrefixWriter)
w.Write(LEVEL_2, "Type:\tCinder (a Persistent Disk resource in OpenStack)\n"+ w.Write(LEVEL_2, "Type:\tCinder (a Persistent Disk resource in OpenStack)\n"+
" VolumeID:\t%v\n"+ " VolumeID:\t%v\n"+
" FSType:\t%v\n"+ " FSType:\t%v\n"+
" ReadOnly:\t%v\n", " ReadOnly:\t%v\n"+
" SecretRef:\t%v\n"+ " SecretRef:\t%v\n",
cinder.VolumeID, cinder.FSType, cinder.ReadOnly, cinder.SecretRef) cinder.VolumeID, cinder.FSType, cinder.ReadOnly, cinder.SecretRef)
} }
@ -1050,9 +1050,9 @@ func printCinderPersistentVolumeSource(cinder *corev1.CinderPersistentVolumeSour
w.Write(LEVEL_2, "Type:\tCinder (a Persistent Disk resource in OpenStack)\n"+ w.Write(LEVEL_2, "Type:\tCinder (a Persistent Disk resource in OpenStack)\n"+
" VolumeID:\t%v\n"+ " VolumeID:\t%v\n"+
" FSType:\t%v\n"+ " FSType:\t%v\n"+
" ReadOnly:\t%v\n", " ReadOnly:\t%v\n"+
" SecretRef:\t%v\n"+ " SecretRef:\t%v\n",
cinder.VolumeID, cinder.SecretRef, cinder.FSType, cinder.ReadOnly, cinder.SecretRef) cinder.VolumeID, cinder.FSType, cinder.ReadOnly, cinder.SecretRef)
} }
func printScaleIOVolumeSource(sio *corev1.ScaleIOVolumeSource, w PrefixWriter) { func printScaleIOVolumeSource(sio *corev1.ScaleIOVolumeSource, w PrefixWriter) {