Apply namespaceOverride when loading JCasC (#238)

Signed-off-by: James Fogarty <jayfo@users.noreply.github.com>
jenkinsci · Jan 30, 2021 · a9c1a03 · a9c1a03
1 parent 0f35893
commit a9c1a03
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
@@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 The change log until v1.5.7 was auto-generated based on git commits.
 Those entries include a reference to the git commit to be able to get more details.
 
+## 3.1.5
+
+Fix `namespaceOverride` not applied when loading JCasC
+
 ## 3.1.4
 
 Update Git plugin version to v4.5.2

diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: jenkins
 home: https://jenkins.io/
-version: 3.1.4
+version: 3.1.5
 appVersion: 2.263.3
 description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project.
 sources:

diff --git a/charts/jenkins/templates/jenkins-controller-statefulset.yaml b/charts/jenkins/templates/jenkins-controller-statefulset.yaml
@@ -244,7 +244,7 @@ spec:
             - name: FOLDER
               value: "{{ .Values.controller.sidecars.configAutoReload.folder }}"
             - name: NAMESPACE
-              value: "{{ .Values.controller.sidecars.configAutoReload.searchNamespace | default .Release.Namespace }}"
+              value: '{{ .Values.controller.sidecars.configAutoReload.searchNamespace | default (include "jenkins.namespace" .) }}'
             - name: REQ_URL
               value: "http://localhost:{{- .Values.controller.targetPort -}}{{- .Values.controller.jenkinsUriPrefix -}}/reload-configuration-as-code/?casc-reload-token=$(POD_NAME)"
             - name: REQ_METHOD