Backups scheduling (#98)

* Add nodeSelector for backups from master setup Signed-off-by: Manuel Morejon <[email protected]> * Update changelog file Signed-off-by: Manuel Morejon <[email protected]>
jenkinsci · Oct 19, 2020 · 46a857e · 46a857e
1 parent 2f57e6f
commit 46a857e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
@@ -10,6 +10,11 @@ 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.13.2
+
+Add nodeSelector in the backup pod
+Fix tolerations in the backup pod
+
 ## 2.13.1
 
 Update list of maintainers

diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 2.13.1
+version: 2.13.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

diff --git a/charts/jenkins/templates/jenkins-backup-cronjob.yaml b/charts/jenkins/templates/jenkins-backup-cronjob.yaml
@@ -129,8 +129,12 @@ spec:
                       operator: In
                       values:
                       - {{ .Release.Name }}
-      {{- with .Values.tolerations }}
+      {{- with .Values.master.tolerations }}
           tolerations:
           {{- toYaml . | nindent 10 }}
       {{- end }}
+      {{- with .Values.master.nodeSelector }}
+          nodeSelector:
+          {{- toYaml . | nindent 12 }}
+      {{- end }}
 {{- end }}