From 67494b169413c74c116cf4c238c266810729247a Mon Sep 17 00:00:00 2001 From: Quan Tian Date: Mon, 12 Apr 2021 18:15:16 +0800 Subject: [PATCH] Fix EndpointSlice describe panic when an Endpoint doesn't have zone --- staging/src/k8s.io/kubectl/pkg/describe/describe.go | 2 +- staging/src/k8s.io/kubectl/pkg/describe/describe_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/describe/describe.go b/staging/src/k8s.io/kubectl/pkg/describe/describe.go index b40a9b6b1c2..69dcceaf559 100644 --- a/staging/src/k8s.io/kubectl/pkg/describe/describe.go +++ b/staging/src/k8s.io/kubectl/pkg/describe/describe.go @@ -3055,7 +3055,7 @@ func describeEndpointSliceV1(eps *discoveryv1.EndpointSlice, events *corev1.Even w.Write(LEVEL_2, "NodeName:\t%s\n", nodeNameText) zoneText := "" - if endpoint.NodeName != nil { + if endpoint.Zone != nil { zoneText = *endpoint.Zone } w.Write(LEVEL_2, "Zone:\t%s\n", zoneText) 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 01e7d656b4d..2bb74e786b5 100644 --- a/staging/src/k8s.io/kubectl/pkg/describe/describe_test.go +++ b/staging/src/k8s.io/kubectl/pkg/describe/describe_test.go @@ -4874,6 +4874,7 @@ Events: ` + "\n", Addresses: []string{"1.2.3.6", "1.2.3.7"}, Conditions: discoveryv1.EndpointConditions{Ready: utilpointer.BoolPtr(true)}, TargetRef: &corev1.ObjectReference{Kind: "Pod", Name: "test-124"}, + NodeName: utilpointer.StringPtr("node-2"), }, }, Ports: []discoveryv1.EndpointPort{ @@ -4906,7 +4907,7 @@ Endpoints: Ready: true Hostname: TargetRef: Pod/test-124 - NodeName: + NodeName: node-2 Zone: Events: ` + "\n", },