mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #46210 from xiangpengzhao/print-volume-info
Automatic merge from submit-queue Add AzureFile,FC,Flex,Flocker volume source to describe printer. **What this PR does / why we need it**: Display other volume sources in describe printer. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: Also need CephFS. It will be added in #46124 /cc @rootfs _ADD: all the volume source printers are sorted out of order. I'd like to sort them alphabetically in order to be more readable in another PR after this PR merged. WDYT?_ **Release note**: ```release-note NONE ```
This commit is contained in:
commit
b940d14261
@ -750,6 +750,12 @@ func describeVolumes(volumes []api.Volume, w PrefixWriter, space string) {
|
|||||||
printStorageOSVolumeSource(volume.VolumeSource.StorageOS, w)
|
printStorageOSVolumeSource(volume.VolumeSource.StorageOS, w)
|
||||||
case volume.VolumeSource.FC != nil:
|
case volume.VolumeSource.FC != nil:
|
||||||
printFCVolumeSource(volume.VolumeSource.FC, w)
|
printFCVolumeSource(volume.VolumeSource.FC, w)
|
||||||
|
case volume.VolumeSource.AzureFile != nil:
|
||||||
|
printAzureFileVolumeSource(volume.VolumeSource.AzureFile, w)
|
||||||
|
case volume.VolumeSource.FlexVolume != nil:
|
||||||
|
printFlexVolumeSource(volume.VolumeSource.FlexVolume, w)
|
||||||
|
case volume.VolumeSource.Flocker != nil:
|
||||||
|
printFlockerVolumeSource(volume.VolumeSource.Flocker, w)
|
||||||
default:
|
default:
|
||||||
w.Write(LEVEL_1, "<unknown>\n")
|
w.Write(LEVEL_1, "<unknown>\n")
|
||||||
}
|
}
|
||||||
@ -979,6 +985,31 @@ func printFCVolumeSource(fc *api.FCVolumeSource, w PrefixWriter) {
|
|||||||
strings.Join(fc.TargetWWNs, ", "), lun, fc.FSType, fc.ReadOnly)
|
strings.Join(fc.TargetWWNs, ", "), lun, fc.FSType, fc.ReadOnly)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func printAzureFileVolumeSource(azureFile *api.AzureFileVolumeSource, w PrefixWriter) {
|
||||||
|
w.Write(LEVEL_2, "Type:\tAzureFile (an Azure File Service mount on the host and bind mount to the pod)\n"+
|
||||||
|
" SecretName:\t%v\n"+
|
||||||
|
" ShareName:\t%v\n"+
|
||||||
|
" ReadOnly:\t%v\n",
|
||||||
|
azureFile.SecretName, azureFile.ShareName, azureFile.ReadOnly)
|
||||||
|
}
|
||||||
|
|
||||||
|
func printFlexVolumeSource(flex *api.FlexVolumeSource, w PrefixWriter) {
|
||||||
|
w.Write(LEVEL_2, "Type:\tFlexVolume (a generic volume resource that is provisioned/attached using an exec based plugin)\n"+
|
||||||
|
" Driver:\t%v\n"+
|
||||||
|
" FSType:\t%v\n"+
|
||||||
|
" SecretRef:\t%v\n"+
|
||||||
|
" ReadOnly:\t%v\n",
|
||||||
|
" Options:\t%v\n",
|
||||||
|
flex.Driver, flex.FSType, flex.SecretRef, flex.ReadOnly, flex.Options)
|
||||||
|
}
|
||||||
|
|
||||||
|
func printFlockerVolumeSource(flocker *api.FlockerVolumeSource, w PrefixWriter) {
|
||||||
|
w.Write(LEVEL_2, "Type:\tFlocker (a Flocker volume mounted by the Flocker agent)\n"+
|
||||||
|
" DatasetName:\t%v\n"+
|
||||||
|
" DatasetUUID:\t%v\n",
|
||||||
|
flocker.DatasetName, flocker.DatasetUUID)
|
||||||
|
}
|
||||||
|
|
||||||
type PersistentVolumeDescriber struct {
|
type PersistentVolumeDescriber struct {
|
||||||
clientset.Interface
|
clientset.Interface
|
||||||
}
|
}
|
||||||
@ -1056,6 +1087,14 @@ func describePersistentVolume(pv *api.PersistentVolume, events *api.EventList) (
|
|||||||
printStorageOSPersistentVolumeSource(pv.Spec.StorageOS, w)
|
printStorageOSPersistentVolumeSource(pv.Spec.StorageOS, w)
|
||||||
case pv.Spec.FC != nil:
|
case pv.Spec.FC != nil:
|
||||||
printFCVolumeSource(pv.Spec.FC, w)
|
printFCVolumeSource(pv.Spec.FC, w)
|
||||||
|
case pv.Spec.AzureFile != nil:
|
||||||
|
printAzureFileVolumeSource(pv.Spec.AzureFile, w)
|
||||||
|
case pv.Spec.FlexVolume != nil:
|
||||||
|
printFlexVolumeSource(pv.Spec.FlexVolume, w)
|
||||||
|
case pv.Spec.Flocker != nil:
|
||||||
|
printFlockerVolumeSource(pv.Spec.Flocker, w)
|
||||||
|
default:
|
||||||
|
w.Write(LEVEL_1, "<unknown>\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
if events != nil {
|
if events != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user