mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #94610 from soltysh/94112_followup
Remove pkg/api/endpoints
This commit is contained in:
Kubernetes Prow Robot
GitHub
commit
4c1caeb3ab
@ -11,7 +11,6 @@ filegroup(
|
|||||||
name = "all-srcs",
|
name = "all-srcs",
|
||||||
srcs = [
|
srcs = [
|
||||||
":package-srcs",
|
":package-srcs",
|
||||||
"//pkg/api/endpoints:all-srcs",
|
|
||||||
"//pkg/api/legacyscheme:all-srcs",
|
"//pkg/api/legacyscheme:all-srcs",
|
||||||
"//pkg/api/persistentvolume:all-srcs",
|
"//pkg/api/persistentvolume:all-srcs",
|
||||||
"//pkg/api/persistentvolumeclaim:all-srcs",
|
"//pkg/api/persistentvolumeclaim:all-srcs",
|
||||||
|
|||||||
@ -1,42 +0,0 @@
|
|||||||
package(default_visibility = ["//visibility:public"])
|
|
||||||
|
|
||||||
load(
|
|
||||||
"@io_bazel_rules_go//go:def.bzl",
|
|
||||||
"go_library",
|
|
||||||
"go_test",
|
|
||||||
)
|
|
||||||
|
|
||||||
go_library(
|
|
||||||
name = "go_default_library",
|
|
||||||
srcs = ["util.go"],
|
|
||||||
importpath = "k8s.io/kubernetes/pkg/api/endpoints",
|
|
||||||
deps = [
|
|
||||||
"//pkg/apis/core:go_default_library",
|
|
||||||
"//pkg/util/hash:go_default_library",
|
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
go_test(
|
|
||||||
name = "go_default_test",
|
|
||||||
srcs = ["util_test.go"],
|
|
||||||
embed = [":go_default_library"],
|
|
||||||
deps = [
|
|
||||||
"//pkg/apis/core:go_default_library",
|
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
|
|
||||||
"//vendor/github.com/davecgh/go-spew/spew:go_default_library",
|
|
||||||
],
|
|
||||||
)
|
|
||||||
|
|
||||||
filegroup(
|
|
||||||
name = "package-srcs",
|
|
||||||
srcs = glob(["**"]),
|
|
||||||
tags = ["automanaged"],
|
|
||||||
visibility = ["//visibility:private"],
|
|
||||||
)
|
|
||||||
|
|
||||||
filegroup(
|
|
||||||
name = "all-srcs",
|
|
||||||
srcs = [":package-srcs"],
|
|
||||||
tags = ["automanaged"],
|
|
||||||
)
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
# See the OWNERS docs at https://go.k8s.io/owners
|
|
||||||
|
|
||||||
reviewers:
|
|
||||||
- thockin
|
|
||||||
- smarterclayton
|
|
||||||
- mikedanese
|
|
||||||
- sttts
|
|
||||||
- resouer
|
|
||||||
@ -1,235 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2015 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package endpoints
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"crypto/md5"
|
|
||||||
"encoding/hex"
|
|
||||||
"hash"
|
|
||||||
"sort"
|
|
||||||
|
|
||||||
"k8s.io/apimachinery/pkg/types"
|
|
||||||
api "k8s.io/kubernetes/pkg/apis/core"
|
|
||||||
hashutil "k8s.io/kubernetes/pkg/util/hash"
|
|
||||||
)
|
|
||||||
|
|
||||||
// RepackSubsets takes a slice of EndpointSubset objects, expands it to the full
|
|
||||||
// representation, and then repacks that into the canonical layout. This
|
|
||||||
// ensures that code which operates on these objects can rely on the common
|
|
||||||
// form for things like comparison. The result is a newly allocated slice.
|
|
||||||
func RepackSubsets(subsets []api.EndpointSubset) []api.EndpointSubset {
|
|
||||||
// First map each unique port definition to the sets of hosts that
|
|
||||||
// offer it.
|
|
||||||
allAddrs := map[addressKey]*api.EndpointAddress{}
|
|
||||||
portToAddrReadyMap := map[api.EndpointPort]addressSet{}
|
|
||||||
for i := range subsets {
|
|
||||||
if len(subsets[i].Ports) == 0 {
|
|
||||||
// Don't discard endpoints with no ports defined, use a sentinel.
|
|
||||||
mapAddressesByPort(&subsets[i], api.EndpointPort{Port: -1}, allAddrs, portToAddrReadyMap)
|
|
||||||
} else {
|
|
||||||
for _, port := range subsets[i].Ports {
|
|
||||||
mapAddressesByPort(&subsets[i], port, allAddrs, portToAddrReadyMap)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Next, map the sets of hosts to the sets of ports they offer.
|
|
||||||
// Go does not allow maps or slices as keys to maps, so we have
|
|
||||||
// to synthesize an artificial key and do a sort of 2-part
|
|
||||||
// associative entity.
|
|
||||||
type keyString string
|
|
||||||
keyToAddrReadyMap := map[keyString]addressSet{}
|
|
||||||
addrReadyMapKeyToPorts := map[keyString][]api.EndpointPort{}
|
|
||||||
for port, addrs := range portToAddrReadyMap {
|
|
||||||
key := keyString(hashAddresses(addrs))
|
|
||||||
keyToAddrReadyMap[key] = addrs
|
|
||||||
if port.Port > 0 { // avoid sentinels
|
|
||||||
addrReadyMapKeyToPorts[key] = append(addrReadyMapKeyToPorts[key], port)
|
|
||||||
} else {
|
|
||||||
if _, found := addrReadyMapKeyToPorts[key]; !found {
|
|
||||||
// Force it to be present in the map
|
|
||||||
addrReadyMapKeyToPorts[key] = nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Next, build the N-to-M association the API wants.
|
|
||||||
final := []api.EndpointSubset{}
|
|
||||||
for key, ports := range addrReadyMapKeyToPorts {
|
|
||||||
var readyAddrs, notReadyAddrs []api.EndpointAddress
|
|
||||||
for addr, ready := range keyToAddrReadyMap[key] {
|
|
||||||
if ready {
|
|
||||||
readyAddrs = append(readyAddrs, *addr)
|
|
||||||
} else {
|
|
||||||
notReadyAddrs = append(notReadyAddrs, *addr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
final = append(final, api.EndpointSubset{Addresses: readyAddrs, NotReadyAddresses: notReadyAddrs, Ports: ports})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finally, sort it.
|
|
||||||
return SortSubsets(final)
|
|
||||||
}
|
|
||||||
|
|
||||||
// The sets of hosts must be de-duped, using IP+UID as the key.
|
|
||||||
type addressKey struct {
|
|
||||||
ip string
|
|
||||||
uid types.UID
|
|
||||||
}
|
|
||||||
|
|
||||||
// mapAddressesByPort adds all ready and not-ready addresses into a map by a single port.
|
|
||||||
func mapAddressesByPort(subset *api.EndpointSubset, port api.EndpointPort, allAddrs map[addressKey]*api.EndpointAddress, portToAddrReadyMap map[api.EndpointPort]addressSet) {
|
|
||||||
for k := range subset.Addresses {
|
|
||||||
mapAddressByPort(&subset.Addresses[k], port, true, allAddrs, portToAddrReadyMap)
|
|
||||||
}
|
|
||||||
for k := range subset.NotReadyAddresses {
|
|
||||||
mapAddressByPort(&subset.NotReadyAddresses[k], port, false, allAddrs, portToAddrReadyMap)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// mapAddressByPort adds one address into a map by port, registering the address with a unique pointer, and preserving
|
|
||||||
// any existing ready state.
|
|
||||||
func mapAddressByPort(addr *api.EndpointAddress, port api.EndpointPort, ready bool, allAddrs map[addressKey]*api.EndpointAddress, portToAddrReadyMap map[api.EndpointPort]addressSet) *api.EndpointAddress {
|
|
||||||
// use addressKey to distinguish between two endpoints that are identical addresses
|
|
||||||
// but may have come from different hosts, for attribution.
|
|
||||||
key := addressKey{ip: addr.IP}
|
|
||||||
if addr.TargetRef != nil {
|
|
||||||
key.uid = addr.TargetRef.UID
|
|
||||||
}
|
|
||||||
|
|
||||||
// Accumulate the address. The full EndpointAddress structure is preserved for use when
|
|
||||||
// we rebuild the subsets so that the final TargetRef has all of the necessary data.
|
|
||||||
existingAddress := allAddrs[key]
|
|
||||||
if existingAddress == nil {
|
|
||||||
// Make a copy so we don't write to the
|
|
||||||
// input args of this function.
|
|
||||||
existingAddress = &api.EndpointAddress{}
|
|
||||||
*existingAddress = *addr
|
|
||||||
allAddrs[key] = existingAddress
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remember that this port maps to this address.
|
|
||||||
if _, found := portToAddrReadyMap[port]; !found {
|
|
||||||
portToAddrReadyMap[port] = addressSet{}
|
|
||||||
}
|
|
||||||
// if we have not yet recorded this port for this address, or if the previous
|
|
||||||
// state was ready, write the current ready state. not ready always trumps
|
|
||||||
// ready.
|
|
||||||
if wasReady, found := portToAddrReadyMap[port][existingAddress]; !found || wasReady {
|
|
||||||
portToAddrReadyMap[port][existingAddress] = ready
|
|
||||||
}
|
|
||||||
return existingAddress
|
|
||||||
}
|
|
||||||
|
|
||||||
type addressSet map[*api.EndpointAddress]bool
|
|
||||||
|
|
||||||
type addrReady struct {
|
|
||||||
addr *api.EndpointAddress
|
|
||||||
ready bool
|
|
||||||
}
|
|
||||||
|
|
||||||
func hashAddresses(addrs addressSet) string {
|
|
||||||
// Flatten the list of addresses into a string so it can be used as a
|
|
||||||
// map key. Unfortunately, DeepHashObject is implemented in terms of
|
|
||||||
// spew, and spew does not handle non-primitive map keys well. So
|
|
||||||
// first we collapse it into a slice, sort the slice, then hash that.
|
|
||||||
slice := make([]addrReady, 0, len(addrs))
|
|
||||||
for k, ready := range addrs {
|
|
||||||
slice = append(slice, addrReady{k, ready})
|
|
||||||
}
|
|
||||||
sort.Sort(addrsReady(slice))
|
|
||||||
hasher := md5.New()
|
|
||||||
hashutil.DeepHashObject(hasher, slice)
|
|
||||||
return hex.EncodeToString(hasher.Sum(nil)[0:])
|
|
||||||
}
|
|
||||||
|
|
||||||
func lessAddrReady(a, b addrReady) bool {
|
|
||||||
// ready is not significant to hashing since we can't have duplicate addresses
|
|
||||||
return LessEndpointAddress(a.addr, b.addr)
|
|
||||||
}
|
|
||||||
|
|
||||||
type addrsReady []addrReady
|
|
||||||
|
|
||||||
func (sl addrsReady) Len() int { return len(sl) }
|
|
||||||
func (sl addrsReady) Swap(i, j int) { sl[i], sl[j] = sl[j], sl[i] }
|
|
||||||
func (sl addrsReady) Less(i, j int) bool {
|
|
||||||
return lessAddrReady(sl[i], sl[j])
|
|
||||||
}
|
|
||||||
|
|
||||||
// LessEndpointAddress compares IP addresses lexicographically and returns true if first argument is lesser than second
|
|
||||||
func LessEndpointAddress(a, b *api.EndpointAddress) bool {
|
|
||||||
ipComparison := bytes.Compare([]byte(a.IP), []byte(b.IP))
|
|
||||||
if ipComparison != 0 {
|
|
||||||
return ipComparison < 0
|
|
||||||
}
|
|
||||||
if b.TargetRef == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if a.TargetRef == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return a.TargetRef.UID < b.TargetRef.UID
|
|
||||||
}
|
|
||||||
|
|
||||||
// SortSubsets sorts an array of EndpointSubset objects in place. For ease of
|
|
||||||
// use it returns the input slice.
|
|
||||||
func SortSubsets(subsets []api.EndpointSubset) []api.EndpointSubset {
|
|
||||||
for i := range subsets {
|
|
||||||
ss := &subsets[i]
|
|
||||||
sort.Sort(addrsByIPAndUID(ss.Addresses))
|
|
||||||
sort.Sort(addrsByIPAndUID(ss.NotReadyAddresses))
|
|
||||||
sort.Sort(portsByHash(ss.Ports))
|
|
||||||
}
|
|
||||||
sort.Sort(subsetsByHash(subsets))
|
|
||||||
return subsets
|
|
||||||
}
|
|
||||||
|
|
||||||
func hashObject(hasher hash.Hash, obj interface{}) []byte {
|
|
||||||
hashutil.DeepHashObject(hasher, obj)
|
|
||||||
return hasher.Sum(nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
type subsetsByHash []api.EndpointSubset
|
|
||||||
|
|
||||||
func (sl subsetsByHash) Len() int { return len(sl) }
|
|
||||||
func (sl subsetsByHash) Swap(i, j int) { sl[i], sl[j] = sl[j], sl[i] }
|
|
||||||
func (sl subsetsByHash) Less(i, j int) bool {
|
|
||||||
hasher := md5.New()
|
|
||||||
h1 := hashObject(hasher, sl[i])
|
|
||||||
h2 := hashObject(hasher, sl[j])
|
|
||||||
return bytes.Compare(h1, h2) < 0
|
|
||||||
}
|
|
||||||
|
|
||||||
type addrsByIPAndUID []api.EndpointAddress
|
|
||||||
|
|
||||||
func (sl addrsByIPAndUID) Len() int { return len(sl) }
|
|
||||||
func (sl addrsByIPAndUID) Swap(i, j int) { sl[i], sl[j] = sl[j], sl[i] }
|
|
||||||
func (sl addrsByIPAndUID) Less(i, j int) bool {
|
|
||||||
return LessEndpointAddress(&sl[i], &sl[j])
|
|
||||||
}
|
|
||||||
|
|
||||||
type portsByHash []api.EndpointPort
|
|
||||||
|
|
||||||
func (sl portsByHash) Len() int { return len(sl) }
|
|
||||||
func (sl portsByHash) Swap(i, j int) { sl[i], sl[j] = sl[j], sl[i] }
|
|
||||||
func (sl portsByHash) Less(i, j int) bool {
|
|
||||||
hasher := md5.New()
|
|
||||||
h1 := hashObject(hasher, sl[i])
|
|
||||||
h2 := hashObject(hasher, sl[j])
|
|
||||||
return bytes.Compare(h1, h2) < 0
|
|
||||||
}
|
|
||||||
@ -1,464 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2015 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package endpoints
|
|
||||||
|
|
||||||
import (
|
|
||||||
"reflect"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/davecgh/go-spew/spew"
|
|
||||||
"k8s.io/apimachinery/pkg/types"
|
|
||||||
api "k8s.io/kubernetes/pkg/apis/core"
|
|
||||||
)
|
|
||||||
|
|
||||||
func podRef(uid string) *api.ObjectReference {
|
|
||||||
ref := api.ObjectReference{UID: types.UID(uid)}
|
|
||||||
return &ref
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPackSubsets(t *testing.T) {
|
|
||||||
// The downside of table-driven tests is that some things have to live outside the table.
|
|
||||||
fooObjRef := api.ObjectReference{Name: "foo"}
|
|
||||||
barObjRef := api.ObjectReference{Name: "bar"}
|
|
||||||
|
|
||||||
testCases := []struct {
|
|
||||||
name string
|
|
||||||
given []api.EndpointSubset
|
|
||||||
expect []api.EndpointSubset
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "empty everything",
|
|
||||||
given: []api.EndpointSubset{{Addresses: []api.EndpointAddress{}, Ports: []api.EndpointPort{}}},
|
|
||||||
expect: []api.EndpointSubset{},
|
|
||||||
}, {
|
|
||||||
name: "empty addresses",
|
|
||||||
given: []api.EndpointSubset{{Addresses: []api.EndpointAddress{}, Ports: []api.EndpointPort{{Port: 111}}}},
|
|
||||||
expect: []api.EndpointSubset{},
|
|
||||||
}, {
|
|
||||||
name: "empty ports",
|
|
||||||
given: []api.EndpointSubset{{Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, Ports: []api.EndpointPort{}}},
|
|
||||||
expect: []api.EndpointSubset{{Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, Ports: nil}},
|
|
||||||
}, {
|
|
||||||
name: "empty ports",
|
|
||||||
given: []api.EndpointSubset{{NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, Ports: []api.EndpointPort{}}},
|
|
||||||
expect: []api.EndpointSubset{{NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4"}}, Ports: nil}},
|
|
||||||
}, {
|
|
||||||
name: "one set, one ip, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, one ip, one port (IPv6)",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "beef::1:2:3:4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "beef::1:2:3:4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, one notReady ip, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, one ip, one UID, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, one notReady ip, one UID, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, one ip, empty UID, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, one notReady ip, empty UID, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, two ips, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, two mixed ips, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, two duplicate ips, one port, notReady is covered by ready",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, one ip, two ports",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}, {Port: 222}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}, {Port: 222}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, dup ips, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, dup ips, one port (IPv6)",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "beef::1"}, {IP: "beef::1"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "beef::1"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, dup ips with target-refs, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{
|
|
||||||
{IP: "1.2.3.4", TargetRef: &fooObjRef},
|
|
||||||
{IP: "1.2.3.4", TargetRef: &barObjRef},
|
|
||||||
},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &fooObjRef}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, dup mixed ips with target-refs, one port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{
|
|
||||||
{IP: "1.2.3.4", TargetRef: &fooObjRef},
|
|
||||||
},
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{
|
|
||||||
{IP: "1.2.3.4", TargetRef: &barObjRef},
|
|
||||||
},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
// finding the same address twice is considered an error on input, only the first address+port
|
|
||||||
// reference is preserved
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: &fooObjRef}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "one set, one ip, dup ports",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}, {Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two sets, dup ip, dup port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two sets, dup mixed ip, dup port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two sets, dup ip, two ports",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}, {Port: 222}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two sets, dup ip, dup uids, two ports",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}, {Port: 222}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two sets, dup mixed ip, dup uids, two ports",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two sets, two ips, dup port",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two set, dup ip, two uids, dup ports",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-2")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{
|
|
||||||
{IP: "1.2.3.4", TargetRef: podRef("uid-1")},
|
|
||||||
{IP: "1.2.3.4", TargetRef: podRef("uid-2")},
|
|
||||||
},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two set, dup ip, with and without uid, dup ports",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-2")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{
|
|
||||||
{IP: "1.2.3.4"},
|
|
||||||
{IP: "1.2.3.4", TargetRef: podRef("uid-2")},
|
|
||||||
},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two sets, two ips, two dup ip with uid, dup port, wrong order",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "5.6.7.8", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{
|
|
||||||
{IP: "1.2.3.4"},
|
|
||||||
{IP: "1.2.3.4", TargetRef: podRef("uid-1")},
|
|
||||||
{IP: "5.6.7.8"},
|
|
||||||
{IP: "5.6.7.8", TargetRef: podRef("uid-1")},
|
|
||||||
},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two sets, two mixed ips, two dup ip with uid, dup port, wrong order, ends up with split addresses",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "5.6.7.8", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4", TargetRef: podRef("uid-1")}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{
|
|
||||||
{IP: "5.6.7.8"},
|
|
||||||
},
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{
|
|
||||||
{IP: "1.2.3.4"},
|
|
||||||
{IP: "1.2.3.4", TargetRef: podRef("uid-1")},
|
|
||||||
{IP: "5.6.7.8", TargetRef: podRef("uid-1")},
|
|
||||||
},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "two sets, two ips, two ports",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "5.6.7.8"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "four sets, three ips, three ports, jumbled",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.5"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.6"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.5"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 333}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "1.2.3.6"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.5"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}, {Port: 333}},
|
|
||||||
}},
|
|
||||||
}, {
|
|
||||||
name: "four sets, three mixed ips, three ports, jumbled",
|
|
||||||
given: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.5"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}},
|
|
||||||
}, {
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.6"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.5"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 333}},
|
|
||||||
}},
|
|
||||||
expect: []api.EndpointSubset{{
|
|
||||||
Addresses: []api.EndpointAddress{{IP: "1.2.3.4"}, {IP: "1.2.3.6"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 111}},
|
|
||||||
}, {
|
|
||||||
NotReadyAddresses: []api.EndpointAddress{{IP: "1.2.3.5"}},
|
|
||||||
Ports: []api.EndpointPort{{Port: 222}, {Port: 333}},
|
|
||||||
}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range testCases {
|
|
||||||
result := RepackSubsets(tc.given)
|
|
||||||
if !reflect.DeepEqual(result, SortSubsets(tc.expect)) {
|
|
||||||
t.Errorf("case %q: expected %s, got %s", tc.name, spew.Sprintf("%#v", SortSubsets(tc.expect)), spew.Sprintf("%#v", result))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user