github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

added better matching for PV access modes

Browse Source
This commit is contained in:
markturansky
2015-07-13 15:10:04 -04:00
parent 650bf71cf7
commit 0b6030f50c
7 changed files with 337 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/resource_printer.go
View File

@@ -40,7 +40,6 @@ import (
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/jsonpath"
"k8s.io/kubernetes/pkg/volume"
)
// GetPrinter takes a format type, an optional format argument. It will return true
@@ -872,7 +871,7 @@ func printPersistentVolume(pv *api.PersistentVolume, w io.Writer, withNamespace
claimRefUID += pv.Spec.ClaimRef.Name
}
modesStr := volume.GetAccessModesAsString(pv.Spec.AccessModes)
modesStr := api.GetAccessModesAsString(pv.Spec.AccessModes)
aQty := pv.Spec.Capacity[api.ResourceStorage]
aSize := aQty.String()
@@ -917,7 +916,7 @@ func printPersistentVolumeClaim(pvc *api.PersistentVolumeClaim, w io.Writer, wit
capacity := ""
accessModes := ""
if pvc.Spec.VolumeName != "" {
accessModes = volume.GetAccessModesAsString(pvc.Status.AccessModes)
accessModes = api.GetAccessModesAsString(pvc.Status.AccessModes)
storage = pvc.Status.Capacity[api.ResourceStorage]
capacity = storage.String()
}