From a576a3c7070c9aeb1da1878e0ca956190979f03a Mon Sep 17 00:00:00 2001
From: zhouya0 <yao.zhoupolytech@gmail.com>
Date: Fri, 27 Mar 2020 19:07:18 +0800
Subject: [PATCH] Fix kubectl describe job event test nil pointer

---
 staging/src/k8s.io/kubectl/pkg/describe/BUILD         |  1 +
 staging/src/k8s.io/kubectl/pkg/describe/describe.go   |  4 +++-
 .../src/k8s.io/kubectl/pkg/describe/describe_test.go  | 11 +++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/staging/src/k8s.io/kubectl/pkg/describe/BUILD b/staging/src/k8s.io/kubectl/pkg/describe/BUILD
index 1d49bb620fa..182e7add5f3 100644
--- a/staging/src/k8s.io/kubectl/pkg/describe/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/describe/BUILD
@@ -80,6 +80,7 @@ go_test(
         "//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/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/core/v1:go_default_library",
         "//staging/src/k8s.io/api/discovery/v1beta1:go_default_library",
diff --git a/staging/src/k8s.io/kubectl/pkg/describe/describe.go b/staging/src/k8s.io/kubectl/pkg/describe/describe.go
index f72b1bb657e..3a814201d98 100644
--- a/staging/src/k8s.io/kubectl/pkg/describe/describe.go
+++ b/staging/src/k8s.io/kubectl/pkg/describe/describe.go
@@ -2116,7 +2116,9 @@ func describeJob(job *batchv1.Job, events *corev1.EventList) (string, error) {
 		if controlledBy := printController(job); len(controlledBy) > 0 {
 			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 {
 			w.Write(LEVEL_0, "Completions:\t%d\n", *job.Spec.Completions)
 		} else {
diff --git a/staging/src/k8s.io/kubectl/pkg/describe/describe_test.go b/staging/src/k8s.io/kubectl/pkg/describe/describe_test.go
index 68e03dc43c1..232727fc03c 100644
--- a/staging/src/k8s.io/kubectl/pkg/describe/describe_test.go
+++ b/staging/src/k8s.io/kubectl/pkg/describe/describe_test.go
@@ -28,6 +28,7 @@ import (
 	appsv1 "k8s.io/api/apps/v1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
 	autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2"
+	batchv1 "k8s.io/api/batch/v1"
 	coordinationv1 "k8s.io/api/coordination/v1"
 	corev1 "k8s.io/api/core/v1"
 	discoveryv1beta1 "k8s.io/api/discovery/v1beta1"
@@ -2698,8 +2699,14 @@ func TestDescribeEvents(t *testing.T) {
 				},
 			}, events),
 		},
-		// TODO(jchaloup): add tests for:
-		// - JobDescriber
+		"JobDescriber": &JobDescriber{
+			fake.NewSimpleClientset(&batchv1.Job{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "bar",
+					Namespace: "foo",
+				},
+			}, events),
+		},
 		"IngressDescriber": &IngressDescriber{
 			fake.NewSimpleClientset(&networkingv1beta1.Ingress{
 				ObjectMeta: metav1.ObjectMeta{