feat: volumes + volumeMounts support

eshepelyuk · Nov 20, 2023 · 30ba8ac · 30ba8ac
1 parent 55fc43b
commit 30ba8ac
Show file tree

Hide file tree

Showing 7 changed files with 208 additions and 0 deletions.
diff --git a/templates/deployment-registry.yaml b/templates/deployment-registry.yaml
@@ -76,4 +76,12 @@ spec:
  resources:
  {{ . | toYaml | nindent 12 }}
  {{- end }}
+ {{- with .Values.registry.extraVolumeMounts }}
+ volumeMounts:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
+ {{- with .Values.registry.extraVolumes }}
+ volumes:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
 {{- end }}
diff --git a/templates/deployment-sync.yaml b/templates/deployment-sync.yaml
@@ -66,4 +66,12 @@ spec:
  resources:
  {{ . | toYaml | nindent 12 }}
  {{- end }}
+ {{- with .Values.sync.extraVolumeMounts }}
+ volumeMounts:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
+ {{- with .Values.sync.extraVolumes }}
+ volumes:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
 {{- end }}
diff --git a/test/linter/test.sh b/test/linter/test.sh
@@ -100,6 +100,51 @@ if [ $? -eq 0 ]; then
  exit 1
 fi
 
+# extraVolumeMounts - correct
+helm lint . --strict --set registry.extraVolumeMounts[0].name=foo,registry.extraVolumeMounts[0].mountPath=/bar
+if [ $? -ne 0 ]; then
+ exit 1
+fi
+
+helm lint . --strict --set sync.extraVolumeMounts[0].name=foo,registry.extraVolumeMounts[0].mountPath=/bar
+if [ $? -ne 0 ]; then
+ exit 1
+fi
+
+# extraVolumeMounts - wrong
+helm lint . --strict --set registry.extraVolumeMounts.name=foo,registry.extraVolumeMounts.mountPath=/bar
+if [ $? -eq 0 ]; then
+ exit 1
+fi
+
+helm lint . --strict --set sync.extraVolumeMounts.name=foo,registry.extraVolumeMounts.mountPath=/bar
+if [ $? -eq 0 ]; then
+ exit 1
+fi
+
+# extraVolumes - correct
+helm lint . --strict --set registry.extraVolumes[0].name=foo,registry.extraVolumes[0].emptyDir=true
+if [ $? -ne 0 ]; then
+ exit 1
+fi
+
+helm lint . --strict --set sync.extraVolumes[0].name=foo,sync.extraVolumes[0].emptyDir=true
+if [ $? -ne 0 ]; then
+ exit 1
+fi
+
+# extraVolumes - wrong
+helm lint . --strict --set registry.extraVolumes.name=foo,registry.extraVolumes.emptyDir=true
+if [ $? -eq 0 ]; then
+ exit 1
+fi
+
+helm lint . --strict --set sync.extraVolumes.name=foo,sync.extraVolumes.emptyDir=true
+if [ $? -eq 0 ]; then
+ exit 1
+fi
+
+
 echo "=================================================================================="
 echo " LINT PASSED"
 echo "=================================================================================="
