Merge branch 'master' of github.com:Oteemo/charts

Oteemo · Apr 14, 2021 · 08676fc · 08676fc
2 parents 6ab29eb + 87c91a4
commit 08676fc
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 22 deletions.
diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml
@@ -8,25 +8,37 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
-      - name: Fetch history
-        run: git fetch --prune --unshallow
+      - name: Set up Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.1
 
-      - name: Run chart-testing (lint)
-        id: lint
-        uses: helm/chart-testing-action@v1.0.0
+      - name: Set up Python
+        uses: actions/setup-python@v2
         with:
-          command: lint
-          config: lint.yaml
+          python-version: 3.7
 
-      - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.0.1
         with:
-          install_local_path_provisioner: true
-        if: steps.lint.outputs.changed == 'true'
+          version: v3.3.0
+
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --config test.yaml)
+          if [[ -n "$changed" ]]; then
+            echo "::set-output name=changed::true"
+          fi
+      - name: Run chart-testing (lint)
+        run: ct lint --config test.yaml
+
+      - name: Create kind cluster
+        uses: helm/kind-action@v1.1.0
+        if: steps.list-changed.outputs.changed == 'true'
 
       - name: Run chart-testing (install)
-        uses: helm/chart-testing-action@v1.0.0
-        with:
-          command: install
-          config: test.yaml
+        run: ct install --config test.yaml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,16 +21,15 @@ jobs:
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
       - name: Install Helm
-        run: |
-          curl -fsSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
-          chmod 700 get_helm.sh
-          ./get_helm.sh
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.0
 
       - name: Add helm repositories
         run: |
           helm repo add bitnami https://charts.bitnami.com/bitnami
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.0.0
+        uses: helm/chart-releaser-action@v1.2.0
         env:
           CR_TOKEN: "${{ secrets.CR_TOKEN }}"
diff --git a/charts/sonarqube/CHANGELOG.md b/charts/sonarqube/CHANGELOG.md
@@ -1,6 +1,9 @@
 # SonarQube Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [9.6.1]
+* Add support for setting custom annotations in admin hook job.
+
 ## [9.6.0]
 * Add the possibility of definining the secret key name of the postgres password.
 

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: 9.6.0
+version: 9.6.1
 appVersion: 8.5.1-community
 keywords:
   - coverage

diff --git a/charts/sonarqube/README.md b/charts/sonarqube/README.md
@@ -193,6 +193,7 @@ The following table lists the configurable parameters of the Sonarqube chart and
 | `account.adminPassword`                                  | Custom admin password                                                                                                     | `"admin"`                       |
 | `account.currentAdminPassword`                           | Current admin password                                                                                                    | `"admin"`                       |
 | `curlContainerImage`                                     | Curl container image                                                                                                      | `"curlimages/curl:latest"`      |
+| `adminJobAnnotations`                                    | Custom annotations for admin hook Job                                                                                     | `{}`                            |
 | `terminationGracePeriodSeconds`                          | Configuration of `terminationGracePeriodSeconds`                                                                          | `60`                            |
 
 You can also configure values for the PostgreSQL database via the Postgresql [Chart](https://hub.helm.sh/charts/bitnami/postgresql)

diff --git a/charts/sonarqube/templates/change-admin-password-hook.yml b/charts/sonarqube/templates/change-admin-password-hook.yml
@@ -15,6 +15,9 @@ metadata:
   annotations:
     "helm.sh/hook": post-install
     "helm.sh/hook-delete-policy": hook-succeeded
+  {{- range $key, $value := .Values.adminJobAnnotations }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
 spec:
   template:
     metadata:

diff --git a/charts/sonarqube/values.yaml b/charts/sonarqube/values.yaml
@@ -357,5 +357,6 @@ extraConfig:
 #   adminPassword: admin
 #   currentAdminPassword: admin
 # curlContainerImage: curlimages/curl:latest
+# adminJobAnnotations: {}
 
 terminationGracePeriodSeconds: 60
diff --git a/charts/sonatype-nexus/Chart.yaml b/charts/sonatype-nexus/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: sonatype-nexus
-version: 4.4.2
+version: 5.0.0
 appVersion: 3.27.0
 description: Sonatype Nexus is an open source repository manager
 keywords:

diff --git a/charts/sonatype-nexus/templates/backup-pv.yaml b/charts/sonatype-nexus/templates/backup-pv.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 spec:
   capacity:
     storage: {{ .Values.nexusBackup.persistence.storageSize }}

diff --git a/charts/sonatype-nexus/templates/backup-pvc.yaml b/charts/sonatype-nexus/templates/backup-pvc.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 {{- if .Values.nexusBackup.persistence.annotations }}
   annotations:
 {{ toYaml .Values.nexusBackup.persistence.annotations | indent 4 }}

diff --git a/charts/sonatype-nexus/templates/backup-secret.yaml b/charts/sonatype-nexus/templates/backup-secret.yaml
@@ -6,6 +6,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 type: Opaque
 data:
   nexus.nexusAdminPassword: {{ printf "%s%s" "Basic " (printf "%s%s" "admin:" .Values.nexusBackup.nexusAdminPassword | b64enc) | cat | b64enc | quote }}

diff --git a/charts/sonatype-nexus/templates/cloudiam-pvc.yaml b/charts/sonatype-nexus/templates/cloudiam-pvc.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 {{- if .Values.nexusCloudiam.persistence.annotations }}
   annotations:
 {{ toYaml .Values.nexusCloudiam.persistence.annotations | indent 4 }}

diff --git a/charts/sonatype-nexus/templates/pv.yaml b/charts/sonatype-nexus/templates/pv.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 spec:
   capacity:
     storage: {{ .Values.persistence.storageSize }}

diff --git a/charts/sonatype-nexus/templates/pvc.yaml b/charts/sonatype-nexus/templates/pvc.yaml
@@ -7,6 +7,9 @@ metadata:
   namespace: {{ template "nexus.namespace" . }}
   labels:
 {{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
 {{- if .Values.persistence.annotations }}
   annotations:
 {{ toYaml .Values.persistence.annotations | indent 4 }}

diff --git a/charts/sonatype-nexus/templates/serviceaccount.yaml b/charts/sonatype-nexus/templates/serviceaccount.yaml
@@ -8,6 +8,11 @@ metadata:
   name: {{ template "nexus.fullname" . }}
   {{- end }}
   namespace: {{ template "nexus.namespace" . }}
+  labels:
+{{ include "nexus.labels" . | indent 4 }}
+{{- if .Values.nexus.labels }}
+{{ toYaml .Values.nexus.labels | indent 4 }}
+{{- end }}
   {{- if .Values.serviceAccount.annotations }}
   annotations: {{ toYaml .Values.serviceAccount.annotations | nindent 4 }}
   {{- end }}