[stable/sonarqube] Fix mount of configMap (#10061)

* [stable/sonarqube] Fix mount of configMap

We do not override anymore the startup command, so we have to mount the
sonar.properties directly instead of copying from /tmp/

Signed-off-by: Guillaume Perrin <guillaume28.perrin@gmail.com>

* Update sonarqube version to 0.12.2

Signed-off-by: Guillaume Perrin <guillaume28.perrin@gmail.com>

* Remove mount of startup volume

Signed-off-by: Guillaume Perrin <guillaume28.perrin@gmail.com>
This commit is contained in:
Guillaume Perrin
2019-01-07 06:53:47 -08:00
committed by Kubernetes Prow Robot
parent cafa202501
commit 3524018e09
3 changed files with 6 additions and 34 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
name: sonarqube
description: Sonarqube is an open sourced code quality scanning tool
version: 0.12.1
version: 0.12.2
appVersion: 7.4
keywords:
- coverage
+5 -16
View File
@@ -113,15 +113,10 @@ spec:
periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
volumeMounts:
- mountPath: /opt/sonarqube/conf
name: sonarqube
subPath: conf
- mountPath: /tmp-script/
name: startup
{{- if .Values.sonarProperties }}
- name: config
mountPath: /tmp/conf/
{{- end}}
- mountPath: /opt/sonarqube/conf/
name: config
{{- end }}
- mountPath: /opt/sonarqube/data
name: sonarqube
subPath: data
@@ -145,7 +140,7 @@ spec:
{{ toYaml .Values.affinity | indent 8 }}
{{- end }}
volumes:
{{- if .Values.sonarProperties}}
{{- if .Values.sonarProperties }}
- name: config
configMap:
name: {{ template "sonarqube.fullname" . }}-config
@@ -165,13 +160,7 @@ spec:
defaultMode: 0755
items:
- key: copy_plugins.sh
path: copy_plugins.sh
- name: startup
configMap:
name: {{ template "sonarqube.fullname" . }}-startup
items:
- key: startup.sh
path: startup.sh
path: copy_plugins.sh
- name: sonarqube
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
@@ -1,17 +0,0 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ template "sonarqube.fullname" . }}-startup
labels:
app: {{ template "sonarqube.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
data:
startup.sh: |-
#! /bin/sh
if [ -e /tmp/conf/sonar.properties ]; then
cp /tmp/conf/sonar.properties /opt/sonarqube/conf/sonar.properties
fi
/opt/sonarqube/bin/run.sh