[stable/jenkins] DNS Zone customization (#14775)

* [stable/jenkins] DNS Zone customization

Signed-off-by: Tomer Leibovich <tomer.leibovich@gmail.com>

* Removed comment

Signed-off-by: Tomer Leibovich <tomer.leibovich@gmail.com>
This commit is contained in:
Tomer Leibovich
2019-06-13 06:22:14 -07:00
committed by Kubernetes Prow Robot
parent bf4c6be104
commit da29100738
4 changed files with 7 additions and 2 deletions
+1 -1
View File
@@ -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
+1
View File
@@ -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` |
+1 -1
View File
@@ -92,7 +92,7 @@ data:
<envVars>
<org.csanchez.jenkins.plugins.kubernetes.ContainerEnvVar>
<key>JENKINS_URL</key>
<value>http://{{ template "jenkins.fullname" . }}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.master.servicePort}}{{ default "" .Values.master.jenkinsUriPrefix }}</value>
<value>http://{{ template "jenkins.fullname" . }}.{{.Release.Namespace}}.svc.{{.Values.clusterZone}}:{{.Values.master.servicePort}}{{ default "" .Values.master.jenkinsUriPrefix }}</value>
</org.csanchez.jenkins.plugins.kubernetes.ContainerEnvVar>
</envVars>
</org.csanchez.jenkins.plugins.kubernetes.ContainerTemplate>
+4
View File
@@ -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"