github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #42762 from csbell/e2e-dns-name 

Automatic merge from submit-queue (batch tested with PRs 42762, 42739, 42425, 42778)

[Federation][e2e] Use correct default dns name in e2e-testing

After some kubefed changes, the environment variable did not get propagated and we defaulted back to 'federation' instead of 'e2e-federation'. This fixes ongoing service test issues in e2e.
pull/6/head
Kubernetes Submit Queue 2017-03-09 02:51:36 -08:00 committed by GitHub
parent 2828db8f89 3fc13f0be6
commit 1bfb8e89b4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e_federation/util.go
View File

@ -44,7 +44,7 @@ import (
var (
KubeAPIQPS float32 = 20.0
KubeAPIBurst = 30
DefaultFederationName = "federation"
DefaultFederationName = "e2e-federation"
UserAgentName = "federation-e2e"
// We use this to decide how long to wait for our DNS probes to succeed.
DNSTTL = 180 * time.Second // TODO: make k8s.io/kubernetes/federation/pkg/federation-controller/service.minDnsTtl exported, and import it here.