github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bugfix: kubectl shows last<invalid> if pv, pod, pvc is terminating 

fix describe ut
pull/564/head
caiweidong 2019-03-01 14:34:54 +08:00
parent 824883d08a
commit bdfd420c6d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/describe/versioned/describe.go
View File

@ -674,7 +674,7 @@ func describePod(pod *corev1.Pod, events *corev1.EventList) (string, error) {
printLabelsMultiline(w, "Labels", pod.Labels) printLabelsMultiline(w, "Labels", pod.Labels)
printAnnotationsMultiline(w, "Annotations", pod.Annotations) printAnnotationsMultiline(w, "Annotations", pod.Annotations)
if pod.DeletionTimestamp != nil { if pod.DeletionTimestamp != nil {
w.Write(LEVEL_0, "Status:\tTerminating (lasts %s)\n", translateTimestampUntil(*pod.DeletionTimestamp)) w.Write(LEVEL_0, "Status:\tTerminating (lasts %s)\n", translateTimestampSince(*pod.DeletionTimestamp))
w.Write(LEVEL_0, "Termination Grace Period:\t%ds\n", *pod.DeletionGracePeriodSeconds) w.Write(LEVEL_0, "Termination Grace Period:\t%ds\n", *pod.DeletionGracePeriodSeconds)
} else { } else {
w.Write(LEVEL_0, "Status:\t%s\n", string(pod.Status.Phase)) w.Write(LEVEL_0, "Status:\t%s\n", string(pod.Status.Phase))
@ -1329,7 +1329,7 @@ func describePersistentVolume(pv *corev1.PersistentVolume, events *corev1.EventL
w.Write(LEVEL_0, "Finalizers:\t%v\n", pv.ObjectMeta.Finalizers) w.Write(LEVEL_0, "Finalizers:\t%v\n", pv.ObjectMeta.Finalizers)
w.Write(LEVEL_0, "StorageClass:\t%s\n", storageutil.GetPersistentVolumeClass(pv)) w.Write(LEVEL_0, "StorageClass:\t%s\n", storageutil.GetPersistentVolumeClass(pv))
if pv.ObjectMeta.DeletionTimestamp != nil { if pv.ObjectMeta.DeletionTimestamp != nil {
w.Write(LEVEL_0, "Status:\tTerminating (lasts %s)\n", translateTimestampUntil(*pv.ObjectMeta.DeletionTimestamp)) w.Write(LEVEL_0, "Status:\tTerminating (lasts %s)\n", translateTimestampSince(*pv.ObjectMeta.DeletionTimestamp))
} else { } else {
w.Write(LEVEL_0, "Status:\t%v\n", pv.Status.Phase) w.Write(LEVEL_0, "Status:\t%v\n", pv.Status.Phase)
} }
@ -1470,7 +1470,7 @@ func describePersistentVolumeClaim(pvc *corev1.PersistentVolumeClaim, events *co
w.Write(LEVEL_0, "Namespace:\t%s\n", pvc.Namespace) w.Write(LEVEL_0, "Namespace:\t%s\n", pvc.Namespace)
w.Write(LEVEL_0, "StorageClass:\t%s\n", storageutil.GetPersistentVolumeClaimClass(pvc)) w.Write(LEVEL_0, "StorageClass:\t%s\n", storageutil.GetPersistentVolumeClaimClass(pvc))
if pvc.ObjectMeta.DeletionTimestamp != nil { if pvc.ObjectMeta.DeletionTimestamp != nil {
w.Write(LEVEL_0, "Status:\tTerminating (lasts %s)\n", translateTimestampUntil(*pvc.ObjectMeta.DeletionTimestamp)) w.Write(LEVEL_0, "Status:\tTerminating (lasts %s)\n", translateTimestampSince(*pvc.ObjectMeta.DeletionTimestamp))
} else { } else {
w.Write(LEVEL_0, "Status:\t%v\n", pvc.Status.Phase) w.Write(LEVEL_0, "Status:\t%v\n", pvc.Status.Phase)
} }

6
pkg/kubectl/describe/versioned/describe_test.go
View File

@ -51,7 +51,7 @@ type describeClient struct {
} }
func TestDescribePod(t *testing.T) { func TestDescribePod(t *testing.T) {
deletionTimestamp := metav1.Time{Time: time.Now().UTC().AddDate(10, 0, 0)} deletionTimestamp := metav1.Time{Time: time.Now().UTC().AddDate(-10, 0, 0)}
gracePeriod := int64(1234) gracePeriod := int64(1234)
condition1 := corev1.PodConditionType("condition1") condition1 := corev1.PodConditionType("condition1")
condition2 := corev1.PodConditionType("condition2") condition2 := corev1.PodConditionType("condition2")
@ -937,7 +937,7 @@ func TestGetPodsTotalRequests(t *testing.T) {
func TestPersistentVolumeDescriber(t *testing.T) { func TestPersistentVolumeDescriber(t *testing.T) {
block := corev1.PersistentVolumeBlock block := corev1.PersistentVolumeBlock
file := corev1.PersistentVolumeFilesystem file := corev1.PersistentVolumeFilesystem
deletionTimestamp := metav1.Time{Time: time.Now().UTC().AddDate(10, 0, 0)} deletionTimestamp := metav1.Time{Time: time.Now().UTC().AddDate(-10, 0, 0)}
testCases := []struct { testCases := []struct {
name string name string
plugin string plugin string
@ -1305,7 +1305,7 @@ func TestPersistentVolumeClaimDescriber(t *testing.T) {
file := corev1.PersistentVolumeFilesystem file := corev1.PersistentVolumeFilesystem
goldClassName := "gold" goldClassName := "gold"
now := time.Now() now := time.Now()
deletionTimestamp := metav1.Time{Time: time.Now().UTC().AddDate(10, 0, 0)} deletionTimestamp := metav1.Time{Time: time.Now().UTC().AddDate(-10, 0, 0)}
testCases := []struct { testCases := []struct {
name string name string
pvc *corev1.PersistentVolumeClaim pvc *corev1.PersistentVolumeClaim