From dd2560e2b2ad7daabd178b6d9dde52b35bb6797c Mon Sep 17 00:00:00 2001 From: Seshu Kumar Alluvada Date: Tue, 24 Mar 2020 08:48:25 -0400 Subject: [PATCH] fix service fqdn generation --- .../jenkins/configuration/base/resources/service.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/jenkins/configuration/base/resources/service.go b/pkg/controller/jenkins/configuration/base/resources/service.go index 0db3e982..032d8af2 100644 --- a/pkg/controller/jenkins/configuration/base/resources/service.go +++ b/pkg/controller/jenkins/configuration/base/resources/service.go @@ -41,7 +41,7 @@ func GetJenkinsServiceName(jenkins *v1alpha2.Jenkins, serviceType string) string func GetJenkinsServiceFQDN(jenkins *v1alpha2.Jenkins, serviceType string) string { clusterDomain := getClusterDomain() - return fmt.Sprintf("%s-%s-%s.%s", constants.OperatorName, serviceType, jenkins.ObjectMeta.Name, clusterDomain) + return fmt.Sprintf("%s-%s-%s.%s.svc.%s", constants.OperatorName, serviceType, jenkins.ObjectMeta.Name, jenkins.ObjectMeta.Namespace, clusterDomain) } // GetClusterDomain returns Kubernetes cluster domain, default to "cluster.local" @@ -55,7 +55,7 @@ func getClusterDomain() string { return clusterDomain } - clusterDomain = strings.TrimPrefix(cname, "kubernetes") + clusterDomain = strings.TrimPrefix(cname, "kubernetes.default.svc") clusterDomain = strings.TrimPrefix(clusterDomain, ".") clusterDomain = strings.TrimSuffix(clusterDomain, ".")