Skip to content

Commit 69e9c6b

Browse files
authored
Merge pull request kubernetes#89570 from zhouya0/fix_describe_job_nil_pointer
Fix kubectl describe job event test nil pointer
2 parents 4cf56b0 + a576a3c commit 69e9c6b

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

staging/src/k8s.io/kubectl/pkg/describe/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ go_test(
8080
"//staging/src/k8s.io/api/apps/v1:go_default_library",
8181
"//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
8282
"//staging/src/k8s.io/api/autoscaling/v2beta2:go_default_library",
83+
"//staging/src/k8s.io/api/batch/v1:go_default_library",
8384
"//staging/src/k8s.io/api/coordination/v1:go_default_library",
8485
"//staging/src/k8s.io/api/core/v1:go_default_library",
8586
"//staging/src/k8s.io/api/discovery/v1beta1:go_default_library",

staging/src/k8s.io/kubectl/pkg/describe/describe.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2116,7 +2116,9 @@ func describeJob(job *batchv1.Job, events *corev1.EventList) (string, error) {
21162116
if controlledBy := printController(job); len(controlledBy) > 0 {
21172117
w.Write(LEVEL_0, "Controlled By:\t%s\n", controlledBy)
21182118
}
2119-
w.Write(LEVEL_0, "Parallelism:\t%d\n", *job.Spec.Parallelism)
2119+
if job.Spec.Parallelism != nil {
2120+
w.Write(LEVEL_0, "Parallelism:\t%d\n", *job.Spec.Parallelism)
2121+
}
21202122
if job.Spec.Completions != nil {
21212123
w.Write(LEVEL_0, "Completions:\t%d\n", *job.Spec.Completions)
21222124
} else {

staging/src/k8s.io/kubectl/pkg/describe/describe_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
appsv1 "k8s.io/api/apps/v1"
2929
autoscalingv1 "k8s.io/api/autoscaling/v1"
3030
autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2"
31+
batchv1 "k8s.io/api/batch/v1"
3132
coordinationv1 "k8s.io/api/coordination/v1"
3233
corev1 "k8s.io/api/core/v1"
3334
discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
@@ -2730,8 +2731,14 @@ func TestDescribeEvents(t *testing.T) {
27302731
},
27312732
}, events),
27322733
},
2733-
// TODO(jchaloup): add tests for:
2734-
// - JobDescriber
2734+
"JobDescriber": &JobDescriber{
2735+
fake.NewSimpleClientset(&batchv1.Job{
2736+
ObjectMeta: metav1.ObjectMeta{
2737+
Name: "bar",
2738+
Namespace: "foo",
2739+
},
2740+
}, events),
2741+
},
27352742
"IngressDescriber": &IngressDescriber{
27362743
fake.NewSimpleClientset(&networkingv1beta1.Ingress{
27372744
ObjectMeta: metav1.ObjectMeta{

0 commit comments

Comments
 (0)