In kubelet's handler of pod update, prints out deletiontimestamp if it's not nil

This commit is contained in:
Chao Xu
2016-06-08 16:32:30 -07:00
parent 85b67f2f00
commit ccecc59ff2
2 changed files with 18 additions and 1 deletions

View File

@@ -19,6 +19,7 @@ package format
import (
"fmt"
"strings"
"time"
"k8s.io/kubernetes/pkg/api"
)
@@ -33,12 +34,28 @@ func Pod(pod *api.Pod) string {
return fmt.Sprintf("%s_%s(%s)", pod.Name, pod.Namespace, pod.UID)
}
// PodWithDeletionTimestamp is the same as Pod. In addition, it prints the
// deletion timestamp of the pod if it's not nil.
func PodWithDeletionTimestamp(pod *api.Pod) string {
var deletionTimestamp string
if pod.DeletionTimestamp != nil {
deletionTimestamp = ":DeletionTimestamp=" + pod.DeletionTimestamp.UTC().Format(time.RFC3339)
}
return Pod(pod) + deletionTimestamp
}
// Pods returns a string representating a list of pods in a human
// readable format.
func Pods(pods []*api.Pod) string {
return aggregatePods(pods, Pod)
}
// PodsWithDeletiontimestamps is the same as Pods. In addition, it prints the
// deletion timestamps of the pods if they are not nil.
func PodsWithDeletiontimestamps(pods []*api.Pod) string {
return aggregatePods(pods, PodWithDeletionTimestamp)
}
func aggregatePods(pods []*api.Pod, handler podHandler) string {
podStrings := make([]string, 0, len(pods))
for _, pod := range pods {