From 9402a760e57b24d503d8af75b35be2e91faa9f7a Mon Sep 17 00:00:00 2001 From: Usman Date: Tue, 14 Jan 2020 16:55:24 +0100 Subject: [PATCH] [stable/sonarqube] upgrades LTS to latest patch (#19836) * [stable/sonarqube] upgrades LTS to latest patch Also updates ingress apiVersion, adding support for later k8s versions. (Modernizes documentaiton accordingly.) Signed-off-by: Usman Akeju * [stable/sonarqube] support also k8s <= v1.13 Signed-off-by: Usman Akeju --- REVIEW_GUIDELINES.md | 4 ++++ stable/sonarqube/Chart.yaml | 6 +++--- stable/sonarqube/README.md | 2 +- stable/sonarqube/templates/ingress.yaml | 4 ++++ stable/sonarqube/values.yaml | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/REVIEW_GUIDELINES.md b/REVIEW_GUIDELINES.md index 87ac688b75..6b2479ec15 100644 --- a/REVIEW_GUIDELINES.md +++ b/REVIEW_GUIDELINES.md @@ -279,7 +279,11 @@ ingress: ```yaml {{- if .Values.ingress.enabled -}} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} +apiVersion: networking.k8s.io/v1beta1 +{{ else }} apiVersion: extensions/v1beta1 +{{ end -}} kind: Ingress metadata: name: {{ include "myapp.fullname" }} diff --git a/stable/sonarqube/Chart.yaml b/stable/sonarqube/Chart.yaml index 318e68ccbe..702d7726c9 100644 --- a/stable/sonarqube/Chart.yaml +++ b/stable/sonarqube/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: sonarqube -description: Sonarqube is an open sourced code quality scanning tool -version: 3.2.8 -appVersion: 7.9.1 +description: SonarQube is an open sourced code quality scanning tool +version: 3.3.0 +appVersion: 7.9.2 keywords: - coverage - security diff --git a/stable/sonarqube/README.md b/stable/sonarqube/README.md index 75972cf5dc..c369f00548 100644 --- a/stable/sonarqube/README.md +++ b/stable/sonarqube/README.md @@ -42,7 +42,7 @@ The following table lists the configurable parameters of the Sonarqube chart and | `replicaCount` | Number of replicas deployed | `1` | | `deploymentStrategy` | Deployment strategy | `{}` | | `image.repository` | image repository | `sonarqube` | -| `image.tag` | `sonarqube` image tag. | `7.9.1-community` | +| `image.tag` | `sonarqube` image tag. | `7.9.2-community` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `image.pullSecret` | imagePullSecret to use for private repository | | | `command` | command to run in the container | `nil` (need to be set prior to 6.7.6, and 7.4) | diff --git a/stable/sonarqube/templates/ingress.yaml b/stable/sonarqube/templates/ingress.yaml index 06dbd83a8d..c8678aa45c 100644 --- a/stable/sonarqube/templates/ingress.yaml +++ b/stable/sonarqube/templates/ingress.yaml @@ -1,7 +1,11 @@ {{- if .Values.ingress.enabled -}} {{- $serviceName := include "sonarqube.fullname" . -}} {{- $servicePort := .Values.service.externalPort -}} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} +apiVersion: networking.k8s.io/v1beta1 +{{ else }} apiVersion: extensions/v1beta1 +{{ end -}} kind: Ingress metadata: name: {{ template "sonarqube.fullname" . }} diff --git a/stable/sonarqube/values.yaml b/stable/sonarqube/values.yaml index 429e5e4e9a..40330e07b8 100644 --- a/stable/sonarqube/values.yaml +++ b/stable/sonarqube/values.yaml @@ -8,7 +8,7 @@ deploymentStrategy: {} image: repository: sonarqube - tag: 7.9.1-community + tag: 7.9.2-community # If using a private repository, the name of the imagePullSecret to use # pullSecret: my-repo-secret