Fix condition used for serving and fenced endpoints
Co-authored-by: Kevin Pollet <pollet.kevin@gmail.com>
This commit is contained in:
parent
5a9f3e6999
commit
2e6dfbae57
5 changed files with 15 additions and 94 deletions
|
|
@ -1,11 +0,0 @@
|
|||
package k8s
|
||||
|
||||
import (
|
||||
v1 "k8s.io/api/discovery/v1"
|
||||
"k8s.io/utils/ptr"
|
||||
)
|
||||
|
||||
// EndpointServing returns true if the endpoint is still serving the service.
|
||||
func EndpointServing(endpoint v1.Endpoint) bool {
|
||||
return ptr.Deref(endpoint.Conditions.Ready, false) || ptr.Deref(endpoint.Conditions.Serving, false)
|
||||
}
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
package k8s
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
v1 "k8s.io/api/discovery/v1"
|
||||
)
|
||||
|
||||
func TestEndpointServing(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
endpoint v1.Endpoint
|
||||
want bool
|
||||
}{
|
||||
{
|
||||
name: "no status",
|
||||
endpoint: v1.Endpoint{
|
||||
Conditions: v1.EndpointConditions{
|
||||
Ready: nil,
|
||||
Serving: nil,
|
||||
},
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "ready",
|
||||
endpoint: v1.Endpoint{
|
||||
Conditions: v1.EndpointConditions{
|
||||
Ready: pointer(true),
|
||||
Serving: nil,
|
||||
},
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "not ready",
|
||||
endpoint: v1.Endpoint{
|
||||
Conditions: v1.EndpointConditions{
|
||||
Ready: pointer(false),
|
||||
Serving: nil,
|
||||
},
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
{
|
||||
name: "not ready and serving",
|
||||
endpoint: v1.Endpoint{
|
||||
Conditions: v1.EndpointConditions{
|
||||
Ready: pointer(false),
|
||||
Serving: pointer(true),
|
||||
},
|
||||
},
|
||||
want: true,
|
||||
},
|
||||
{
|
||||
name: "not ready and not serving",
|
||||
endpoint: v1.Endpoint{
|
||||
Conditions: v1.EndpointConditions{
|
||||
Ready: pointer(false),
|
||||
Serving: pointer(false),
|
||||
},
|
||||
},
|
||||
want: false,
|
||||
},
|
||||
}
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
got := EndpointServing(test.endpoint)
|
||||
assert.Equal(t, test.want, got)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func pointer[T any](v T) *T { return &v }
|
||||
Loading…
Add table
Add a link
Reference in a new issue