github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #103220 from aojea/nit_dual

Browse Source 
Follow up on fix auto upgraded preferDual-Stack services (in cluster upgrade) #102898
This commit is contained in:
Kubernetes Prow Robot 2021-06-25 15:52:47 -07:00 committed by GitHub
commit 7498c287a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -882,12 +882,6 @@ func isMatchingPreferDualStackClusterIPFields(oldService, service *api.Service)
return false return false
} }
if oldService.Spec.Type != api.ServiceTypeClusterIP &&
oldService.Spec.Type != api.ServiceTypeNodePort &&
oldService.Spec.Type != api.ServiceTypeLoadBalancer {
return false
}
// both must be of IPFamilyPolicy==PreferDualStack // both must be of IPFamilyPolicy==PreferDualStack
if service.Spec.IPFamilyPolicy != nil && *(service.Spec.IPFamilyPolicy) != api.IPFamilyPolicyPreferDualStack { if service.Spec.IPFamilyPolicy != nil && *(service.Spec.IPFamilyPolicy) != api.IPFamilyPolicyPreferDualStack {
return false return false

2
test/integration/dualstack/dualstack_test.go
View File

@ -1661,7 +1661,7 @@ func TestDowngradeServicePreferToDualStack(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("Unexpected error to get the service %s %v", svc.Name, err) t.Fatalf("Unexpected error to get the service %s %v", svc.Name, err)
} }
// service should be single stack // service should remain dual stack
if err = validateServiceAndClusterIPFamily(svc, []v1.IPFamily{v1.IPv4Protocol, v1.IPv6Protocol}); err != nil { if err = validateServiceAndClusterIPFamily(svc, []v1.IPFamily{v1.IPv4Protocol, v1.IPv6Protocol}); err != nil {
t.Fatalf("Unexpected error validating the service %s %v", svc.Name, err) t.Fatalf("Unexpected error validating the service %s %v", svc.Name, err)
} }