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

Fix nodePort issue, remove --namespace argument from Makefile

This commit is contained in:
Jakub Al-Khalili 2019-12-19 11:38:01 +01:00 committed by Paweł Prażak
parent 7ded21993b
commit 80b0839e5d
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -66,7 +66,7 @@ PACKAGES_FOR_UNIT_TESTS = $(shell go list -f '{{.ImportPath}}/' ./... | grep -v
E2E_TEST_SELECTOR ?= .* E2E_TEST_SELECTOR ?= .*
JENKINS_API_HOSTNAME := $(shell $(JENKINS_API_HOSTNAME_COMMAND)) JENKINS_API_HOSTNAME := $(shell $(JENKINS_API_HOSTNAME_COMMAND))
OPERATOR_ARGS ?= --jenkins-api-hostname=$(JENKINS_API_HOSTNAME) --jenkins-api-port=$(JENKINS_API_PORT) --jenkins-api-use-nodeport=$(JENKINS_API_USE_NODEPORT) --namespace=$(NAMESPACE) $(OPERATOR_EXTRA_ARGS) OPERATOR_ARGS ?= --jenkins-api-hostname=$(JENKINS_API_HOSTNAME) --jenkins-api-port=$(JENKINS_API_PORT) --jenkins-api-use-nodeport=$(JENKINS_API_USE_NODEPORT) $(OPERATOR_EXTRA_ARGS)
.DEFAULT_GOAL := help .DEFAULT_GOAL := help

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

@ -445,11 +445,18 @@ 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
if r.jenkinsAPIConnectionSettings.UseNodePort {
jenkins.Spec.Service = v1alpha2.Service{
Type: corev1.ServiceTypeNodePort,
Port: constants.DefaultHTTPPortInt32,
}
} else {
jenkins.Spec.Service = v1alpha2.Service{ jenkins.Spec.Service = v1alpha2.Service{
Type: corev1.ServiceTypeClusterIP, Type: corev1.ServiceTypeClusterIP,
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