Merge pull request #11 from Oteemo/community-updates

Community updates for sonarqube and sonatype-nexus
Oteemo · Jan 27, 2020 · 629c93f · 629c93f
2 parents 69dad19 + 2233f2c
commit 629c93f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 12 deletions.
diff --git a/charts/sonarqube/Chart.yaml b/charts/sonarqube/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: sonarqube
 description: SonarQube is an open sourced code quality scanning tool
-version: 3.3.0
+version: 3.4.0
 appVersion: 7.9.2
 keywords:
   - coverage

diff --git a/charts/sonarqube/README.md b/charts/sonarqube/README.md
@@ -100,6 +100,7 @@ The following table lists the configurable parameters of the Sonarqube chart and
 | `hostAliases`                               | Aliases for IPs in /etc/hosts             | `[]`                                       |
 | `tolerations`                               | List of node taints to tolerate           | `[]`                                       |
 | `plugins.install`                           | List of plugins to install                | `[]`                                       |
+| `plugins.lib`                               | List of plugins to install to `lib/common`| `[]`                                       |
 | `plugins.resources`                         | Plugin Pod resource requests & limits     | `{}`                                       |
 | `plugins.initContainerImage`                | Change init container image               | `alpine:3.10.3`                            |
 | `plugins.initSysctlContainerImage`          | Change init sysctl container image        | `busybox:1.31`                             |

diff --git a/charts/sonarqube/templates/copy-plugins.yaml b/charts/sonarqube/templates/copy-plugins.yaml
@@ -15,14 +15,19 @@ data:
       {{- end }}
       for f in {{ .Values.sonarqubeFolder }}/extensions/plugins/tmp/*.jar
       do
-        file=${f##*/} && file=${file%-[0-9]*} 
+        file=${f##*/} && file=${file%-[0-9]*}
         for original in {{ .Values.sonarqubeFolder }}/extensions/plugins/*.jar
         do
-          originalfile=${original##*/} && originalfile=${originalfile%-[0-9]*} 
+          originalfile=${original##*/} && originalfile=${originalfile%-[0-9]*}
           if [ "$originalfile" = "$file" ]; then
             rm -f "$original"
           fi
         done
       done
       cp {{ .Values.sonarqubeFolder }}/extensions/plugins/tmp/*.jar {{ .Values.sonarqubeFolder }}/extensions/plugins/
+      {{- if .Values.plugins.lib }}
+      {{- range $index, $val := .Values.plugins.lib }}
+      cp -f {{ $.Values.sonarqubeFolder }}/extensions/plugins/{{ $val }} {{ $.Values.sonarqubeFolder }}/lib/common/
+      {{- end }}
+      {{- end }}
       {{ .Values.sonarqubeFolder }}/bin/run.sh
diff --git a/charts/sonarqube/templates/install-plugins.yaml b/charts/sonarqube/templates/install-plugins.yaml
@@ -11,7 +11,8 @@ data:
   install_plugins.sh: |-
     cd {{ .Values.sonarqubeFolder }}/extensions/plugins/tmp
     {{- if .Values.plugins.install }}
-      {{- range $index, $val := .Values.plugins.install }}
-        wget {{ $val }} --no-check-certificate
-      {{- end }}
+      {{ range $index, $val := .Values.plugins.install }}echo {{ $val | quote }} >> plugins.txt
+      {{ end }}
+      cat plugins.txt | xargs -n 1 -P 8 wget --no-check-certificate
+      rm plugins.txt
     {{- end }}
diff --git a/charts/sonarqube/values.yaml b/charts/sonarqube/values.yaml
@@ -143,6 +143,7 @@ persistence:
 #    - "https://github.com/SonarSource/sonar-ldap/releases/download/2.2-RC3/sonar-ldap-plugin-2.2.0.601.jar"
 plugins:
   install: []
+  lib: []
 
   # initContainerImage: alpine:3.10.3
   # deleteDefaultPlugins: true

diff --git a/charts/sonatype-nexus/Chart.yaml b/charts/sonatype-nexus/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: sonatype-nexus
-version: 1.21.5
+version: 1.21.6
 appVersion: 3.20.1-01
 description: Sonatype Nexus is an open source repository manager
 keywords:

diff --git a/charts/sonatype-nexus/templates/ingress.yaml b/charts/sonatype-nexus/templates/ingress.yaml
@@ -11,8 +11,7 @@ metadata:
     {{- end }}
 spec:
   rules:
-{{- if .Values.nexusProxy.enabled -}}  
-  {{- if .Values.nexusProxy.env.nexusHttpHost }}
+{{- if .Values.nexusProxy.env.nexusHttpHost }}
     - host: {{ .Values.nexusProxy.env.nexusHttpHost }}
       http:
         paths:
@@ -22,9 +21,14 @@ spec:
             {{- else }}
               serviceName: {{ template "nexus.fullname" . }}
             {{- end }}
+{{- if .Values.nexusProxy.enabled }}
               servicePort: {{ .Values.nexusProxy.port }}
+{{- else }}
+              servicePort: {{ .Values.nexus.nexusPort }}
+{{- end }}
             path: {{ .Values.ingress.path }}
-  {{- end }}
+{{- end }}
+{{- if .Values.nexusProxy.enabled -}}
   {{- if .Values.nexusProxy.env.nexusDockerHost }}
     - host: {{ .Values.nexusProxy.env.nexusDockerHost }}
       http:
@@ -38,7 +42,7 @@ spec:
               servicePort: {{ .Values.nexusProxy.port }}
             path: {{ .Values.ingress.path }}
   {{- end }}
-{{- end -}}  
+{{- end -}}
 {{- with .Values.ingress.rules  }}
 {{ toYaml . | indent 2 }}
   {{- end -}}

diff --git a/charts/sonatype-nexus/templates/proxy-svc.yaml b/charts/sonatype-nexus/templates/proxy-svc.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.nexusProxy.enabled }}
+{{- if or .Values.nexusProxy.enabled .Values.ingress.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -21,14 +21,22 @@ metadata:
 {{- end }}
 spec:
   ports:
+{{- if .Values.nexusProxy.enabled }}
     - port: {{ .Values.nexusProxy.port }}
+{{- else }}
+    - port: {{ .Values.nexus.nexusPort }}
+{{- end }}
 {{- if .Values.nexusProxy.svcName }}
       name: {{ .Values.nexusProxy.svcName }}
 {{- else }}
       name: {{ template "nexus.fullname" . }}
 {{- end }}
       protocol: TCP
+{{- if .Values.nexusProxy.enabled }}
       targetPort: {{ .Values.nexusProxy.targetPort }}
+{{- else }}
+      targetPort: {{ .Values.nexus.nexusPort }}
+{{- end }}
   selector:
     app: {{ template "nexus.name" . }}
     release: {{ .Release.Name }}