[helm/jenkins] Support multiple Jenkins instances in same namespace (#12748)

* use release name as part of CasC confimap label

Signed-off-by: Torsten Walter <mail@torstenwalter.de>

* rename jcasc_config.yaml to jcasc-config.yaml

All other ressources use dashes as separators instead of underscores.
Renamed the file to harmonize file names.

Signed-off-by: Torsten Walter <mail@torstenwalter.de>

* prefix config map with release name

Having the release name as prefix istead suffix makes it easier to
sort config maps for multiple releases e.g.:

```
$ kubectl get configmap
NAME                                      DATA   AGE
jenkins1                                  6      43m
jenkins1-jenkins-config-welcome-message   1      43m
jenkins1-tests                            1      43m
jenkins2                                  6      34m
jenkins2-jenkins-config-welcome-message   1      34m
jenkins2-tests                            1      34m
```

Signed-off-by: Torsten Walter <mail@torstenwalter.de>

* bumped char version

Signed-off-by: Torsten Walter <mail@torstenwalter.de>
This commit is contained in:
Torsten Walter
2019-04-05 02:57:18 -07:00
committed by Kubernetes Prow Robot
parent d43938f421
commit 32ff2f3438
4 changed files with 4 additions and 5 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
name: jenkins
home: https://jenkins.io/
version: 0.36.5
version: 0.37.0
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
@@ -5,8 +5,9 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: jenkins-config-{{ template "jenkins.fullname" $root }}-{{ $key }}
name: {{ template "jenkins.fullname" $root }}-jenkins-config-{{ $key }}
labels:
{{ template "jenkins.fullname" $root }}-jenkins-config: "true"
{{ $.Values.Master.Sidecars.configAutoReload.label | default "jenkins_config" }}: "true"
release: {{ $root.Release.Name }}
chart: "{{ $root.Chart.Name }}-{{ $root.Chart.Version }}"
@@ -272,7 +272,7 @@ spec:
- name: JENKINSRELOADCONFIG
value: "true"
- name: LABEL
value: "{{ .Values.Master.Sidecars.configAutoReload.label }}"
value: "{{ template "jenkins.fullname" . }}-jenkins-config"
- name: FOLDER
value: "{{ .Values.Master.Sidecars.configAutoReload.folder }}"
- name: NAMESPACE
-2
View File
@@ -205,8 +205,6 @@ Master:
# accessible via SSH from outside of the pod. Note if you use non-root pod privileges (RunAsUser & FsGroup),
# this must be > 1024:
sshTcpPort: 1044
# label that the configmaps with dashboards are marked with:
label: jenkins_config
# folder in the pod that should hold the collected dashboards:
folder: /var/jenkins_home/casc_configs
# If specified, the sidecar will search for dashboard config-maps inside this namespace.