rebased jenkinsci#801

Author: steigr

api/v1alpha2/jenkins_types.go

@@ -463,6 +463,10 @@ type Service struct {
 	// This field will be ignored if the cloud-provider does not support the feature.
 	// +optional
 	LoadBalancerIP string `json:"loadBalancerIP,omitempty"`
+
+	// The port name which is provided to the service.
+	// More info: https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service
+	Portname string `json:"Portname,omitempty"`
 }
 
 // JenkinsStatus defines the observed state of Jenkins

chart/jenkins-operator/crds/jenkins-crd.yaml

@@ -3253,6 +3253,9 @@ spec:
                       info: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies'
                     format: int32
                     type: integer
+                  portName:
+                    description: 'The port name which is provided to the service. More info: https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service'
+                    type: string
                   type:
                     description: 'Type determines how the Service is exposed. Defaults
                       to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort,

chart/jenkins-operator/templates/operator.yaml

@@ -26,7 +26,7 @@ spec:
           image: {{ .Values.operator.image }}
           imagePullPolicy: {{ .Values.operator.imagePullPolicy }}
           ports:
-            - name: http
+            - name: {{ .Values.jenkins.service.portName }}
               containerPort: 80
               protocol: TCP
           command:

chart/jenkins-operator/values.yaml

@@ -181,6 +181,9 @@ jenkins:
     runAsUser: 1000
     fsGroup: 1000
 
+  service:
+    portName: 'http'
+
   # http Jenkins service
   # See https://jenkinsci.github.io/kubernetes-operator/docs/getting-started/latest/schema/#github.com/jenkinsci/kubernetes-operator/pkg/apis/jenkins/v1alpha2.Service for details
   #service:

config/crd/bases/jenkins.io_jenkins.yaml

@@ -3918,6 +3918,9 @@ spec:
                       More info: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies
                     format: int32
                     type: integer
+                  portName:
+                    description: 'The port name which is provided to the service. More info: https://kubernetes.io/docs/concepts/services-networking/service/#defining-a-service'
+                    type: string
                   type:
                     description: |-
                       Type determines how the Service is exposed. Defaults to ClusterIP. Valid

pkg/configuration/base/resources/service.go

@@ -31,6 +31,11 @@ func UpdateService(actual corev1.Service, config v1alpha2.Service, targetPort in
 	}
 	actual.Spec.Ports[0].Port = config.Port
 	actual.Spec.Ports[0].TargetPort = intstr.IntOrString{IntVal: targetPort, Type: intstr.Int}
+	if config.Portname == "" {
+		actual.Spec.Ports[0].Name = "http"
+	} else {
+		actual.Spec.Ports[0].Name = config.Portname
+	}
 	if config.NodePort != 0 {
 		actual.Spec.Ports[0].NodePort = config.NodePort
 	}