github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89612 from SataQiu/fix-20200328

Browse Source 
Dual-stack: fix the bug that Service clusterIP does not respect specified ipFamily
This commit is contained in:
Kubernetes Prow Robot 2020-04-02 17:23:46 -07:00 committed by GitHub
commit 489d3712ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 121 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/registry/core/service/storage/rest.go
View File

@ -559,7 +559,7 @@ func (r *REST) getAllocatorByClusterIP(service *api.Service) ipallocator.Interfa
} }
secondaryAllocatorCIDR := r.secondaryServiceIPs.CIDR() secondaryAllocatorCIDR := r.secondaryServiceIPs.CIDR()
if netutil.IsIPv6String(service.Spec.ClusterIP) && netutil.IsIPv6CIDR(&secondaryAllocatorCIDR) { if netutil.IsIPv6String(service.Spec.ClusterIP) == netutil.IsIPv6CIDR(&secondaryAllocatorCIDR) {
return r.secondaryServiceIPs return r.secondaryServiceIPs
} }
@ -574,7 +574,7 @@ func (r *REST) getAllocatorBySpec(service *api.Service) ipallocator.Interface {
} }
secondaryAllocatorCIDR := r.secondaryServiceIPs.CIDR() secondaryAllocatorCIDR := r.secondaryServiceIPs.CIDR()
if *(service.Spec.IPFamily) == api.IPv6Protocol && netutil.IsIPv6CIDR(&secondaryAllocatorCIDR) { if (*(service.Spec.IPFamily) == api.IPv6Protocol) == netutil.IsIPv6CIDR(&secondaryAllocatorCIDR) {
return r.secondaryServiceIPs return r.secondaryServiceIPs
} }

124
pkg/registry/core/service/storage/rest_test.go
View File

@ -2512,6 +2512,7 @@ func TestAllocGetters(t *testing.T) {
testCases := []struct { testCases := []struct {
name string name string
isIPv6Primary bool
enableDualStack bool enableDualStack bool
specExpctPrimary bool specExpctPrimary bool
clusterIPExpectPrimary bool clusterIPExpectPrimary bool
@ -2519,8 +2520,9 @@ func TestAllocGetters(t *testing.T) {
svc *api.Service svc *api.Service
}{ }{
{ {
name: "spec:v4 ip:v4 dualstack:off", name: "spec:v4 ip:v4 dualstack:off isIPv6Primary:false",
isIPv6Primary: false,
specExpctPrimary: true, specExpctPrimary: true,
clusterIPExpectPrimary: true, clusterIPExpectPrimary: true,
enableDualStack: false, enableDualStack: false,
@ -2536,8 +2538,9 @@ func TestAllocGetters(t *testing.T) {
}, },
}, },
{ {
name: "spec:v4 ip:v4 dualstack:on", name: "spec:v4 ip:v4 dualstack:on isIPv6Primary:false",
isIPv6Primary: false,
specExpctPrimary: true, specExpctPrimary: true,
clusterIPExpectPrimary: true, clusterIPExpectPrimary: true,
enableDualStack: true, enableDualStack: true,
@ -2554,8 +2557,9 @@ func TestAllocGetters(t *testing.T) {
}, },
{ {
name: "spec:v4 ip:v6 dualstack:on", name: "spec:v4 ip:v6 dualstack:on isIPv6Primary:false",
isIPv6Primary: false,
specExpctPrimary: true, specExpctPrimary: true,
clusterIPExpectPrimary: false, clusterIPExpectPrimary: false,
enableDualStack: true, enableDualStack: true,
@ -2572,8 +2576,9 @@ func TestAllocGetters(t *testing.T) {
}, },
{ {
name: "spec:v6 ip:v6 dualstack:on", name: "spec:v6 ip:v6 dualstack:on isIPv6Primary:false",
isIPv6Primary: false,
specExpctPrimary: false, specExpctPrimary: false,
clusterIPExpectPrimary: false, clusterIPExpectPrimary: false,
enableDualStack: true, enableDualStack: true,
@ -2590,8 +2595,9 @@ func TestAllocGetters(t *testing.T) {
}, },
{ {
name: "spec:v6 ip:v4 dualstack:on", name: "spec:v6 ip:v4 dualstack:on isIPv6Primary:false",
isIPv6Primary: false,
specExpctPrimary: false, specExpctPrimary: false,
clusterIPExpectPrimary: true, clusterIPExpectPrimary: true,
enableDualStack: true, enableDualStack: true,
@ -2606,6 +2612,99 @@ func TestAllocGetters(t *testing.T) {
}, },
}, },
}, },
{
name: "spec:v6 ip:v6 dualstack:off isIPv6Primary:true",
isIPv6Primary: true,
specExpctPrimary: true,
clusterIPExpectPrimary: true,
enableDualStack: false,
svc: &api.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", ResourceVersion: "1"},
Spec: api.ServiceSpec{
Selector: map[string]string{"bar": "baz"},
Type: api.ServiceTypeClusterIP,
IPFamily: &ipv6Service,
ClusterIP: "2000::1",
},
},
},
{
name: "spec:v6 ip:v6 dualstack:on isIPv6Primary:true",
isIPv6Primary: true,
specExpctPrimary: true,
clusterIPExpectPrimary: true,
enableDualStack: true,
svc: &api.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", ResourceVersion: "1"},
Spec: api.ServiceSpec{
Selector: map[string]string{"bar": "baz"},
Type: api.ServiceTypeClusterIP,
IPFamily: &ipv6Service,
ClusterIP: "2000::1",
},
},
},
{
name: "spec:v6 ip:v4 dualstack:on isIPv6Primary:true",
isIPv6Primary: true,
specExpctPrimary: true,
clusterIPExpectPrimary: false,
enableDualStack: true,
svc: &api.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", ResourceVersion: "1"},
Spec: api.ServiceSpec{
Selector: map[string]string{"bar": "baz"},
Type: api.ServiceTypeClusterIP,
IPFamily: &ipv6Service,
ClusterIP: "10.0.0.1",
},
},
},
{
name: "spec:v4 ip:v4 dualstack:on isIPv6Primary:true",
isIPv6Primary: true,
specExpctPrimary: false,
clusterIPExpectPrimary: false,
enableDualStack: true,
svc: &api.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", ResourceVersion: "1"},
Spec: api.ServiceSpec{
Selector: map[string]string{"bar": "baz"},
Type: api.ServiceTypeClusterIP,
IPFamily: &ipv4Service,
ClusterIP: "10.0.0.1",
},
},
},
{
name: "spec:v4 ip:v6 dualstack:on isIPv6Primary:true",
isIPv6Primary: true,
specExpctPrimary: false,
clusterIPExpectPrimary: true,
enableDualStack: true,
svc: &api.Service{
ObjectMeta: metav1.ObjectMeta{Name: "foo", ResourceVersion: "1"},
Spec: api.ServiceSpec{
Selector: map[string]string{"bar": "baz"},
Type: api.ServiceTypeClusterIP,
IPFamily: &ipv4Service,
ClusterIP: "2000::1",
},
},
},
} }
for _, tc := range testCases { for _, tc := range testCases {
@ -2614,6 +2713,21 @@ func TestAllocGetters(t *testing.T) {
storage, _, server := NewTestREST(t, nil, tc.enableDualStack) storage, _, server := NewTestREST(t, nil, tc.enableDualStack)
defer server.Terminate(t) defer server.Terminate(t)
if tc.isIPv6Primary {
if storage.secondaryServiceIPs != nil {
storage.serviceIPs, storage.secondaryServiceIPs = storage.secondaryServiceIPs, storage.serviceIPs
} else {
r, err := ipallocator.NewCIDRRange(makeIPNet6(t))
if err != nil {
t.Fatalf("cannot create CIDR Range(primary) %v", err)
}
if tc.enableDualStack {
storage.secondaryServiceIPs = storage.serviceIPs
}
storage.serviceIPs = r
}
}
if tc.enableDualStack && storage.secondaryServiceIPs == nil { if tc.enableDualStack && storage.secondaryServiceIPs == nil {
t.Errorf("storage must allocate secondary ServiceIPs allocator for dual stack") t.Errorf("storage must allocate secondary ServiceIPs allocator for dual stack")
return return