Migrate to EndpointSlices API
This commit is contained in:
parent
61defcdd66
commit
a8a92eb2a5
88 changed files with 2177 additions and 1555 deletions
|
@ -1,7 +1,7 @@
|
|||
package k8s
|
||||
|
||||
import (
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
discoveryv1 "k8s.io/api/discovery/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
)
|
||||
|
||||
|
@ -47,61 +47,54 @@ func objChanged(oldObj, newObj interface{}) bool {
|
|||
return false
|
||||
}
|
||||
|
||||
if _, ok := oldObj.(*corev1.Endpoints); ok {
|
||||
return endpointsChanged(oldObj.(*corev1.Endpoints), newObj.(*corev1.Endpoints))
|
||||
if _, ok := oldObj.(*discoveryv1.EndpointSlice); ok {
|
||||
return endpointSliceChanged(oldObj.(*discoveryv1.EndpointSlice), newObj.(*discoveryv1.EndpointSlice))
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
func endpointsChanged(a, b *corev1.Endpoints) bool {
|
||||
if len(a.Subsets) != len(b.Subsets) {
|
||||
// In some Kubernetes versions leader election is done by updating an endpoint annotation every second,
|
||||
// if there are no changes to the endpoints addresses, ports, and there are no addresses defined for an endpoint
|
||||
// the event can safely be ignored and won't cause unnecessary config reloads.
|
||||
// TODO: check if Kubernetes is still using EndpointSlice for leader election, which seems to not be the case anymore.
|
||||
func endpointSliceChanged(a, b *discoveryv1.EndpointSlice) bool {
|
||||
if len(a.Ports) != len(b.Ports) {
|
||||
return true
|
||||
}
|
||||
|
||||
for i, sa := range a.Subsets {
|
||||
sb := b.Subsets[i]
|
||||
if subsetsChanged(sa, sb) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func subsetsChanged(sa, sb corev1.EndpointSubset) bool {
|
||||
if len(sa.Addresses) != len(sb.Addresses) {
|
||||
return true
|
||||
}
|
||||
|
||||
if len(sa.Ports) != len(sb.Ports) {
|
||||
return true
|
||||
}
|
||||
|
||||
// in Addresses and Ports, we should be able to rely on
|
||||
// these being sorted and able to be compared
|
||||
// they are supposed to be in a canonical format
|
||||
for addr, aaddr := range sa.Addresses {
|
||||
baddr := sb.Addresses[addr]
|
||||
if aaddr.IP != baddr.IP {
|
||||
return true
|
||||
}
|
||||
|
||||
if aaddr.Hostname != baddr.Hostname {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
for port, aport := range sa.Ports {
|
||||
bport := sb.Ports[port]
|
||||
for i, aport := range a.Ports {
|
||||
bport := b.Ports[i]
|
||||
if aport.Name != bport.Name {
|
||||
return true
|
||||
}
|
||||
if aport.Port != bport.Port {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
if aport.Protocol != bport.Protocol {
|
||||
if len(a.Endpoints) != len(b.Endpoints) {
|
||||
return true
|
||||
}
|
||||
|
||||
for i, ea := range a.Endpoints {
|
||||
eb := b.Endpoints[i]
|
||||
if endpointChanged(ea, eb) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func endpointChanged(a, b discoveryv1.Endpoint) bool {
|
||||
if len(a.Addresses) != len(b.Addresses) {
|
||||
return true
|
||||
}
|
||||
|
||||
for i, aaddr := range a.Addresses {
|
||||
baddr := b.Addresses[i]
|
||||
if aaddr != baddr {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue