Merge pull request 'chore(deps): update dependency volker.raschek/reposilite-charts to v0.1.3' (#1) from renovate/volker.raschek-reposilite-charts-0.x into master

README.md

@@ -33,7 +33,7 @@ version of the chart must be in sync with the `values.yaml`. Newer *minor* versi
 versions can break something!
 
 ```bash
-CHART_VERSION=0.1.0
+CHART_VERSION=0.1.3
 helm show values volker.raschek/reposilite --version "${CHART_VERSION}" > values.yaml
 ```
 
@@ -47,7 +47,7 @@ The helm chart also contains a persistent volume claim definition. It persistent
 Use the `--set` argument to persist your data.
 
 ```bash
-CHART_VERSION=0.1.0
+CHART_VERSION=0.1.3
 helm install --version "${CHART_VERSION}" reposilite volker.raschek/reposilite \
   persistentVolumeClaim.enabled=true
 ```
@@ -68,7 +68,7 @@ connection problems.
 > error.
 
 ```bash
-CHART_VERSION=0.1.0
+CHART_VERSION=0.1.3
 helm install --version "${CHART_VERSION}" reposilite volker.raschek/reposilite \
   --set 'deployment.reposilite.env[1].name=REPOSILITE_LOCAL_SSLENABLED' \
   --set 'deployment.reposilite.env[1].value="true"' \
@@ -211,7 +211,7 @@ networkPolicies:
 | `deployment.terminationGracePeriodSeconds`         | How long to wait until forcefully kill the pod.                                                            | `60`                  |
 | `deployment.tolerations`                           | Tolerations of the Reposilite deployment.                                                                  | `[]`                  |
 | `deployment.topologySpreadConstraints`             | TopologySpreadConstraints of the Reposilite deployment.                                                    | `[]`                  |
-| `deployment.volumes`                               | Additional volumes to mount into the pods of the prometheus-exporter deployment.                           | `[]`                  |
+| `deployment.volumes`                               | Additional volumes to mount into the pods of the reposilite deployment.                                    | `[]`                  |
 
 ### Horizontal Pod Autoscaler (HPA)
 

templates/_deployment.tpl

@@ -20,8 +20,6 @@
 {{ toYaml (dict "env" $env) }}
 {{- end -}}
 
-REPOSILITE_DATA
-
 {{/* image */}}
 
 {{- define "reposilite.deployment.images.reposilite.fqin" -}}
@@ -68,6 +66,9 @@ REPOSILITE_DATA
 {{- if and .Values.persistentVolumeClaim.enabled (not .Values.persistentVolumeClaim.existing.enabled) }}
 {{- $persistentVolumeClaimName := include "reposilite.persistentVolumeClaim.name" $ -}}
 {{- $volumes = concat $volumes (list (dict "name" "data" "persistentVolumeClaim" (dict "claimName" $persistentVolumeClaimName))) }}
+{{- else if and .Values.persistentVolumeClaim.enabled .Values.persistentVolumeClaim.existing.enabled .Values.persistentVolumeClaim.existing.persistentVolumeClaimName -}}
+{{- $persistentVolumeClaimName := .Values.persistentVolumeClaim.existing.persistentVolumeClaimName -}}
+{{- $volumes = concat $volumes (list (dict "name" "data" "persistentVolumeClaim" (dict "claimName" $persistentVolumeClaimName))) }}
 {{- end }}
 
 {{ toYaml (dict "volumes" $volumes) }}

unittests/deployment/mountPersistentVolumeClaim.yaml

@@ -50,3 +50,26 @@ tests:
         name: data
         persistentVolumeClaim:
           claimName: reposilite-unittest
+
+- it: Rendering custom volumes and volumeMounts with persistent volume claim
+  set:
+    persistentVolumeClaim.enabled: true
+    persistentVolumeClaim.existing.enabled: true
+    persistentVolumeClaim.existing.persistentVolumeClaimName: my-custom-pvc
+  asserts:
+  - contains:
+      path: spec.template.spec.containers[0].env
+      content:
+        name: REPOSILITE_DATA
+        value: /app/data
+  - contains:
+      path: spec.template.spec.containers[0].volumeMounts
+      content:
+        name: data
+        mountPath: /app/data
+  - contains:
+      path: spec.template.spec.volumes
+      content:
+        name: data
+        persistentVolumeClaim:
+          claimName: my-custom-pvc

values.yaml

@@ -187,9 +187,9 @@ deployment:
   #   whenUnsatisfiable: DoNotSchedule
   #   labelSelector:
   #     matchLabels:
-  #       app.kubernetes.io/instance: prometheus-reposilite
+  #       app.kubernetes.io/instance: reposilite
 
-  ## @param deployment.volumes Additional volumes to mount into the pods of the prometheus-exporter deployment.
+  ## @param deployment.volumes Additional volumes to mount into the pods of the reposilite deployment.
   volumes: []
   # - name: my-configmap-volume
   #   config: