diff --git a/Makefile b/Makefile index ed2b12ae..650f0447 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,7 @@ NAME := k9s PACKAGE := github.com/derailed/$(NAME) GIT := $(shell git rev-parse --short HEAD) -SOURCE_DATE_EPOCH ?= $(shell date +%s) -DATE := $(shell date -u -d @${SOURCE_DATE_EPOCH} +%FT%T%Z) +DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") VERSION ?= v0.24.3 IMG_NAME := derailed/k9s IMAGE := ${IMG_NAME}:${VERSION} diff --git a/go.mod b/go.mod index a9329fb3..472cfaa9 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible github.com/cenkalti/backoff/v4 v4.1.0 github.com/derailed/popeye v0.9.0 - github.com/derailed/tview v0.4.10 + github.com/derailed/tview v0.4.11 github.com/drone/envsubst v1.0.2 // indirect github.com/emicklei/go-restful v2.15.0+incompatible // indirect github.com/fatih/color v1.10.0 diff --git a/go.sum b/go.sum index bbe3b6ee..2639f928 100644 --- a/go.sum +++ b/go.sum @@ -192,8 +192,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xb github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/derailed/popeye v0.9.0 h1:0zP4BAzo94RUjrUkzgF962v0zL9B3xyopd7kU7tMxuc= github.com/derailed/popeye v0.9.0/go.mod h1:g3hudQlbEEChCA7U44fA+utTM9xQpD4pINUMQaiq5Gs= -github.com/derailed/tview v0.4.10 h1:/4qviOQq3XADLQU2mbBIur7jUxouAsB3I+XZujOTSIY= -github.com/derailed/tview v0.4.10/go.mod h1:FrWq4XTQjisx2NIl9n3j6OD6NL03HxUYeVvZwSy1JYE= +github.com/derailed/tview v0.4.11 h1:eBDLsiFd/uQy2/xGsKbJiaYZiZNDDf0CbWIHwyBO1EI= +github.com/derailed/tview v0.4.11/go.mod h1:FrWq4XTQjisx2NIl9n3j6OD6NL03HxUYeVvZwSy1JYE= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= diff --git a/internal/render/pod.go b/internal/render/pod.go index 7b560106..f95e2f69 100644 --- a/internal/render/pod.go +++ b/internal/render/pod.go @@ -13,7 +13,6 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/1.5/pkg/api" mv1beta1 "k8s.io/metrics/pkg/apis/metrics/v1beta1" ) @@ -160,7 +159,7 @@ func asReadinessGate(pod v1.Pod) string { conditionType := readinessGate.ConditionType for _, condition := range pod.Status.Conditions { if condition.Type == conditionType { - if condition.Status == api.ConditionTrue { + if condition.Status == "True" { trueConditions++ } break