diff --git a/test/unit/volume_registry_test.yaml b/test/unit/volume_registry_test.yaml
@@ -0,0 +1,60 @@
+---
+suite: test registry volumes
+templates:
+ - deployment-registry.yaml
+tests:
+ - it: no volumes
+ asserts:
+ - notExists:
+ path: spec.template.spec.volumes
+ - it: volumes
+ set:
+ registry:
+ extraVolumes:
+ - name: baz
+ emptyDir: {}
+ - name: foo
+ secret:
+ secretName: bar
+ optional: false
+ asserts:
+ - exists:
+ path: spec.template.spec.volumes
+ - equal:
+ path: spec.template.spec.volumes[0].name
+ value: baz
+ - equal:
+ path: spec.template.spec.volumes[0].emptyDir
+ value: {}
+ - equal:
+ path: spec.template.spec.volumes[1].name
+ value: foo
+ - equal:
+ path: spec.template.spec.volumes[1].secret.secretName
+ value: bar
+ - equal:
+ path: spec.template.spec.volumes[1].secret.optional
+ value: false
+ - it: no volume mounts
+ asserts:
+ - notExists:
+ path: spec.template.spec.containers[0].volumeMounts
+ - it: volume mounts
+ set:
+ registry:
+ extraVolumeMounts:
+ - name: foo
+ mountPath: /bar
+ readOnly: true
+ asserts:
+ - exists:
+ path: spec.template.spec.containers[0].volumeMounts
+ - equal:
+ path: spec.template.spec.containers[0].volumeMounts[0].name
+ value: foo
+ - equal:
+ path: spec.template.spec.containers[0].volumeMounts[0].mountPath
+ value: /bar
+ - equal:
+ path: spec.template.spec.containers[0].volumeMounts[0].readOnly
+ value: true
diff --git a/test/unit/volume_sync_test.yaml b/test/unit/volume_sync_test.yaml
@@ -0,0 +1,57 @@
+---
+suite: test sync volumes
+templates:
+ - deployment-sync.yaml
+tests:
+ - it: no volumes
+ asserts:
+ - notExists:
+ path: spec.template.spec.volumes
+ - it: volumes
+ set:
+ sync:
+ extraVolumes:
+ - name: baz
+ emptyDir: {}
+ - name: foo
+ secret:
+ secretName: bar
+ optional: false
+ asserts:
+ - exists:
+ path: spec.template.spec.volumes
+ - equal:
+ path: spec.template.spec.volumes[0].name
+ value: baz
+ - equal:
+ path: spec.template.spec.volumes[0].emptyDir
+ value: {}
+ - equal:
+ path: spec.template.spec.volumes[1].name
+ value: foo
+ - equal:
+ path: spec.template.spec.volumes[1].secret.secretName
+ value: bar
+ - it: no volume mounts
+ asserts:
+ - notExists:
+ path: spec.template.spec.containers[0].volumeMounts
+ - it: volume mounts
+ set:
+ sync:
+ extraVolumeMounts:
+ - name: foo
+ mountPath: /bar
+ readOnly: true
+ asserts:
+ - exists:
+ path: spec.template.spec.containers[0].volumeMounts
+ - equal:
+ path: spec.template.spec.containers[0].volumeMounts[0].name
+ value: foo
+ - equal:
+ path: spec.template.spec.containers[0].volumeMounts[0].mountPath
+ value: /bar
+ - equal:
+ path: spec.template.spec.containers[0].volumeMounts[0].readOnly
+ value: true
diff --git a/values.schema.json b/values.schema.json
@@ -57,6 +57,12 @@
  "initContainers": {
  "type": "array", "default": []
  },
+ "volumeMounts": {
+ "type": "array", "default": []
+ },
+ "volumes": {
+ "type": "array", "default": []
+ },
  "ingress": {
  "type": "object", "title": "ingress resource for registry",
  "required": ["enabled", "host", "path"],
@@ -89,6 +95,8 @@
  "items": {"$ref": "#/definitions/keyValue"}
  },
  "resources": {"$ref": "#/definitions/podResources"},
+ "extraVolumeMounts": {"$ref": "#/definitions/volumeMounts"},
+ "extraVolumes": {"$ref": "#/definitions/volumes"},
  "kafka": {"$ref": "#/definitions/persistence/kafka"},
  "sql": {"$ref": "#/definitions/persistence/sql"},
  "ingress": {"$ref": "#/definitions/ingress"}
@@ -103,6 +111,8 @@
  "nodeSelector": {"type": "object", "title": "node selector for registry content sync"},
  "initContainers": {"$ref": "#/definitions/initContainers"},
  "resources": {"$ref": "#/definitions/podResources"},
+ "extraVolumeMounts": {"$ref": "#/definitions/volumeMounts"},
+ "extraVolumes": {"$ref": "#/definitions/volumes"},
  "registryUrl": {"type": ["null", "string"], "default": null}
  }
  }

diff --git a/values.yaml b/values.yaml
@@ -30,6 +30,16 @@ registry:
  # requests:
  # cpu: 200m
  # memory: 600Mi
+ # list of extra volume mounts
+ extraVolumeMounts: []
+ # - name: kafkauser
+ # mountPath: /opt/user
+ # readOnly: true
+ # list of extra volumes
+ extraVolumes: []
+ # - name: kafkauser
+ # secret:
+ # secretName: kafka-user
 
  ingress:
  enabled: false
@@ -57,4 +67,14 @@ sync:
  # requests:
  # cpu: 200m
  # memory: 600Mi
+ # list of extra volume mounts
+ extraVolumeMounts: []
+ # - name: kafkauser
+ # mountPath: /opt/user
+ # readOnly: true
+ # list of extra volumes
+ extraVolumes: []
+ # - name: kafkauser
+ # secret:
+ # secretName: kafka-user