jayjay
/
k9s
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: job color based on failures (#2686) (#2698) 

* fix: job color based on failures (#2686)

* fix: don't show error when job succeeds in next attempt
mine
KasperHeyndrickx 2024-05-18 16:49:20 +02:00 committed by GitHub
parent d468d4b783
commit 2fca1a1655
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/render/job.go
View File

@ -13,7 +13,6 @@ import (
"github.com/derailed/k9s/internal/model1" "github.com/derailed/k9s/internal/model1"
batchv1 "k8s.io/api/batch/v1" batchv1 "k8s.io/api/batch/v1"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/duration" "k8s.io/apimachinery/pkg/util/duration"
@ -65,19 +64,18 @@ func (j Job) Render(o interface{}, ns string, r *model1.Row) error {
jobSelector(job.Spec), jobSelector(job.Spec),
cc, cc,
ii, ii,
AsStatus(j.diagnose(ready, job.Status.CompletionTime)), AsStatus(j.diagnose(ready, job.Status)),
ToAge(job.GetCreationTimestamp()), ToAge(job.GetCreationTimestamp()),
} }
return nil return nil
} }
func (Job) diagnose(ready string, completed *metav1.Time) error { func (Job) diagnose(ready string, status batchv1.JobStatus) error {
tokens := strings.Split(ready, "/") tokens := strings.Split(ready, "/")
if tokens[0] != tokens[1] { if tokens[0] != tokens[1] && status.Failed > 0 {
return fmt.Errorf("expecting %s completion got %s", tokens[1], tokens[0]) return fmt.Errorf("%d pods failed", status.Failed)
} }
return nil return nil
} }