github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #89570 from zhouya0/fix_describe_job_nil_pointer

Browse Source 
Fix kubectl describe job event test nil pointer
This commit is contained in:
Kubernetes Prow Robot
2020-04-15 07:02:16 -07:00
committed by GitHub
parent 4cf56b0996 a576a3c707
commit 69e9c6bb05
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/kubectl/pkg/describe/BUILD
View File

@@ -80,6 +80,7 @@ go_test(
"//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
"//staging/src/k8s.io/api/autoscaling/v2beta2:go_default_library", "//staging/src/k8s.io/api/autoscaling/v2beta2:go_default_library",
"//staging/src/k8s.io/api/batch/v1:go_default_library",
"//staging/src/k8s.io/api/coordination/v1:go_default_library", "//staging/src/k8s.io/api/coordination/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/discovery/v1beta1:go_default_library", "//staging/src/k8s.io/api/discovery/v1beta1:go_default_library",

4
staging/src/k8s.io/kubectl/pkg/describe/describe.go
View File

@@ -2116,7 +2116,9 @@ func describeJob(job *batchv1.Job, events *corev1.EventList) (string, error) {
if controlledBy := printController(job); len(controlledBy) > 0 { if controlledBy := printController(job); len(controlledBy) > 0 {
w.Write(LEVEL_0, "Controlled By:\t%s\n", controlledBy) w.Write(LEVEL_0, "Controlled By:\t%s\n", controlledBy)
} }
w.Write(LEVEL_0, "Parallelism:\t%d\n", *job.Spec.Parallelism) if job.Spec.Parallelism != nil {
w.Write(LEVEL_0, "Parallelism:\t%d\n", *job.Spec.Parallelism)
}
if job.Spec.Completions != nil { if job.Spec.Completions != nil {
w.Write(LEVEL_0, "Completions:\t%d\n", *job.Spec.Completions) w.Write(LEVEL_0, "Completions:\t%d\n", *job.Spec.Completions)
} else { } else {

11
staging/src/k8s.io/kubectl/pkg/describe/describe_test.go
View File

@@ -28,6 +28,7 @@ import (
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
autoscalingv1 "k8s.io/api/autoscaling/v1" autoscalingv1 "k8s.io/api/autoscaling/v1"
autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2" autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2"
batchv1 "k8s.io/api/batch/v1"
coordinationv1 "k8s.io/api/coordination/v1" coordinationv1 "k8s.io/api/coordination/v1"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
discoveryv1beta1 "k8s.io/api/discovery/v1beta1" discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
@@ -2730,8 +2731,14 @@ func TestDescribeEvents(t *testing.T) {
}, },
}, events), }, events),
}, },
// TODO(jchaloup): add tests for: "JobDescriber": &JobDescriber{
// - JobDescriber fake.NewSimpleClientset(&batchv1.Job{
ObjectMeta: metav1.ObjectMeta{
Name: "bar",
Namespace: "foo",
},
}, events),
},
"IngressDescriber": &IngressDescriber{ "IngressDescriber": &IngressDescriber{
fake.NewSimpleClientset(&networkingv1beta1.Ingress{ fake.NewSimpleClientset(&networkingv1beta1.Ingress{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{