dual stack services (#91824)
* api: structure change * api: defaulting, conversion, and validation * [FIX] validation: auto remove second ip/family when service changes to SingleStack * [FIX] api: defaulting, conversion, and validation * api-server: clusterIPs alloc, printers, storage and strategy * [FIX] clusterIPs default on read * alloc: auto remove second ip/family when service changes to SingleStack * api-server: repair loop handling for clusterIPs * api-server: force kubernetes default service into single stack * api-server: tie dualstack feature flag with endpoint feature flag * controller-manager: feature flag, endpoint, and endpointSlice controllers handling multi family service * [FIX] controller-manager: feature flag, endpoint, and endpointSlicecontrollers handling multi family service * kube-proxy: feature-flag, utils, proxier, and meta proxier * [FIX] kubeproxy: call both proxier at the same time * kubenet: remove forced pod IP sorting * kubectl: modify describe to include ClusterIPs, IPFamilies, and IPFamilyPolicy * e2e: fix tests that depends on IPFamily field AND add dual stack tests * e2e: fix expected error message for ClusterIP immutability * add integration tests for dualstack the third phase of dual stack is a very complex change in the API, basically it introduces Dual Stack services. Main changes are: - It pluralizes the Service IPFamily field to IPFamilies, and removes the singular field. - It introduces a new field IPFamilyPolicyType that can take 3 values to express the "dual-stack(mad)ness" of the cluster: SingleStack, PreferDualStack and RequireDualStack - It pluralizes ClusterIP to ClusterIPs. The goal is to add coverage to the services API operations, taking into account the 6 different modes a cluster can have: - single stack: IP4 or IPv6 (as of today) - dual stack: IPv4 only, IPv6 only, IPv4 - IPv6, IPv6 - IPv4 * [FIX] add integration tests for dualstack * generated data * generated files Co-authored-by: Antonio Ojea <aojea@redhat.com>
This commit is contained in:

committed by
GitHub

parent
d0e06cf3e0
commit
6675eba3ef
@@ -649,7 +649,11 @@ func TestFilterIncorrectIPVersion(t *testing.T) {
|
||||
|
||||
for _, testcase := range testCases {
|
||||
t.Run(testcase.desc, func(t *testing.T) {
|
||||
correct, incorrect := FilterIncorrectIPVersion(testcase.ipString, testcase.wantIPv6)
|
||||
ipFamily := v1.IPv4Protocol
|
||||
if testcase.wantIPv6 {
|
||||
ipFamily = v1.IPv6Protocol
|
||||
}
|
||||
correct, incorrect := FilterIncorrectIPVersion(testcase.ipString, ipFamily)
|
||||
if !reflect.DeepEqual(testcase.expectCorrect, correct) {
|
||||
t.Errorf("Test %v failed: expected %v, got %v", testcase.desc, testcase.expectCorrect, correct)
|
||||
}
|
||||
@@ -659,3 +663,162 @@ func TestFilterIncorrectIPVersion(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestGetClusterIPByFamily(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
service v1.Service
|
||||
requestFamily v1.IPFamily
|
||||
expectedResult string
|
||||
}{
|
||||
{
|
||||
name: "old style service ipv4. want ipv4",
|
||||
requestFamily: v1.IPv4Protocol,
|
||||
expectedResult: "10.0.0.10",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIP: "10.0.0.10",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "old style service ipv4. want ipv6",
|
||||
requestFamily: v1.IPv6Protocol,
|
||||
expectedResult: "",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIP: "10.0.0.10",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "old style service ipv6. want ipv6",
|
||||
requestFamily: v1.IPv6Protocol,
|
||||
expectedResult: "2000::1",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIP: "2000::1",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "old style service ipv6. want ipv4",
|
||||
requestFamily: v1.IPv4Protocol,
|
||||
expectedResult: "",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIP: "2000::1",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "service single stack ipv4. want ipv4",
|
||||
requestFamily: v1.IPv4Protocol,
|
||||
expectedResult: "10.0.0.10",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIPs: []string{"10.0.0.10"},
|
||||
IPFamilies: []v1.IPFamily{v1.IPv4Protocol},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "service single stack ipv4. want ipv6",
|
||||
requestFamily: v1.IPv6Protocol,
|
||||
expectedResult: "",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIPs: []string{"10.0.0.10"},
|
||||
IPFamilies: []v1.IPFamily{v1.IPv4Protocol},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "service single stack ipv6. want ipv6",
|
||||
requestFamily: v1.IPv6Protocol,
|
||||
expectedResult: "2000::1",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIPs: []string{"2000::1"},
|
||||
IPFamilies: []v1.IPFamily{v1.IPv6Protocol},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "service single stack ipv6. want ipv4",
|
||||
requestFamily: v1.IPv4Protocol,
|
||||
expectedResult: "",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIPs: []string{"2000::1"},
|
||||
IPFamilies: []v1.IPFamily{v1.IPv6Protocol},
|
||||
},
|
||||
},
|
||||
},
|
||||
// dual stack
|
||||
{
|
||||
name: "service dual stack ipv4,6. want ipv4",
|
||||
requestFamily: v1.IPv4Protocol,
|
||||
expectedResult: "10.0.0.10",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIPs: []string{"10.0.0.10", "2000::1"},
|
||||
IPFamilies: []v1.IPFamily{v1.IPv4Protocol, v1.IPv6Protocol},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "service dual stack ipv4,6. want ipv6",
|
||||
requestFamily: v1.IPv6Protocol,
|
||||
expectedResult: "2000::1",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIPs: []string{"10.0.0.10", "2000::1"},
|
||||
IPFamilies: []v1.IPFamily{v1.IPv4Protocol, v1.IPv6Protocol},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "service dual stack ipv6,4. want ipv6",
|
||||
requestFamily: v1.IPv6Protocol,
|
||||
expectedResult: "2000::1",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIPs: []string{"2000::1", "10.0.0.10"},
|
||||
IPFamilies: []v1.IPFamily{v1.IPv6Protocol, v1.IPv4Protocol},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
name: "service dual stack ipv6,4. want ipv4",
|
||||
requestFamily: v1.IPv4Protocol,
|
||||
expectedResult: "10.0.0.10",
|
||||
service: v1.Service{
|
||||
Spec: v1.ServiceSpec{
|
||||
ClusterIPs: []string{"2000::1", "10.0.0.10"},
|
||||
IPFamilies: []v1.IPFamily{v1.IPv6Protocol, v1.IPv4Protocol},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.name, func(t *testing.T) {
|
||||
ip := GetClusterIPByFamily(testCase.requestFamily, &testCase.service)
|
||||
if ip != testCase.expectedResult {
|
||||
t.Fatalf("expected ip:%v got %v", testCase.expectedResult, ip)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user