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

Cosmetic changes

This commit is contained in:
Jakub Al-Khalili 2019-12-19 13:24:51 +01:00 committed by Paweł Prażak
parent 80b0839e5d
commit 9b4a04c32f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/jenkins/jenkins_controller.go
View File

@ -445,18 +445,16 @@ func (r *ReconcileJenkins) setDefaults(jenkins *v1alpha2.Jenkins, logger logr.Lo
if reflect.DeepEqual(jenkins.Spec.Service, v1alpha2.Service{}) { if reflect.DeepEqual(jenkins.Spec.Service, v1alpha2.Service{}) {
logger.Info("Setting default Jenkins master service") logger.Info("Setting default Jenkins master service")
changed = true changed = true
var serviceType = corev1.ServiceTypeClusterIP
if r.jenkinsAPIConnectionSettings.UseNodePort { if r.jenkinsAPIConnectionSettings.UseNodePort {
jenkins.Spec.Service = v1alpha2.Service{ serviceType = corev1.ServiceTypeNodePort
Type: corev1.ServiceTypeNodePort,
Port: constants.DefaultHTTPPortInt32,
} }
} else {
jenkins.Spec.Service = v1alpha2.Service{ jenkins.Spec.Service = v1alpha2.Service{
Type: corev1.ServiceTypeClusterIP, Type: serviceType,
Port: constants.DefaultHTTPPortInt32, Port: constants.DefaultHTTPPortInt32,
} }
} }
}
if reflect.DeepEqual(jenkins.Spec.SlaveService, v1alpha2.Service{}) { if reflect.DeepEqual(jenkins.Spec.SlaveService, v1alpha2.Service{}) {
logger.Info("Setting default Jenkins slave service") logger.Info("Setting default Jenkins slave service")
changed = true changed = true