From 0082392dbf5f586cf9d10cd4a82e2e9cd7cb284b Mon Sep 17 00:00:00 2001 From: Seshu Kumar Alluvada Date: Mon, 23 Mar 2020 09:47:58 -0400 Subject: [PATCH] fix the seed job service names to use FQDN --- .../jenkins/configuration/user/seedjobs/seedjobs.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go index 7fde534e..f64ad2dc 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go @@ -402,9 +402,8 @@ func agentDeployment(jenkins *v1alpha2.Jenkins, namespace string, agentName stri Env: []corev1.EnvVar{ { Name: "JENKINS_TUNNEL", - Value: fmt.Sprintf("%s.%s:%d", - resources.GetJenkinsSlavesServiceName(jenkins), - jenkins.ObjectMeta.Namespace, + Value: fmt.Sprintf("%s:%d", + resources.GetJenkinsSlavesServiceFQDN(jenkins), jenkins.Spec.SlaveService.Port), }, { @@ -417,9 +416,8 @@ func agentDeployment(jenkins *v1alpha2.Jenkins, namespace string, agentName stri }, { Name: "JENKINS_URL", - Value: fmt.Sprintf("http://%s.%s:%d", - resources.GetJenkinsHTTPServiceName(jenkins), - jenkins.ObjectMeta.Namespace, + Value: fmt.Sprintf("http://%s:%d", + resources.GetJenkinsHTTPServiceFQDN(jenkins), jenkins.Spec.Service.Port, ), },