From 266f9d8392737bc2a12bcb4e3967c9866fec912f Mon Sep 17 00:00:00 2001 From: Andrew Johnstone Date: Fri, 4 Jan 2019 21:33:41 +0000 Subject: [PATCH] * fixes #10267 when executed with helm template - otherwise produces an invalid template. (#10403) * bump jenkins chart version to 0.26.1 Signed-off-by: Andrew Johnstone --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/templates/rbac.yaml | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 5071ded3a1..7de6ca05c9 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 0.26.0 +version: 0.26.1 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/templates/rbac.yaml b/stable/jenkins/templates/rbac.yaml index 3f8895ccaf..0b89790792 100644 --- a/stable/jenkins/templates/rbac.yaml +++ b/stable/jenkins/templates/rbac.yaml @@ -1,9 +1,11 @@ {{ if .Values.rbac.install }} {{- $serviceName := include "jenkins.fullname" . -}} -{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }} -apiVersion: rbac.authorization.k8s.io/v1 -{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1beta1" }} +{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1beta1" }} apiVersion: rbac.authorization.k8s.io/v1beta1 +{{- else if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1alpha1" }} +apiVersion: rbac.authorization.k8s.io/v1alpha1 +{{- else }} +apiVersion: rbac.authorization.k8s.io/v1 {{- end }} kind: {{ .Values.rbac.roleBindingKind }} metadata: