Skip to content

K
k3s
Commit df99dfd0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #31358 from screeley44/k8-get-pv

Automatic merge from submit-queue Add ReclaimPolicy to the resource printer for 'get pv' Propose we add the RECLAIMPOLICY (persistentVolumeReclaimPolicy) from resource_printer.go to show the policy when a user does a ```kubectl get pv``` ``` [root@k8dev nfs]# kubectl get pv NAME CAPACITY ACCESSMODES RECLAIMPOLICY STATUS CLAIM REASON AGE pv-nfs 1Gi RWO Retain Available 1m pv-nfs2 1Gi RWO Delete Available 4s ```
parents 8705a41c 22665e18
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
pkg/kubectl/resource_printer.go
View file @ df99dfd0
...@@ -474,7 +474,7 @@ var resourceQuotaColumns = []string{"NAME", "AGE"} ...@@ -474,7 +474,7 @@ var resourceQuotaColumns = []string{"NAME", "AGE"}
var namespaceColumns = []string{"NAME", "STATUS", "AGE"} var namespaceColumns = []string{"NAME", "STATUS", "AGE"}
var secretColumns = []string{"NAME", "TYPE", "DATA", "AGE"} var secretColumns = []string{"NAME", "TYPE", "DATA", "AGE"}
var serviceAccountColumns = []string{"NAME", "SECRETS", "AGE"} var serviceAccountColumns = []string{"NAME", "SECRETS", "AGE"}
var persistentVolumeColumns = []string{"NAME", "CAPACITY", "ACCESSMODES", "STATUS", "CLAIM", "REASON", "AGE"} var persistentVolumeColumns = []string{"NAME", "CAPACITY", "ACCESSMODES", "RECLAIMPOLICY", "STATUS", "CLAIM", "REASON", "AGE"}
var persistentVolumeClaimColumns = []string{"NAME", "STATUS", "VOLUME", "CAPACITY", "ACCESSMODES", "AGE"} var persistentVolumeClaimColumns = []string{"NAME", "STATUS", "VOLUME", "CAPACITY", "ACCESSMODES", "AGE"}
var componentStatusColumns = []string{"NAME", "STATUS", "MESSAGE", "ERROR"} var componentStatusColumns = []string{"NAME", "STATUS", "MESSAGE", "ERROR"}
var thirdPartyResourceColumns = []string{"NAME", "DESCRIPTION", "VERSION(S)"} var thirdPartyResourceColumns = []string{"NAME", "DESCRIPTION", "VERSION(S)"}
...@@ -1513,13 +1513,14 @@ func printPersistentVolume(pv *api.PersistentVolume, w io.Writer, options PrintO ...@@ -1513,13 +1513,14 @@ func printPersistentVolume(pv *api.PersistentVolume, w io.Writer, options PrintO
} }
modesStr := api.GetAccessModesAsString(pv.Spec.AccessModes) modesStr := api.GetAccessModesAsString(pv.Spec.AccessModes)
reclaimPolicyStr := string(pv.Spec.PersistentVolumeReclaimPolicy)
aQty := pv.Spec.Capacity[api.ResourceStorage] aQty := pv.Spec.Capacity[api.ResourceStorage]
aSize := aQty.String() aSize := aQty.String()
if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\t%s", if _, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s",
name, name,
aSize, modesStr, aSize, modesStr, reclaimPolicyStr,
pv.Status.Phase, pv.Status.Phase,
claimRefUID, claimRefUID,
pv.Status.Reason, pv.Status.Reason,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment