From bcad7093b25e4274a8934e0303004752eb8130ce Mon Sep 17 00:00:00 2001 From: Christian Bell Date: Thu, 9 Mar 2017 09:46:15 -0800 Subject: [PATCH] [Federation] Prevent trailing periods in kube-dns federations domains kubefed-level fix to catch cases where FEDERATIONS_DOMAIN_MAP is not set in the environment (i.e. CI). --- federation/pkg/kubefed/init/init.go | 4 +++- federation/pkg/kubefed/init/init_test.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go index 23719cd7ead..c4acc8e3974 100644 --- a/federation/pkg/kubefed/init/init.go +++ b/federation/pkg/kubefed/init/init.go @@ -829,7 +829,9 @@ func createControllerManager(clientset client.Interface, namespace, name, svcNam // TODO: the name/domain name pair should ideally be checked for naming convention // as done in kube-dns federation flags check. // https://github.com/kubernetes/dns/blob/master/pkg/dns/federation/federation.go - util.FedDomainMapKey: fmt.Sprintf("%s=%s", name, dnsZoneName), + // TODO v2: Until kube-dns can handle trailing periods we strip them all. + // See https://github.com/kubernetes/dns/issues/67 + util.FedDomainMapKey: fmt.Sprintf("%s=%s", name, strings.TrimRight(dnsZoneName, ".")), }, }, Spec: extensions.DeploymentSpec{ diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index 6fa22841143..5212c5d37ba 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/federation/pkg/kubefed/init/init_test.go @@ -936,7 +936,7 @@ func fakeInitHostFactory(apiserverServiceType v1.ServiceType, federationName, na Namespace: namespaceName, Labels: componentLabel, Annotations: map[string]string{ - util.FedDomainMapKey: fmt.Sprintf("%s=%s", federationName, dnsZoneName), + util.FedDomainMapKey: fmt.Sprintf("%s=%s", federationName, strings.TrimRight(dnsZoneName, ".")), }, }, Spec: v1beta1.DeploymentSpec{