From 16b89bfffe3a583d8e56df9ea67e602f37698c84 Mon Sep 17 00:00:00 2001 From: Alejandro Garrido Mota Date: Fri, 16 Aug 2019 18:26:21 +0100 Subject: [PATCH] [stable/jenkins] Fix backups when deployment has custom name (#16279) * Set container name to "jenkins" because it is always called Jenkins, what does change is the Pod name not the Container name (check jenkins-master-deployment.yaml line 153) Signed-off-by: Alejandro Garrido Mota * Added myself as a maintainer Signed-off-by: Alejandro Garrido Mota --- stable/jenkins/Chart.yaml | 4 +++- stable/jenkins/OWNERS | 2 ++ stable/jenkins/templates/jenkins-backup-cronjob.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 44a226032c..e440e718a6 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 1.5.1 +version: 1.5.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 @@ -20,4 +20,6 @@ maintainers: email: maor.friedman@redhat.com - name: torstenwalter email: mail@torstenwalter.de +- name: mogaal + email: garridomota@gmail.com icon: https://wiki.jenkins-ci.org/download/attachments/2916393/logo.png diff --git a/stable/jenkins/OWNERS b/stable/jenkins/OWNERS index 054a3bd1fe..5e744808e7 100644 --- a/stable/jenkins/OWNERS +++ b/stable/jenkins/OWNERS @@ -3,8 +3,10 @@ approvers: - viglesiasce - maorfr - torstenwalter +- mogaal reviewers: - lachie83 - viglesiasce - maorfr - torstenwalter +- mogaal diff --git a/stable/jenkins/templates/jenkins-backup-cronjob.yaml b/stable/jenkins/templates/jenkins-backup-cronjob.yaml index 3d2a7790c2..150e9daabd 100644 --- a/stable/jenkins/templates/jenkins-backup-cronjob.yaml +++ b/stable/jenkins/templates/jenkins-backup-cronjob.yaml @@ -34,7 +34,7 @@ spec: - -l - app.kubernetes.io/instance={{ .Release.Name }} - --container - - {{ template "jenkins.fullname" . }} + - jenkins - --path - /var/jenkins_home - --dst