Re-add value for Ingress API Version (#12753)

It was removed in #11960, but since Kubernetes 1.14, Ingresses live under networking.k8s.io.

Signed-off-by: Tom Wieczorek <t.wieczorek@yieldlab.de>
This commit is contained in:
Tom Wieczorek
2019-04-02 08:06:36 -07:00
committed by Kubernetes Prow Robot
parent 8dbc12c6ab
commit ecb7791b52
5 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
name: jenkins
home: https://jenkins.io/
version: 0.36.3
version: 0.36.4
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
+1
View File
@@ -74,6 +74,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
| `Master.ExtraPorts` | Open extra ports, for other uses | Not set |
| `Master.OverwriteConfig` | Replace init scripts and config w/ ConfigMap on boot | `false` |
| `Master.ingress.enabled` | Enables ingress | `false` |
| `Master.ingress.apiVersion` | Ingress API version | `extensions/v1beta1` |
| `Master.ingress.hostName` | Ingress host name | Not set |
| `Master.ingress.annotations` | Ingress annotations | `{}` |
| `Master.ingress.labels` | Ingress labels | `{}` |
+1 -1
View File
@@ -3,7 +3,7 @@
Master.HostName --> Master.ingress.hostName
New value - Master.ingress.enabled
Master.Ingress.ApiVersion - Deprecated
Master.Ingress.ApiVersion --> Master.ingress.apiVersion
Master.Ingress.Annotations --> Master.ingress.annotations
Master.Ingress.Labels --> Master.ingress.labels
Master.Ingress.Path --> Master.ingress.path
@@ -1,5 +1,5 @@
{{- if .Values.Master.ingress.enabled }}
apiVersion: extensions/v1beta1
apiVersion: {{ .Values.Master.ingress.apiVersion }}
kind: Ingress
metadata:
{{- if .Values.Master.ingress.labels }}
+2
View File
@@ -254,6 +254,8 @@ Master:
ingress:
enabled: false
# For Kubernetes v1.14+, use 'networking.k8s.io/v1'
apiVersion: extensions/v1beta1
labels: {}
annotations: {}
# kubernetes.io/ingress.class: nginx