Merge pull request #1458 from dduportal/feat/rsyncd/allow-data-subpath

feat(rsyncd) allow specifying a sub directory for each component to mount (instead of the root)
jenkins-infra · Nov 29, 2024 · af88df3 · af88df3
2 parents 762eeb3 + 29f17a5
commit af88df3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/charts/rsyncd/Chart.yaml b/charts/rsyncd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: rsyncd helm chart for Kubernetes
 name: rsyncd
-version: 3.0.0
+version: 3.1.0
 maintainers:
 - email: [email protected]
   name: jenkins-infra-team
diff --git a/charts/rsyncd/templates/deployment.yaml b/charts/rsyncd/templates/deployment.yaml
@@ -111,6 +111,9 @@ spec:
             - name: datadir-{{ .name }}
               mountPath: {{ .path }}
               readOnly: {{ eq (toString .writeEnabled) "true" | ternary "false" "true" }}
+              {{- with .volumeSubDir }}
+              subPath: {{ . }}
+              {{- end }}
           {{- end }}
           {{- if .Values.configuration.sshd }}
             {{- if .Values.configuration.sshd.hostKeys }}

diff --git a/charts/rsyncd/tests/custom_values_rsyncd_test.yaml b/charts/rsyncd/tests/custom_values_rsyncd_test.yaml
@@ -185,8 +185,9 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].volumeMounts[6].mountPath
           value: /tmp/hudson
-      - notExists:
+      - equal:
           path: spec.template.spec.containers[0].volumeMounts[6].subPath
+          value: ./foo/
       - equal:
           path: spec.template.spec.containers[0].volumeMounts[6].readOnly
           value: false

diff --git a/charts/rsyncd/tests/custom_values_sshd_test.yaml b/charts/rsyncd/tests/custom_values_sshd_test.yaml
@@ -162,8 +162,9 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].volumeMounts[3].mountPath
           value: /tmp/hudson
-      - notExists:
+      - equal:
           path: spec.template.spec.containers[0].volumeMounts[3].subPath
+          value: ./foo/
       - equal:
           path: spec.template.spec.containers[0].volumeMounts[3].readOnly
           value: false

diff --git a/charts/rsyncd/tests/values/custom_rsyncd.yaml b/charts/rsyncd/tests/values/custom_rsyncd.yaml
@@ -40,4 +40,5 @@ configuration:
       path: /tmp/hudson
       comment: "Hudson Read-Only Mirror"
       volumeTpl: "another-vol"
+      volumeSubDir: ./foo/
       writeEnabled: true
diff --git a/charts/rsyncd/tests/values/custom_sshd.yaml b/charts/rsyncd/tests/values/custom_sshd.yaml
@@ -55,4 +55,5 @@ configuration:
       path: /tmp/hudson
       comment: "Hudson Read-Only Mirror"
       volumeTpl: "another-vol"
+      volumeSubDir: ./foo/
       writeEnabled: true