Skip to content

Commit bee37b0

Browse files
add jenkinsUriPrefix to casc reload url (helm#21561)
Signed-off-by: Marc Trölitzsch <[email protected]>
1 parent dc4e53a commit bee37b0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

stable/jenkins/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
name: jenkins
33
home: https://jenkins.io/
4-
version: 1.9.22
4+
version: 1.9.23
55
appVersion: lts
66
description: Open source continuous integration server. It supports multiple SCM tools
77
including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based

stable/jenkins/templates/jenkins-master-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ spec:
162162
imagePullPolicy: "{{ .Values.master.imagePullPolicy }}"
163163
{{- if .Values.master.httpsKeyStore.enable }}
164164
{{- $httpsJKSFilePath := printf "%s/%s" .Values.master.httpsKeyStore.path .Values.master.httpsKeyStore.fileName -}}
165-
{{- if .Values.master.useSecurity }}
165+
{{- if .Values.master.useSecurity }}
166166
args: [ "--argumentsRealm.passwd.$(ADMIN_USER)=$(ADMIN_PASSWORD)", "--argumentsRealm.roles.$(ADMIN_USER)=admin", "--httpPort={{.Values.master.httpsKeyStore.httpPort}}", "--httpsPort={{.Values.master.targetPort}}", '--httpsKeyStore={{ $httpsJKSFilePath }}', "--httpsKeyStorePassword=$(JENKINS_HTTPS_KEYSTORE_PASSWORD)" ]
167167
{{- else }}
168168
args: [ "--httpPort={{.Values.master.httpsKeyStore.httpPort}}", "--httpsPort={{.Values.master.targetPort}}", '--httpsKeyStore={{ $httpsJKSFilePath | quote }}', "--httpsKeyStorePassword=$(JENKINS_HTTPS_KEYSTORE_PASSWORD)" ]
@@ -320,7 +320,7 @@ spec:
320320
- name: NAMESPACE
321321
value: "{{ .Values.master.sidecars.configAutoReload.searchNamespace | default .Release.Namespace }}"
322322
- name: REQ_URL
323-
value: "http://localhost:8080/reload-configuration-as-code/?casc-reload-token=$(POD_NAME)"
323+
value: "http://localhost:8080{{- .Values.master.jenkinsUriPrefix -}}/reload-configuration-as-code/?casc-reload-token=$(POD_NAME)"
324324
- name: REQ_METHOD
325325
value: "POST"
326326
resources:
@@ -390,7 +390,7 @@ spec:
390390

391391
{{- if .Values.master.httpsKeyStore.enable }}
392392
- name: jenkins-https-keystore
393-
secret:
393+
secret:
394394
secretName: {{ if .Values.master.httpsKeyStore.jenkinsHttpsJksSecretName }} {{ .Values.master.httpsKeyStore.jenkinsHttpsJksSecretName }} {{ else }} {{ template "jenkins.fullname" . }}-https-jks {{ end }}
395395
items:
396396
- key: jenkins-jks-file

0 commit comments

Comments
 (0)