public_git
/
kubernetes-operator
mirror of https://github.com/jenkinsci/kubernetes-operator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "refactor service name and service fqdn fuctions" 

This reverts commit d71d105986.
This commit is contained in:
Seshu Kumar Alluvada 2020-03-24 09:42:25 -04:00
parent dd2560e2b2
commit 5baee01ac5
5 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/jenkins/configuration/base/reconcile.go
View File

@ -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 {

4
pkg/controller/jenkins/configuration/base/resources/base_configuration_configmap.go
View File

@ -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,

24
pkg/controller/jenkins/configuration/base/resources/service.go
View File

@ -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"

4
pkg/controller/jenkins/configuration/user/seedjobs/seedjobs.go
View File

@ -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,
),
},

2
test/e2e/jenkins.go
View File

@ -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 {