diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 778e47c949..4963b074e7 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 1.2.1 +version: 1.2.2 appVersion: lts 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/README.md b/stable/jenkins/README.md index d63b167beb..9f8584e254 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -59,6 +59,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | Parameter | Description | Default | | --------------------------------- | ------------------------------------ | ----------------------------------------- | | `checkDeprecation` | Checks for deprecated values used | `true` | +| `clusterZone` | Override the cluster name for FQDN resolving | `cluster.local` | | `nameOverride` | Override the resource name prefix | `jenkins` | | `fullnameOverride` | Override the full resource names | `jenkins-{release-name}` (or `jenkins` if release-name is `jenkins`) | | `master.componentName` | Jenkins master name | `jenkins-master` | diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml index a85a813c9f..9a820f5f6c 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -92,7 +92,7 @@ data: JENKINS_URL - http://{{ template "jenkins.fullname" . }}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.master.servicePort}}{{ default "" .Values.master.jenkinsUriPrefix }} + http://{{ template "jenkins.fullname" . }}.{{.Release.Namespace}}.svc.{{.Values.clusterZone}}:{{.Values.master.servicePort}}{{ default "" .Values.master.jenkinsUriPrefix }} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index b78d6e762c..e659c44cee 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -8,6 +8,10 @@ # nameOverride: # fullnameOverride: +# For FQDN resolving of the master service. Change this value to match your existing configuration. +# ref: https://github.com/kubernetes/dns/blob/master/docs/specification.md +clusterZone: "cluster.local" + master: # Used for label app.kubernetes.io/component componentName: "jenkins-master"