From c7bdd3cf63c22a4ce7fa9b53e7a6ef17e98b950d Mon Sep 17 00:00:00 2001 From: Kfir Date: Tue, 29 Sep 2020 23:40:00 +0300 Subject: [PATCH 1/3] Target port taken from values.yaml Signed-off-by: Kfir --- charts/jenkins/templates/jenkins-master-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/jenkins/templates/jenkins-master-deployment.yaml b/charts/jenkins/templates/jenkins-master-deployment.yaml index 77fba46cf..29cf28c0e 100644 --- a/charts/jenkins/templates/jenkins-master-deployment.yaml +++ b/charts/jenkins/templates/jenkins-master-deployment.yaml @@ -326,7 +326,7 @@ spec: - name: NAMESPACE value: "{{ .Values.master.sidecars.configAutoReload.searchNamespace | default .Release.Namespace }}" - name: REQ_URL - value: "http://localhost:8080{{- .Values.master.jenkinsUriPrefix -}}/reload-configuration-as-code/?casc-reload-token=$(POD_NAME)" + value: "http://localhost:{{- .Values.master.targetPort -}}{{- .Values.master.jenkinsUriPrefix -}}/reload-configuration-as-code/?casc-reload-token=$(POD_NAME)" - name: REQ_METHOD value: "POST" - name: REQ_RETRY_CONNECT From e6568a9e0cfa6c07ad00054eef36bcf720de9ad7 Mon Sep 17 00:00:00 2001 From: Kfir Date: Thu, 1 Oct 2020 02:31:31 +0300 Subject: [PATCH 2/3] Bumb chart version 2.7.2 Signed-off-by: Kfir --- charts/jenkins/CHANGELOG.md | 4 ++++ charts/jenkins/Chart.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md index f01381eac..cc5d6a1eb 100644 --- a/charts/jenkins/CHANGELOG.md +++ b/charts/jenkins/CHANGELOG.md @@ -10,6 +10,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. +## 2.7.2 + +Target port of container `jenkins-sc-config` get the value from values.yaml + ## 2.7.0 Add a secondary ingress template for those who want a second ingress with different labels or annotations or whatever else. diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml index 847d27961..c6e71a870 100644 --- a/charts/jenkins/Chart.yaml +++ b/charts/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 2.7.1 +version: 2.7.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 From 6d80bc2078603e1fa1c86c0be164632e39b4e4ad Mon Sep 17 00:00:00 2001 From: Kfir Date: Thu, 1 Oct 2020 02:36:04 +0300 Subject: [PATCH 3/3] Trailing spaces set to 0 in CHANGELOG.md Signed-off-by: Kfir --- charts/jenkins/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md index cc5d6a1eb..e03d72b80 100644 --- a/charts/jenkins/CHANGELOG.md +++ b/charts/jenkins/CHANGELOG.md @@ -12,7 +12,7 @@ The change log until v1.5.7 was auto-generated based on git commits. Those entri ## 2.7.2 -Target port of container `jenkins-sc-config` get the value from values.yaml +Target port of container `jenkins-sc-config` taken the value from values.yaml. ## 2.7.0