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

Merge pull request #46124 from humblec/cephfs-vol-source

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46124, 46434, 46089, 45589, 46045)

Add CephFS volume source to describe printer.
This commit is contained in:
Kubernetes Submit Queue 2017-05-25 21:39:56 -07:00 committed by GitHub
commit b642ae2c18
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/printers/internalversion/describe.go
View File

@ -735,6 +735,8 @@ func describeVolumes(volumes []api.Volume, w PrefixWriter, space string) {
printPortworxVolumeSource(volume.VolumeSource.PortworxVolume, w) printPortworxVolumeSource(volume.VolumeSource.PortworxVolume, w)
case volume.VolumeSource.ScaleIO != nil: case volume.VolumeSource.ScaleIO != nil:
printScaleIOVolumeSource(volume.VolumeSource.ScaleIO, w) printScaleIOVolumeSource(volume.VolumeSource.ScaleIO, w)
case volume.VolumeSource.CephFS != nil:
printCephFSVolumeSource(volume.VolumeSource.CephFS, w)
default: default:
w.Write(LEVEL_1, "<unknown>\n") w.Write(LEVEL_1, "<unknown>\n")
} }
@ -922,6 +924,17 @@ func printLocalVolumeSource(ls *api.LocalVolumeSource, w PrefixWriter) {
ls.Path) ls.Path)
} }
func printCephFSVolumeSource(cephfs *api.CephFSVolumeSource, w PrefixWriter) {
w.Write(LEVEL_2, "Type:\tCephFS (a CephFS mount on the host that shares a pod's lifetime)\n"+
" Monitors:\t%v\n"+
" Path:\t%v\n"+
" User:\t%v\n"+
" SecretFile:\t%v\n"+
" SecretRef:\t%v\n"+
" ReadOnly:\t%v\n",
cephfs.Monitors, cephfs.Path, cephfs.User, cephfs.SecretFile, cephfs.SecretRef, cephfs.ReadOnly)
}
type PersistentVolumeDescriber struct { type PersistentVolumeDescriber struct {
clientset.Interface clientset.Interface
} }
@ -993,6 +1006,8 @@ func describePersistentVolume(pv *api.PersistentVolume, events *api.EventList) (
printScaleIOVolumeSource(pv.Spec.ScaleIO, w) printScaleIOVolumeSource(pv.Spec.ScaleIO, w)
case pv.Spec.Local != nil: case pv.Spec.Local != nil:
printLocalVolumeSource(pv.Spec.Local, w) printLocalVolumeSource(pv.Spec.Local, w)
case pv.Spec.CephFS != nil:
printCephFSVolumeSource(pv.Spec.CephFS, w)
} }
if events != nil { if events != nil {