From ecb7791b5288218e8800be235fb9ae9de8c0bbeb Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Tue, 2 Apr 2019 17:06:36 +0200 Subject: [PATCH] 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 --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/README.md | 1 + stable/jenkins/templates/NOTES.txt | 2 +- stable/jenkins/templates/jenkins-master-ingress.yaml | 2 +- stable/jenkins/values.yaml | 2 ++ 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 34b3e281cb..fd3916f02a 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -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 diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md index 49664bf60f..a0d5e0cd84 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -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 | `{}` | diff --git a/stable/jenkins/templates/NOTES.txt b/stable/jenkins/templates/NOTES.txt index 2f7bde97b8..1ce93fbcf8 100644 --- a/stable/jenkins/templates/NOTES.txt +++ b/stable/jenkins/templates/NOTES.txt @@ -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 diff --git a/stable/jenkins/templates/jenkins-master-ingress.yaml b/stable/jenkins/templates/jenkins-master-ingress.yaml index 9fde5f2140..34d7f7283b 100644 --- a/stable/jenkins/templates/jenkins-master-ingress.yaml +++ b/stable/jenkins/templates/jenkins-master-ingress.yaml @@ -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 }} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index f54f9ef00e..13b211668b 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -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