[stable/jenkins] Allow NetworkPolicy.ApiVersion and Master.Ingress.Ap…

…iVersion to Differ (#5103)
helm · Apr 23, 2018 · 78ee4ba · 78ee4ba
1 parent 0fe90b5
commit 78ee4ba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
@@ -1,6 +1,6 @@
 name: jenkins
 home: https://jenkins.io/
-version: 0.15.0
+version: 0.15.1
 appVersion: 2.107
 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/jenkins-master-ingress.yaml b/stable/jenkins/templates/jenkins-master-ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.Master.HostName }}
-apiVersion: {{ .Values.NetworkPolicy.ApiVersion }}
+apiVersion: {{ .Values.Master.Ingress.ApiVersion }}
 kind: Ingress
 metadata:
 {{- if .Values.Master.Ingress.Annotations }}

diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml
@@ -108,6 +108,7 @@ Master:
   Tolerations: {}
 
   Ingress:
+    ApiVersion: extensions/v1beta1
     Annotations:
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"