github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101025 from tnqn/describe-endpointslice-panic

Browse Source 
Fix EndpointSlice describe panic when an Endpoint doesn't have zone
This commit is contained in:
Kubernetes Prow Robot 2021-04-29 17:07:57 -07:00 committed by GitHub
commit 3fcd8398c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3087,7 +3087,7 @@ func describeEndpointSliceV1(eps *discoveryv1.EndpointSlice, events *corev1.Even
w.Write(LEVEL_2, "NodeName:\t%s\n", nodeNameText)
zoneText := "<unset>"
if endpoint.NodeName != nil {
if endpoint.Zone != nil {
zoneText = *endpoint.Zone
}
w.Write(LEVEL_2, "Zone:\t%s\n", zoneText)

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

@ -4874,6 +4874,7 @@ Events: <none>` + "\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: <unset>
TargetRef: Pod/test-124
NodeName: <unset>
NodeName: node-2
Zone: <unset>
Events: <none>` + "\n",
},