github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-28 13:03:43 +00:00
Code Issues Projects Releases Wiki Activity

Implement kubectl describe <fibre-channel PV>

Browse Source
This commit is contained in:
Jan Safranek 2017-07-12 12:34:43 +02:00
parent 0744964956
commit 09e241294f
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import (
"net/url" "net/url"
"reflect" "reflect"
"sort" "sort"
"strconv"
"strings" "strings"
"text/tabwriter" "text/tabwriter"
"time" "time"
@ -744,6 +745,8 @@ func describeVolumes(volumes []api.Volume, w PrefixWriter, space string) {
printCephFSVolumeSource(volume.VolumeSource.CephFS, w) printCephFSVolumeSource(volume.VolumeSource.CephFS, w)
case volume.VolumeSource.StorageOS != nil: case volume.VolumeSource.StorageOS != nil:
printStorageOSVolumeSource(volume.VolumeSource.StorageOS, w) printStorageOSVolumeSource(volume.VolumeSource.StorageOS, w)
case volume.VolumeSource.FC != nil:
printFCVolumeSource(volume.VolumeSource.FC, w)
default: default:
w.Write(LEVEL_1, "<unknown>\n") w.Write(LEVEL_1, "<unknown>\n")
} }
@ -960,6 +963,19 @@ func printStorageOSPersistentVolumeSource(storageos *api.StorageOSPersistentVolu
storageos.VolumeName, storageos.VolumeNamespace, storageos.FSType, storageos.ReadOnly) storageos.VolumeName, storageos.VolumeNamespace, storageos.FSType, storageos.ReadOnly)
} }
func printFCVolumeSource(fc *api.FCVolumeSource, w PrefixWriter) {
lun := "<none>"
if fc.Lun != nil {
lun = strconv.Itoa(int(*fc.Lun))
}
w.Write(LEVEL_2, "Type:\tFC (a Fibre Channel disk)\n"+
" TargetWWNs:\t%v\n"+
" LUN:\t%v\n"+
" FSType:\t%v\n"+
" ReadOnly:\t%v\n",
strings.Join(fc.TargetWWNs, ", "), lun, fc.FSType, fc.ReadOnly)
}
type PersistentVolumeDescriber struct { type PersistentVolumeDescriber struct {
clientset.Interface clientset.Interface
} }
@ -1035,6 +1051,8 @@ func describePersistentVolume(pv *api.PersistentVolume, events *api.EventList) (
printCephFSVolumeSource(pv.Spec.CephFS, w) printCephFSVolumeSource(pv.Spec.CephFS, w)
case pv.Spec.StorageOS != nil: case pv.Spec.StorageOS != nil:
printStorageOSPersistentVolumeSource(pv.Spec.StorageOS, w) printStorageOSPersistentVolumeSource(pv.Spec.StorageOS, w)
case pv.Spec.FC != nil:
printFCVolumeSource(pv.Spec.FC, w)
} }
if events != nil { if events != nil {

8
pkg/printers/internalversion/describe_test.go
View File

@ -700,6 +700,14 @@ func TestPersistentVolumeDescriber(t *testing.T) {
}, },
}, },
}, },
"fc": {
ObjectMeta: metav1.ObjectMeta{Name: "bar"},
Spec: api.PersistentVolumeSpec{
PersistentVolumeSource: api.PersistentVolumeSource{
FC: &api.FCVolumeSource{},
},
},
},
} }
for name, pv := range tests { for name, pv := range tests {