From 959aa17c30ae6a98f1e47d52722723069c352839 Mon Sep 17 00:00:00 2001 From: Seshu Kumar Alluvada Date: Sun, 22 Mar 2020 23:39:39 -0400 Subject: [PATCH 1/5] configure kubernetes with FQDNs for jenkins http and slave services --- chart/jenkins-operator/templates/role.yaml | 6 ++++ .../resources/base_configuration_configmap.go | 5 +-- .../configuration/base/resources/service.go | 35 +++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/chart/jenkins-operator/templates/role.yaml b/chart/jenkins-operator/templates/role.yaml index d6e7aaa1..f9fb9779 100644 --- a/chart/jenkins-operator/templates/role.yaml +++ b/chart/jenkins-operator/templates/role.yaml @@ -30,15 +30,21 @@ rules: resources: - serviceaccounts verbs: + - get - create + - list + - watch - apiGroups: - rbac.authorization.k8s.io resources: - roles - rolebindings verbs: + - get - create - update + - list + - watch - apiGroups: - "" resources: diff --git a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go index 022a7a20..7c8c149e 100644 --- a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go @@ -2,6 +2,7 @@ package resources import ( "fmt" + "github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2" "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" @@ -187,8 +188,8 @@ func NewBaseConfigurationConfigMap(meta metav1.ObjectMeta, jenkins *v1alpha2.Jen disableInsecureFeaturesGroovyScriptName: disableInsecureFeatures, configureKubernetesPluginGroovyScriptName: fmt.Sprintf(configureKubernetesPluginFmt, jenkins.ObjectMeta.Namespace, - fmt.Sprintf("http://%s.%s:%d", GetJenkinsHTTPServiceName(jenkins), jenkins.ObjectMeta.Namespace, jenkins.Spec.Service.Port), - fmt.Sprintf("%s.%s:%d", GetJenkinsSlavesServiceName(jenkins), jenkins.ObjectMeta.Namespace, jenkins.Spec.SlaveService.Port), + fmt.Sprintf("http://%s:%d", GetJenkinsHTTPServiceFQDN(jenkins), jenkins.Spec.Service.Port), + fmt.Sprintf("%s:%d", GetJenkinsSlavesServiceFQDN(jenkins), jenkins.Spec.SlaveService.Port), ), configureViewsGroovyScriptName: configureViews, disableJobDslScriptApprovalGroovyScriptName: disableJobDSLScriptApproval, diff --git a/pkg/controller/jenkins/configuration/base/resources/service.go b/pkg/controller/jenkins/configuration/base/resources/service.go index b9e2d96c..a4e7b2e3 100644 --- a/pkg/controller/jenkins/configuration/base/resources/service.go +++ b/pkg/controller/jenkins/configuration/base/resources/service.go @@ -7,6 +7,9 @@ import ( "github.com/jenkinsci/kubernetes-operator/pkg/controller/jenkins/constants" corev1 "k8s.io/api/core/v1" + + "net" + "strings" ) // UpdateService returns new service with override fields from config @@ -38,3 +41,35 @@ func GetJenkinsHTTPServiceName(jenkins *v1alpha2.Jenkins) string { func GetJenkinsSlavesServiceName(jenkins *v1alpha2.Jenkins) string { return fmt.Sprintf("%s-slave-%s", constants.OperatorName, jenkins.ObjectMeta.Name) } + +// GetJenkinsHTTPServiceFQDN returns Kubernetes service FQDN used for expose Jenkins HTTP endpoint +func GetJenkinsHTTPServiceFQDN(jenkins *v1alpha2.Jenkins) string { + clusterDomain := getClusterDomain() + + return fmt.Sprintf("%s-http-%s.%s", constants.OperatorName, jenkins.ObjectMeta.Name, clusterDomain) +} + +// GetJenkinsSlavesServiceFQDN returns Kubernetes service FQDN used for expose Jenkins slave endpoint +func GetJenkinsSlavesServiceFQDN(jenkins *v1alpha2.Jenkins) string { + clusterDomain := getClusterDomain() + + return fmt.Sprintf("%s-slave-%s.%s", constants.OperatorName, jenkins.ObjectMeta.Name, clusterDomain) +} + +// GetClusterDomain returns Kubernetes cluster domain, default to "cluster.local" +func getClusterDomain() string { + apiSvc := "kubernetes.default.svc" + + clusterDomain := "cluster.local" + + cname, err := net.LookupCNAME(apiSvc) + if err != nil { + return clusterDomain + } + + clusterDomain = strings.TrimPrefix(cname, "kubernetes") + clusterDomain = strings.TrimPrefix(clusterDomain, ".") + clusterDomain = strings.TrimSuffix(clusterDomain, ".") + + return clusterDomain +} From 0082392dbf5f586cf9d10cd4a82e2e9cd7cb284b Mon Sep 17 00:00:00 2001 From: Seshu Kumar Alluvada Date: Mon, 23 Mar 2020 09:47:58 -0400 Subject: [PATCH 2/5] 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, ), }, From d71d105986f113d55643e22ff6d48154a78f0ef5 Mon Sep 17 00:00:00 2001 From: Seshu Kumar Alluvada Date: Tue, 24 Mar 2020 00:30:24 -0400 Subject: [PATCH 3/5] refactor service name and service fqdn fuctions --- .../jenkins/configuration/base/reconcile.go | 6 ++--- .../resources/base_configuration_configmap.go | 4 ++-- .../configuration/base/resources/service.go | 24 +++++-------------- .../configuration/user/seedjobs/seedjobs.go | 4 ++-- test/e2e/jenkins.go | 2 +- 5 files changed, 14 insertions(+), 26 deletions(-) diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go index b33f8f10..2d8185d0 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile.go +++ b/pkg/controller/jenkins/configuration/base/reconcile.go @@ -183,11 +183,11 @@ func (r *ReconcileJenkinsBaseConfiguration) ensureResourcesRequiredForJenkinsPod } r.logger.V(log.VDebug).Info("Extra role bindings are present") - if err := r.createService(metaObject, resources.GetJenkinsHTTPServiceName(r.Configuration.Jenkins), r.Configuration.Jenkins.Spec.Service); err != nil { + if err := r.createService(metaObject, resources.GetJenkinsServiceName(r.Configuration.Jenkins, "http"), r.Configuration.Jenkins.Spec.Service); err != nil { return err } r.logger.V(log.VDebug).Info("Jenkins HTTP Service is present") - if err := r.createService(metaObject, resources.GetJenkinsSlavesServiceName(r.Configuration.Jenkins), r.Configuration.Jenkins.Spec.SlaveService); err != nil { + if err := r.createService(metaObject, resources.GetJenkinsServiceName(r.Configuration.Jenkins, "slave"), r.Configuration.Jenkins.Spec.SlaveService); err != nil { return err } r.logger.V(log.VDebug).Info("Jenkins slave Service is present") @@ -951,7 +951,7 @@ func (r *ReconcileJenkinsBaseConfiguration) getJenkinsAPIUrl() (string, error) { err := r.Client.Get(context.TODO(), types.NamespacedName{ Namespace: r.Configuration.Jenkins.ObjectMeta.Namespace, - Name: resources.GetJenkinsHTTPServiceName(r.Configuration.Jenkins), + Name: resources.GetJenkinsServiceName(r.Configuration.Jenkins, "http"), }, &service) if err != nil { diff --git a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go index 7c8c149e..5f5d76af 100644 --- a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go @@ -188,8 +188,8 @@ func NewBaseConfigurationConfigMap(meta metav1.ObjectMeta, jenkins *v1alpha2.Jen disableInsecureFeaturesGroovyScriptName: disableInsecureFeatures, configureKubernetesPluginGroovyScriptName: fmt.Sprintf(configureKubernetesPluginFmt, jenkins.ObjectMeta.Namespace, - fmt.Sprintf("http://%s:%d", GetJenkinsHTTPServiceFQDN(jenkins), jenkins.Spec.Service.Port), - fmt.Sprintf("%s:%d", GetJenkinsSlavesServiceFQDN(jenkins), jenkins.Spec.SlaveService.Port), + fmt.Sprintf("http://%s:%d", GetJenkinsServiceFQDN(jenkins, "http"), jenkins.Spec.Service.Port), + fmt.Sprintf("%s:%d", GetJenkinsServiceFQDN(jenkins, "slave"), jenkins.Spec.SlaveService.Port), ), configureViewsGroovyScriptName: configureViews, disableJobDslScriptApprovalGroovyScriptName: disableJobDSLScriptApproval, diff --git a/pkg/controller/jenkins/configuration/base/resources/service.go b/pkg/controller/jenkins/configuration/base/resources/service.go index a4e7b2e3..0db3e982 100644 --- a/pkg/controller/jenkins/configuration/base/resources/service.go +++ b/pkg/controller/jenkins/configuration/base/resources/service.go @@ -32,28 +32,16 @@ func UpdateService(actual corev1.Service, config v1alpha2.Service) corev1.Servic return actual } -// GetJenkinsHTTPServiceName returns Kubernetes service name used for expose Jenkins HTTP endpoint -func GetJenkinsHTTPServiceName(jenkins *v1alpha2.Jenkins) string { - return fmt.Sprintf("%s-http-%s", constants.OperatorName, jenkins.ObjectMeta.Name) +// GetJenkinsServiceName returns Kubernetes service name used for expose Jenkins HTTP and Slaves endpoint +func GetJenkinsServiceName(jenkins *v1alpha2.Jenkins, serviceType string) string { + return fmt.Sprintf("%s-%s-%s", constants.OperatorName, serviceType, jenkins.ObjectMeta.Name) } -// GetJenkinsSlavesServiceName returns Kubernetes service name used for expose Jenkins slave endpoint -func GetJenkinsSlavesServiceName(jenkins *v1alpha2.Jenkins) string { - return fmt.Sprintf("%s-slave-%s", constants.OperatorName, jenkins.ObjectMeta.Name) -} - -// GetJenkinsHTTPServiceFQDN returns Kubernetes service FQDN used for expose Jenkins HTTP endpoint -func GetJenkinsHTTPServiceFQDN(jenkins *v1alpha2.Jenkins) string { +// GetJenkinsServiceFQDN returns Kubernetes service FQDN used for expose Jenkins HTTP and Slaves endpoint +func GetJenkinsServiceFQDN(jenkins *v1alpha2.Jenkins, serviceType string) string { clusterDomain := getClusterDomain() - return fmt.Sprintf("%s-http-%s.%s", constants.OperatorName, jenkins.ObjectMeta.Name, clusterDomain) -} - -// GetJenkinsSlavesServiceFQDN returns Kubernetes service FQDN used for expose Jenkins slave endpoint -func GetJenkinsSlavesServiceFQDN(jenkins *v1alpha2.Jenkins) string { - clusterDomain := getClusterDomain() - - return fmt.Sprintf("%s-slave-%s.%s", constants.OperatorName, jenkins.ObjectMeta.Name, clusterDomain) + return fmt.Sprintf("%s-%s-%s.%s", constants.OperatorName, serviceType, jenkins.ObjectMeta.Name, clusterDomain) } // GetClusterDomain returns Kubernetes cluster domain, default to "cluster.local" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go index f64ad2dc..f059d087 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go @@ -403,7 +403,7 @@ func agentDeployment(jenkins *v1alpha2.Jenkins, namespace string, agentName stri { Name: "JENKINS_TUNNEL", Value: fmt.Sprintf("%s:%d", - resources.GetJenkinsSlavesServiceFQDN(jenkins), + resources.GetJenkinsServiceFQDN(jenkins, "slave"), jenkins.Spec.SlaveService.Port), }, { @@ -417,7 +417,7 @@ func agentDeployment(jenkins *v1alpha2.Jenkins, namespace string, agentName stri { Name: "JENKINS_URL", Value: fmt.Sprintf("http://%s:%d", - resources.GetJenkinsHTTPServiceFQDN(jenkins), + resources.GetJenkinsServiceFQDN(jenkins, "http"), jenkins.Spec.Service.Port, ), }, diff --git a/test/e2e/jenkins.go b/test/e2e/jenkins.go index d9f83a5e..e14c6fe6 100644 --- a/test/e2e/jenkins.go +++ b/test/e2e/jenkins.go @@ -57,7 +57,7 @@ func createJenkinsAPIClient(jenkins *v1alpha2.Jenkins, hostname string, port int err := framework.Global.Client.Get(context.TODO(), types.NamespacedName{ Namespace: jenkins.Namespace, - Name: resources.GetJenkinsHTTPServiceName(jenkins), + Name: resources.GetJenkinsServiceName(jenkins, "http"), }, &service) if err != nil { From dd2560e2b2ad7daabd178b6d9dde52b35bb6797c Mon Sep 17 00:00:00 2001 From: Seshu Kumar Alluvada Date: Tue, 24 Mar 2020 08:48:25 -0400 Subject: [PATCH 4/5] 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, ".") From 5baee01ac59a2e804835eef0fe5e790086b57a03 Mon Sep 17 00:00:00 2001 From: Seshu Kumar Alluvada Date: Tue, 24 Mar 2020 09:42:25 -0400 Subject: [PATCH 5/5] Revert "refactor service name and service fqdn fuctions" This reverts commit d71d105986f113d55643e22ff6d48154a78f0ef5. --- .../jenkins/configuration/base/reconcile.go | 6 ++--- .../resources/base_configuration_configmap.go | 4 ++-- .../configuration/base/resources/service.go | 24 ++++++++++++++----- .../configuration/user/seedjobs/seedjobs.go | 4 ++-- test/e2e/jenkins.go | 2 +- 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go index 2d8185d0..b33f8f10 100644 --- a/pkg/controller/jenkins/configuration/base/reconcile.go +++ b/pkg/controller/jenkins/configuration/base/reconcile.go @@ -183,11 +183,11 @@ func (r *ReconcileJenkinsBaseConfiguration) ensureResourcesRequiredForJenkinsPod } r.logger.V(log.VDebug).Info("Extra role bindings are present") - if err := r.createService(metaObject, resources.GetJenkinsServiceName(r.Configuration.Jenkins, "http"), r.Configuration.Jenkins.Spec.Service); err != nil { + if err := r.createService(metaObject, resources.GetJenkinsHTTPServiceName(r.Configuration.Jenkins), r.Configuration.Jenkins.Spec.Service); err != nil { return err } r.logger.V(log.VDebug).Info("Jenkins HTTP Service is present") - if err := r.createService(metaObject, resources.GetJenkinsServiceName(r.Configuration.Jenkins, "slave"), r.Configuration.Jenkins.Spec.SlaveService); err != nil { + if err := r.createService(metaObject, resources.GetJenkinsSlavesServiceName(r.Configuration.Jenkins), r.Configuration.Jenkins.Spec.SlaveService); err != nil { return err } r.logger.V(log.VDebug).Info("Jenkins slave Service is present") @@ -951,7 +951,7 @@ func (r *ReconcileJenkinsBaseConfiguration) getJenkinsAPIUrl() (string, error) { err := r.Client.Get(context.TODO(), types.NamespacedName{ Namespace: r.Configuration.Jenkins.ObjectMeta.Namespace, - Name: resources.GetJenkinsServiceName(r.Configuration.Jenkins, "http"), + Name: resources.GetJenkinsHTTPServiceName(r.Configuration.Jenkins), }, &service) if err != nil { diff --git a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go index 5f5d76af..7c8c149e 100644 --- a/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go +++ b/pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go @@ -188,8 +188,8 @@ func NewBaseConfigurationConfigMap(meta metav1.ObjectMeta, jenkins *v1alpha2.Jen disableInsecureFeaturesGroovyScriptName: disableInsecureFeatures, configureKubernetesPluginGroovyScriptName: fmt.Sprintf(configureKubernetesPluginFmt, jenkins.ObjectMeta.Namespace, - fmt.Sprintf("http://%s:%d", GetJenkinsServiceFQDN(jenkins, "http"), jenkins.Spec.Service.Port), - fmt.Sprintf("%s:%d", GetJenkinsServiceFQDN(jenkins, "slave"), jenkins.Spec.SlaveService.Port), + fmt.Sprintf("http://%s:%d", GetJenkinsHTTPServiceFQDN(jenkins), jenkins.Spec.Service.Port), + fmt.Sprintf("%s:%d", GetJenkinsSlavesServiceFQDN(jenkins), jenkins.Spec.SlaveService.Port), ), configureViewsGroovyScriptName: configureViews, disableJobDslScriptApprovalGroovyScriptName: disableJobDSLScriptApproval, diff --git a/pkg/controller/jenkins/configuration/base/resources/service.go b/pkg/controller/jenkins/configuration/base/resources/service.go index 032d8af2..1ff6d342 100644 --- a/pkg/controller/jenkins/configuration/base/resources/service.go +++ b/pkg/controller/jenkins/configuration/base/resources/service.go @@ -32,16 +32,28 @@ func UpdateService(actual corev1.Service, config v1alpha2.Service) corev1.Servic return actual } -// GetJenkinsServiceName returns Kubernetes service name used for expose Jenkins HTTP and Slaves endpoint -func GetJenkinsServiceName(jenkins *v1alpha2.Jenkins, serviceType string) string { - return fmt.Sprintf("%s-%s-%s", constants.OperatorName, serviceType, jenkins.ObjectMeta.Name) +// GetJenkinsHTTPServiceName returns Kubernetes service name used for expose Jenkins HTTP endpoint +func GetJenkinsHTTPServiceName(jenkins *v1alpha2.Jenkins) string { + return fmt.Sprintf("%s-http-%s", constants.OperatorName, jenkins.ObjectMeta.Name) } -// GetJenkinsServiceFQDN returns Kubernetes service FQDN used for expose Jenkins HTTP and Slaves endpoint -func GetJenkinsServiceFQDN(jenkins *v1alpha2.Jenkins, serviceType string) string { +// GetJenkinsSlavesServiceName returns Kubernetes service name used for expose Jenkins slave endpoint +func GetJenkinsSlavesServiceName(jenkins *v1alpha2.Jenkins) string { + return fmt.Sprintf("%s-slave-%s", constants.OperatorName, jenkins.ObjectMeta.Name) +} + +// GetJenkinsHTTPServiceFQDN returns Kubernetes service FQDN used for expose Jenkins HTTP endpoint +func GetJenkinsHTTPServiceFQDN(jenkins *v1alpha2.Jenkins) string { clusterDomain := getClusterDomain() - return fmt.Sprintf("%s-%s-%s.%s.svc.%s", constants.OperatorName, serviceType, jenkins.ObjectMeta.Name, jenkins.ObjectMeta.Namespace, clusterDomain) + return fmt.Sprintf("%s-http-%s.%s.svc.%s", constants.OperatorName, jenkins.ObjectMeta.Name, jenkins.ObjectMeta.Namespace, clusterDomain) +} + +// GetJenkinsSlavesServiceFQDN returns Kubernetes service FQDN used for expose Jenkins slave endpoint +func GetJenkinsSlavesServiceFQDN(jenkins *v1alpha2.Jenkins) string { + clusterDomain := getClusterDomain() + + return fmt.Sprintf("%s-slave-%s.%s.svc.%s", constants.OperatorName, jenkins.ObjectMeta.Name, jenkins.ObjectMeta.Namespace, clusterDomain) } // GetClusterDomain returns Kubernetes cluster domain, default to "cluster.local" diff --git a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go index f059d087..f64ad2dc 100644 --- a/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go +++ b/pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go @@ -403,7 +403,7 @@ func agentDeployment(jenkins *v1alpha2.Jenkins, namespace string, agentName stri { Name: "JENKINS_TUNNEL", Value: fmt.Sprintf("%s:%d", - resources.GetJenkinsServiceFQDN(jenkins, "slave"), + resources.GetJenkinsSlavesServiceFQDN(jenkins), jenkins.Spec.SlaveService.Port), }, { @@ -417,7 +417,7 @@ func agentDeployment(jenkins *v1alpha2.Jenkins, namespace string, agentName stri { Name: "JENKINS_URL", Value: fmt.Sprintf("http://%s:%d", - resources.GetJenkinsServiceFQDN(jenkins, "http"), + resources.GetJenkinsHTTPServiceFQDN(jenkins), jenkins.Spec.Service.Port, ), }, diff --git a/test/e2e/jenkins.go b/test/e2e/jenkins.go index e14c6fe6..d9f83a5e 100644 --- a/test/e2e/jenkins.go +++ b/test/e2e/jenkins.go @@ -57,7 +57,7 @@ func createJenkinsAPIClient(jenkins *v1alpha2.Jenkins, hostname string, port int err := framework.Global.Client.Get(context.TODO(), types.NamespacedName{ Namespace: jenkins.Namespace, - Name: resources.GetJenkinsServiceName(jenkins, "http"), + Name: resources.GetJenkinsHTTPServiceName(jenkins), }, &service) if err != nil {