Skip to content

K
k3s
Commit 9a8aabe7 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #27391 from nikhiljindal/fixFedName

Automatic merge from submit-queue federation: choosing a default federation name in test instead of failing The tests are failing right now: http://kubekins.dls.corp.google.com/job/kubernetes-e2e-gce-federation/ ``` [k8s.io] Service [Feature:Federation] should be able to discover a non-local federated service /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/federated-service.go:130 Jun 14 12:40:35.091: FEDERATION_NAME environment variable must be set [k8s.io] Service [Feature:Federation] should be able to discover a federated service /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/federated-service.go:130 Jun 14 12:40:40.802: FEDERATION_NAME environment variable must be set ``` This is to fix them. cc @kubernetes/sig-cluster-federation @mml
parents 130341b5 33291bd5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
test/e2e/federated-service.go
View file @ 9a8aabe7
...@@ -49,6 +49,8 @@ const ( ...@@ -49,6 +49,8 @@ const (
FederatedServiceName = "federated-service" FederatedServiceName = "federated-service"
FederatedServicePod = "federated-service-test-pod" FederatedServicePod = "federated-service-test-pod"
DefaultFederationName = "federation"
// TODO: Only suppoprts IPv4 addresses. Also add a regexp for IPv6 addresses. // TODO: Only suppoprts IPv4 addresses. Also add a regexp for IPv6 addresses.
FederatedIPAddrRegexp = `(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])` FederatedIPAddrRegexp = `(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])`
FederatedDNS1123Regexp = `([a-z0-9]([-a-z0-9]*[a-z0-9])?\.)*([a-z0-9]([-a-z0-9]*[a-z0-9])?)` FederatedDNS1123Regexp = `([a-z0-9]([-a-z0-9]*[a-z0-9])?\.)*([a-z0-9]([-a-z0-9]*[a-z0-9])?)`
...@@ -64,8 +66,7 @@ var _ = framework.KubeDescribe("Service [Feature:Federation]", func() { ...@@ -64,8 +66,7 @@ var _ = framework.KubeDescribe("Service [Feature:Federation]", func() {
// TODO: Federation API server should be able to answer this. // TODO: Federation API server should be able to answer this.
if federationName = os.Getenv("FEDERATION_NAME"); federationName == "" { if federationName = os.Getenv("FEDERATION_NAME"); federationName == "" {
// Tests cannot proceed without this value, so fail early here. federationName = DefaultFederationName
framework.Failf("FEDERATION_NAME environment variable must be set")
} }
contexts := f.GetUnderlyingFederatedContexts() contexts := f.GetUnderlyingFederatedContexts()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment