forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kubernetes#35372 from justinsb/federation_dns_host…
…ed_zone_1 Automatic merge from submit-queue Federation: separate notion of zone-name & dns-suffix
- Loading branch information
Showing
8 changed files
with
221 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
170 changes: 170 additions & 0 deletions
170
federation/pkg/federation-controller/service/dns_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| /* | ||
| Copyright 2016 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 service | ||
|
|
||
| import ( | ||
| "sync" | ||
| "testing" | ||
|
|
||
| "fmt" | ||
| "k8s.io/kubernetes/federation/apis/federation/v1beta1" | ||
| "k8s.io/kubernetes/federation/pkg/dnsprovider/providers/google/clouddns" // Only for unit testing purposes. | ||
| "k8s.io/kubernetes/pkg/api/v1" | ||
| "k8s.io/kubernetes/pkg/util/sets" | ||
| "reflect" | ||
| "sort" | ||
| ) | ||
|
|
||
| func TestServiceController_ensureDnsRecords(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| service v1.Service | ||
| expected []string | ||
| serviceStatus v1.LoadBalancerStatus | ||
| }{ | ||
| { | ||
| name: "withip", | ||
| service: v1.Service{ | ||
| ObjectMeta: v1.ObjectMeta{ | ||
| Name: "servicename", | ||
| Namespace: "servicenamespace", | ||
| }, | ||
| }, | ||
| serviceStatus: buildServiceStatus([][]string{{"198.51.100.1", ""}}), | ||
| expected: []string{ | ||
| "example.com:servicename.servicenamespace.myfederation.svc.federation.example.com:A:180:[198.51.100.1]", | ||
| "example.com:servicename.servicenamespace.myfederation.svc.fooregion.federation.example.com:A:180:[198.51.100.1]", | ||
| "example.com:servicename.servicenamespace.myfederation.svc.foozone.fooregion.federation.example.com:A:180:[198.51.100.1]", | ||
| }, | ||
| }, | ||
| /* | ||
| TODO: getResolvedEndpoints preforms DNS lookup. | ||
| Mock and maybe look at error handling when some endpoints resolve, but also caching? | ||
| { | ||
| name: "withname", | ||
| service: v1.Service{ | ||
| ObjectMeta: v1.ObjectMeta{ | ||
| Name: "servicename", | ||
| Namespace: "servicenamespace", | ||
| }, | ||
| }, | ||
| serviceStatus: buildServiceStatus([][]string{{"", "randomstring.amazonelb.example.com"}}), | ||
| expected: []string{ | ||
| "example.com:servicename.servicenamespace.myfederation.svc.federation.example.com:A:180:[198.51.100.1]", | ||
| "example.com:servicename.servicenamespace.myfederation.svc.fooregion.federation.example.com:A:180:[198.51.100.1]", | ||
| "example.com:servicename.servicenamespace.myfederation.svc.foozone.fooregion.federation.example.com:A:180:[198.51.100.1]", | ||
| }, | ||
| }, | ||
| */ | ||
| { | ||
| name: "noendpoints", | ||
| service: v1.Service{ | ||
| ObjectMeta: v1.ObjectMeta{ | ||
| Name: "servicename", | ||
| Namespace: "servicenamespace", | ||
| }, | ||
| }, | ||
| expected: []string{ | ||
| "example.com:servicename.servicenamespace.myfederation.svc.fooregion.federation.example.com:CNAME:180:[servicename.servicenamespace.myfederation.svc.federation.example.com]", | ||
| "example.com:servicename.servicenamespace.myfederation.svc.foozone.fooregion.federation.example.com:CNAME:180:[servicename.servicenamespace.myfederation.svc.fooregion.federation.example.com]", | ||
| }, | ||
| }, | ||
| } | ||
| for _, test := range tests { | ||
| fakedns, _ := clouddns.NewFakeInterface() | ||
| fakednsZones, ok := fakedns.Zones() | ||
| if !ok { | ||
| t.Error("Unable to fetch zones") | ||
| } | ||
| serviceController := ServiceController{ | ||
| dns: fakedns, | ||
| dnsZones: fakednsZones, | ||
| serviceDnsSuffix: "federation.example.com", | ||
| zoneName: "example.com", | ||
| federationName: "myfederation", | ||
| serviceCache: &serviceCache{fedServiceMap: make(map[string]*cachedService)}, | ||
| clusterCache: &clusterClientCache{ | ||
| rwlock: sync.Mutex{}, | ||
| clientMap: make(map[string]*clusterCache), | ||
| }, | ||
| knownClusterSet: make(sets.String), | ||
| } | ||
|
|
||
| clusterName := "testcluster" | ||
|
|
||
| serviceController.clusterCache.clientMap[clusterName] = &clusterCache{ | ||
| cluster: &v1beta1.Cluster{ | ||
| Status: v1beta1.ClusterStatus{ | ||
| Zones: []string{"foozone"}, | ||
| Region: "fooregion", | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| cachedService := &cachedService{ | ||
| lastState: &test.service, | ||
| endpointMap: make(map[string]int), | ||
| serviceStatusMap: make(map[string]v1.LoadBalancerStatus), | ||
| } | ||
| cachedService.endpointMap[clusterName] = 1 | ||
| if !reflect.DeepEqual(&test.serviceStatus, &v1.LoadBalancerStatus{}) { | ||
| cachedService.serviceStatusMap[clusterName] = test.serviceStatus | ||
| } | ||
|
|
||
| err := serviceController.ensureDnsRecords(clusterName, cachedService) | ||
| if err != nil { | ||
| t.Errorf("Test failed for %s, unexpected error %v", test.name, err) | ||
| } | ||
|
|
||
| zones, err := fakednsZones.List() | ||
| if err != nil { | ||
| t.Errorf("error querying zones: %v", err) | ||
| } | ||
|
|
||
| // Dump every record to a testable-by-string-comparison form | ||
| var records []string | ||
| for _, z := range zones { | ||
| zoneName := z.Name() | ||
|
|
||
| rrs, ok := z.ResourceRecordSets() | ||
| if !ok { | ||
| t.Errorf("cannot get rrs for zone %q", zoneName) | ||
| } | ||
|
|
||
| rrList, err := rrs.List() | ||
| if err != nil { | ||
| t.Errorf("error querying rr for zone %q: %v", zoneName, err) | ||
| } | ||
| for _, rr := range rrList { | ||
| rrdatas := rr.Rrdatas() | ||
|
|
||
| // Put in consistent (testable-by-string-comparison) order | ||
| sort.Strings(rrdatas) | ||
| records = append(records, fmt.Sprintf("%s:%s:%s:%d:%s", zoneName, rr.Name(), rr.Type(), rr.Ttl(), rrdatas)) | ||
| } | ||
| } | ||
|
|
||
| // Ignore order of records | ||
| sort.Strings(records) | ||
| sort.Strings(test.expected) | ||
|
|
||
| if !reflect.DeepEqual(records, test.expected) { | ||
| t.Errorf("Test %q failed. Actual=%v, Expected=%v", test.name, records, test.expected) | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters