From 5baee01ac59a2e804835eef0fe5e790086b57a03 Mon Sep 17 00:00:00 2001 From: Seshu Kumar Alluvada Date: Tue, 24 Mar 2020 09:42:25 -0400 Subject: [PATCH] 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 {