diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 347ed4d649..5f28fa72b4 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 0.14.0 +version: 0.14.1 appVersion: 2.73 description: Open source continuous integration server. It supports multiple SCM tools including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based diff --git a/stable/jenkins/templates/jenkins-agent-svc.yaml b/stable/jenkins/templates/jenkins-agent-svc.yaml index 03d7776ebf..a9ad63ded4 100644 --- a/stable/jenkins/templates/jenkins-agent-svc.yaml +++ b/stable/jenkins/templates/jenkins-agent-svc.yaml @@ -6,6 +6,10 @@ metadata: app: {{ template "jenkins.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" +{{- if .Values.Master.SlaveListenerServiceAnnotations }} + annotations: +{{ toYaml .Values.Master.SlaveListenerServiceAnnotations | indent 4 }} +{{- end }} spec: ports: - port: {{ .Values.Master.SlaveListenerPort }} @@ -13,4 +17,4 @@ spec: name: slavelistener selector: component: "{{ .Release.Name }}-{{ .Values.Master.Component }}" - type: ClusterIP + type: {{ .Values.Master.SlaveListenerServiceType }} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 048a8cc324..22987e631b 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -43,6 +43,10 @@ Master: HealthProbes: true HealthProbesTimeout: 60 SlaveListenerPort: 50000 + # Kubernetes service type for the JNLP slave service + # SETTING THIS TO "LoadBalancer" IS A HUGE SECURITY RISK: https://github.com/kubernetes/charts/issues/1341 + SlaveListenerServiceType: ClusterIP + SlaveListenerServiceAnnotations: {} LoadBalancerSourceRanges: - 0.0.0.0/0 # Optionally assign a known public LB IP