From 91867d15700bfbdb66dbd6d3e1a68a71e997ca60 Mon Sep 17 00:00:00 2001 From: Torsten Walter Date: Wed, 22 Apr 2020 08:39:51 +0200 Subject: [PATCH] [stable/jenkins] revert runAsUser comparison (#22054) * [stable/jenkins] revert runAsUser comparison Signed-off-by: Torsten Walter * [stable/jenkins] convert runAsUser to int Signed-off-by: Torsten Walter --- stable/jenkins/CHANGELOG.md | 4 ++++ stable/jenkins/Chart.yaml | 2 +- stable/jenkins/ci/other-values.yaml | 2 ++ stable/jenkins/templates/jenkins-master-deployment.yaml | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md index 7159453901..5f75e5a4b6 100644 --- a/stable/jenkins/CHANGELOG.md +++ b/stable/jenkins/CHANGELOG.md @@ -5,6 +5,10 @@ numbering uses [semantic versioning](http://semver.org). NOTE: The change log until version 1.5.7 is auto generated based on git commits. Those include a reference to the git commit to be able to get more details. +## 1.16.2 + +Reverts 1.16.1 as it introduced an error #22047 + ## 1.16.1 Fixed a bug with master.runAsUser variable due to use wrong type for comparison. diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index e6f7eb5d96..833dad0a15 100644 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 1.16.1 +version: 1.16.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/stable/jenkins/ci/other-values.yaml b/stable/jenkins/ci/other-values.yaml index edba8578ae..5524880a7b 100644 --- a/stable/jenkins/ci/other-values.yaml +++ b/stable/jenkins/ci/other-values.yaml @@ -1,5 +1,7 @@ master: overwritePluginsFromImage: false + runAsUser: 0 + fsGroup: 1000 agent: resources: limits: diff --git a/stable/jenkins/templates/jenkins-master-deployment.yaml b/stable/jenkins/templates/jenkins-master-deployment.yaml index 3dc9cf63c0..5e5ce74ebc 100644 --- a/stable/jenkins/templates/jenkins-master-deployment.yaml +++ b/stable/jenkins/templates/jenkins-master-deployment.yaml @@ -73,7 +73,7 @@ spec: securityContext: runAsUser: {{ default 0 .Values.master.runAsUser }} {{- if and (.Values.master.runAsUser) (.Values.master.fsGroup) }} -{{- if not (eq .Values.master.runAsUser 0) }} +{{- if not (eq (int .Values.master.runAsUser) 0) }} fsGroup: {{ .Values.master.fsGroup }} {{- end }} {{- end }}