* initial commit Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * convert endpointslices to object.endpoints Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * add opt hard coded for now Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * check that server supports endpointslice Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * fix import grouping Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * dont use endpoint slice in 1.17 or 1.18 Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * bump kind/k8s in circle ci to latest Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * drop k8s to latest supported by kind Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * use endpointslice name as endoint Name; index by Service name Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * use index key comparison in nsAddrs() Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * add Index to object.Endpoint fixtures; fix direct endpoint name compares Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * add slice dup check and test Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * todo Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * add ep-slice skew dup test for reverse Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * nsaddrs: de-dup ep-slice skew dups; add test Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * remove todo Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * address various feedback Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * consolidate endpoint/slice informer code Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * fix endpoint informer consolidation; use clearer func name Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * log info; use major/minor fields Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * fix nsAddr and unit test Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * add latency tracking for endpointslices Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * endpointslice latency unit test & fix Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * code shuffling Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * rename endpointslices in tests Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * remove de-dup from nsAddrs and test Signed-off-by: Chris O'Haver <cohaver@infoblox.com> * remove de-dup from findServices / test Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
228 lines
6.2 KiB
Go
228 lines
6.2 KiB
Go
package object
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
api "k8s.io/api/core/v1"
|
|
discovery "k8s.io/api/discovery/v1beta1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
)
|
|
|
|
// Endpoints is a stripped down api.Endpoints with only the items we need for CoreDNS.
|
|
type Endpoints struct {
|
|
// Don't add new fields to this struct without talking to the CoreDNS maintainers.
|
|
Version string
|
|
Name string
|
|
Namespace string
|
|
Index string
|
|
IndexIP []string
|
|
Subsets []EndpointSubset
|
|
|
|
*Empty
|
|
}
|
|
|
|
// EndpointSubset is a group of addresses with a common set of ports. The
|
|
// expanded set of endpoints is the Cartesian product of Addresses x Ports.
|
|
type EndpointSubset struct {
|
|
Addresses []EndpointAddress
|
|
Ports []EndpointPort
|
|
}
|
|
|
|
// EndpointAddress is a tuple that describes single IP address.
|
|
type EndpointAddress struct {
|
|
IP string
|
|
Hostname string
|
|
NodeName string
|
|
TargetRefName string
|
|
}
|
|
|
|
// EndpointPort is a tuple that describes a single port.
|
|
type EndpointPort struct {
|
|
Port int32
|
|
Name string
|
|
Protocol string
|
|
}
|
|
|
|
// EndpointsKey returns a string using for the index.
|
|
func EndpointsKey(name, namespace string) string { return name + "." + namespace }
|
|
|
|
// ToEndpoints returns a function that converts an *api.Endpoints to a *Endpoints.
|
|
func ToEndpoints(skipCleanup bool) ToFunc {
|
|
return func(obj interface{}) (interface{}, error) {
|
|
eps, ok := obj.(*api.Endpoints)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected object %v", obj)
|
|
}
|
|
return toEndpoints(skipCleanup, eps), nil
|
|
}
|
|
}
|
|
|
|
// EndpointSliceToEndpoints returns a function that converts an *discovery.EndpointSlice to a *Endpoints.
|
|
func EndpointSliceToEndpoints(skipCleanup bool) ToFunc {
|
|
return func(obj interface{}) (interface{}, error) {
|
|
eps, ok := obj.(*discovery.EndpointSlice)
|
|
if !ok {
|
|
return nil, fmt.Errorf("unexpected object %v", obj)
|
|
}
|
|
return endpointSliceToEndpoints(skipCleanup, eps), nil
|
|
}
|
|
}
|
|
|
|
// toEndpoints converts an *api.Endpoints to a *Endpoints.
|
|
func toEndpoints(skipCleanup bool, end *api.Endpoints) *Endpoints {
|
|
e := &Endpoints{
|
|
Version: end.GetResourceVersion(),
|
|
Name: end.GetName(),
|
|
Namespace: end.GetNamespace(),
|
|
Index: EndpointsKey(end.GetName(), end.GetNamespace()),
|
|
Subsets: make([]EndpointSubset, len(end.Subsets)),
|
|
}
|
|
for i, eps := range end.Subsets {
|
|
sub := EndpointSubset{
|
|
Addresses: make([]EndpointAddress, len(eps.Addresses)),
|
|
}
|
|
if len(eps.Ports) == 0 {
|
|
// Add sentinel if there are no ports.
|
|
sub.Ports = []EndpointPort{{Port: -1}}
|
|
} else {
|
|
sub.Ports = make([]EndpointPort, len(eps.Ports))
|
|
}
|
|
|
|
for j, a := range eps.Addresses {
|
|
ea := EndpointAddress{IP: a.IP, Hostname: a.Hostname}
|
|
if a.NodeName != nil {
|
|
ea.NodeName = *a.NodeName
|
|
}
|
|
if a.TargetRef != nil {
|
|
ea.TargetRefName = a.TargetRef.Name
|
|
}
|
|
sub.Addresses[j] = ea
|
|
}
|
|
|
|
for k, p := range eps.Ports {
|
|
ep := EndpointPort{Port: p.Port, Name: p.Name, Protocol: string(p.Protocol)}
|
|
sub.Ports[k] = ep
|
|
}
|
|
|
|
e.Subsets[i] = sub
|
|
}
|
|
|
|
for _, eps := range end.Subsets {
|
|
for _, a := range eps.Addresses {
|
|
e.IndexIP = append(e.IndexIP, a.IP)
|
|
}
|
|
}
|
|
|
|
if !skipCleanup {
|
|
*end = api.Endpoints{}
|
|
}
|
|
|
|
return e
|
|
}
|
|
|
|
// endpointSliceToEndpoints converts a *discovery.EndpointSlice to a *Endpoints.
|
|
func endpointSliceToEndpoints(skipCleanup bool, ends *discovery.EndpointSlice) *Endpoints {
|
|
e := &Endpoints{
|
|
Version: ends.GetResourceVersion(),
|
|
Name: ends.GetName(),
|
|
Namespace: ends.GetNamespace(),
|
|
Index: EndpointsKey(ends.Labels[discovery.LabelServiceName], ends.GetNamespace()),
|
|
Subsets: make([]EndpointSubset, 1),
|
|
}
|
|
|
|
if len(ends.Ports) == 0 {
|
|
// Add sentinel if there are no ports.
|
|
e.Subsets[0].Ports = []EndpointPort{{Port: -1}}
|
|
} else {
|
|
e.Subsets[0].Ports = make([]EndpointPort, len(ends.Ports))
|
|
for k, p := range ends.Ports {
|
|
ep := EndpointPort{Port: *p.Port, Name: *p.Name, Protocol: string(*p.Protocol)}
|
|
e.Subsets[0].Ports[k] = ep
|
|
}
|
|
}
|
|
|
|
for _, end := range ends.Endpoints {
|
|
for _, a := range end.Addresses {
|
|
ea := EndpointAddress{IP: a}
|
|
if end.Hostname != nil {
|
|
ea.Hostname = *end.Hostname
|
|
}
|
|
if end.TargetRef != nil {
|
|
ea.TargetRefName = end.TargetRef.Name
|
|
}
|
|
// EndpointSlice does not contain NodeName, leave blank
|
|
e.Subsets[0].Addresses = append(e.Subsets[0].Addresses, ea)
|
|
e.IndexIP = append(e.IndexIP, a)
|
|
}
|
|
}
|
|
|
|
if !skipCleanup {
|
|
*ends = discovery.EndpointSlice{}
|
|
}
|
|
|
|
return e
|
|
}
|
|
|
|
// CopyWithoutSubsets copies e, without the subsets.
|
|
func (e *Endpoints) CopyWithoutSubsets() *Endpoints {
|
|
e1 := &Endpoints{
|
|
Version: e.Version,
|
|
Name: e.Name,
|
|
Namespace: e.Namespace,
|
|
Index: e.Index,
|
|
IndexIP: make([]string, len(e.IndexIP)),
|
|
}
|
|
copy(e1.IndexIP, e.IndexIP)
|
|
return e1
|
|
}
|
|
|
|
var _ runtime.Object = &Endpoints{}
|
|
|
|
// DeepCopyObject implements the ObjectKind interface.
|
|
func (e *Endpoints) DeepCopyObject() runtime.Object {
|
|
e1 := &Endpoints{
|
|
Version: e.Version,
|
|
Name: e.Name,
|
|
Namespace: e.Namespace,
|
|
Index: e.Index,
|
|
IndexIP: make([]string, len(e.IndexIP)),
|
|
Subsets: make([]EndpointSubset, len(e.Subsets)),
|
|
}
|
|
copy(e1.IndexIP, e.IndexIP)
|
|
|
|
for i, eps := range e.Subsets {
|
|
sub := EndpointSubset{
|
|
Addresses: make([]EndpointAddress, len(eps.Addresses)),
|
|
Ports: make([]EndpointPort, len(eps.Ports)),
|
|
}
|
|
for j, a := range eps.Addresses {
|
|
ea := EndpointAddress{IP: a.IP, Hostname: a.Hostname, NodeName: a.NodeName, TargetRefName: a.TargetRefName}
|
|
sub.Addresses[j] = ea
|
|
}
|
|
for k, p := range eps.Ports {
|
|
ep := EndpointPort{Port: p.Port, Name: p.Name, Protocol: p.Protocol}
|
|
sub.Ports[k] = ep
|
|
}
|
|
|
|
e1.Subsets[i] = sub
|
|
}
|
|
return e1
|
|
}
|
|
|
|
// GetNamespace implements the metav1.Object interface.
|
|
func (e *Endpoints) GetNamespace() string { return e.Namespace }
|
|
|
|
// SetNamespace implements the metav1.Object interface.
|
|
func (e *Endpoints) SetNamespace(namespace string) {}
|
|
|
|
// GetName implements the metav1.Object interface.
|
|
func (e *Endpoints) GetName() string { return e.Name }
|
|
|
|
// SetName implements the metav1.Object interface.
|
|
func (e *Endpoints) SetName(name string) {}
|
|
|
|
// GetResourceVersion implements the metav1.Object interface.
|
|
func (e *Endpoints) GetResourceVersion() string { return e.Version }
|
|
|
|
// SetResourceVersion implements the metav1.Object interface.
|
|
func (e *Endpoints) SetResourceVersion(version string) {}
|