Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-01 02:33:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

consider nil ready as ready (#4632)

Browse Source 
Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
This commit is contained in:
Chris O'Haver
2021-05-17 16:10:30 -04:00
committed by GitHub
parent fc24fe076f
commit 5409379648
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plugin/kubernetes/object/endpoint.go
View File

@@ -128,7 +128,7 @@ func EndpointSliceToEndpoints(obj meta.Object) (meta.Object, error) {
} }
for _, end := range ends.Endpoints { for _, end := range ends.Endpoints {
if end.Conditions.Ready == nil || !*end.Conditions.Ready { if !endpointsliceReady(end.Conditions.Ready) {
continue continue
} }
for _, a := range end.Addresses { for _, a := range end.Addresses {
@@ -178,7 +178,7 @@ func EndpointSliceV1beta1ToEndpoints(obj meta.Object) (meta.Object, error) {
} }
for _, end := range ends.Endpoints { for _, end := range ends.Endpoints {
if end.Conditions.Ready == nil || !*end.Conditions.Ready { if !endpointsliceReady(end.Conditions.Ready) {
continue continue
} }
for _, a := range end.Addresses { for _, a := range end.Addresses {
@@ -200,6 +200,15 @@ func EndpointSliceV1beta1ToEndpoints(obj meta.Object) (meta.Object, error) {
return e, nil return e, nil
} }
func endpointsliceReady(ready *bool) bool {
// Per API docs: a nil value indicates an unknown state. In most cases consumers
// should interpret this unknown state as ready.
if ready == nil {
return true
}
return *ready
}
// CopyWithoutSubsets copies e, without the subsets. // CopyWithoutSubsets copies e, without the subsets.
func (e *Endpoints) CopyWithoutSubsets() *Endpoints { func (e *Endpoints) CopyWithoutSubsets() *Endpoints {
e1 := &Endpoints{ e1 := &Endpoints{