Merge pull request #59 from truenas/NAS-110610

Allow specifying host path volumes/environment variables for chia

charts/chia/1.1.0/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Global, Versioned, peer-to-peer filesystem.
 name: chia
-version: 1.0.0
+version: 1.1.0
 appVersion: 1.1.4
 keywords:
 - storage

charts/chia/1.1.0/ix_values.yaml

@@ -3,6 +3,3 @@ image:
   tag: 1.1.4
   pullPolicy: IfNotPresent
 updateStrategy: Recreate
-environmentVariables:
-  - name: "keys"
-    value: "/plots/keyfile"

charts/chia/1.1.0/questions.yaml

@@ -1,6 +1,8 @@
 groups:
   - name: "Storage"
     description: "Configure Storage for Chia"
+  - name: "Chia Environment Variables"
+    description: "Set the environment that will be visible to the container"
 
 questions:
   - variable: appVolumeMounts
@@ -79,3 +81,49 @@ questions:
                       schema:
                         type: hostpath
                         required: true
+
+  - variable: extraAppVolumeMounts
+    label: "Chia Extra Host Path Volumes"
+    group: "Storage"
+    schema:
+      type: list
+      items:
+        - variable: extraAppVolume
+          label: "Chia Host Path Volume"
+          description: "Add an extra host path volume for chia application"
+          schema:
+            type: dict
+            attrs:
+              - variable: mountPath
+                label: "Mount Path in Pod"
+                description: "Path where the volume will be mounted inside the pod"
+                schema:
+                  type: path
+                  required: true
+              - variable: hostPath
+                label: "Host Path"
+                description: "Host path"
+                schema:
+                  type: hostpath
+                  required: true
+
+  - variable: environmentVariables
+    label: "Environment Variables for Chia"
+    group: "Chia Environment Variables"
+    schema:
+      type: list
+      default: []
+      items:
+        - variable: environmentVariable
+          label: "Environment Variable"
+          schema:
+            type: dict
+            attrs:
+              - variable: name
+                label: "Name"
+                schema:
+                  type: string
+              - variable: value
+                label: "Value"
+                schema:
+                  type: string

charts/chia/1.1.0/templates/deployment.yaml

@@ -18,11 +18,22 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
-          {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }}
+          volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }}
+          {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
+            - name: extrappvolume-{{ $index }}
+              mountPath: {{ $hostPathConfiguration.mountPath }}
+          {{ end }}
           ports:
             - name: chia-network
               protocol: TCP
               containerPort: 8444
               hostPort: 8444
-{{ include "common.containers.allEnvironmentVariables" .Values | nindent 10 }}
-{{ include "common.storage.allAppVolumes" .Values | nindent 6 }}
+          {{ $envList := (default list .Values.environmentVariables) }}
+          {{ $envList = mustAppend $envList (dict "name" "keys" "value" "/plots/keyfile") }}
+          {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
+      volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
+      {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
+        - name: extrappvolume-{{ $index }}
+          hostPath:
+            path: {{ $hostPathConfiguration.hostPath }}
+      {{ end }}

charts/chia/1.1.0/test_values.yaml

@@ -3,9 +3,6 @@ image:
   tag: 1.1.4
   pullPolicy: IfNotPresent
 updateStrategy: Recreate
-environmentVariables:
-  - name: "keys"
-    value: "/plots/keyfile"
 
 appVolumeMounts:
   staging:

test/chia/1.1.0/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Global, Versioned, peer-to-peer filesystem.
 name: chia
-version: 1.0.0
+version: 1.1.0
 appVersion: 1.1.4
 keywords:
 - storage

test/chia/1.1.0/ix_values.yaml

@@ -3,6 +3,3 @@ image:
   tag: 1.1.4
   pullPolicy: IfNotPresent
 updateStrategy: Recreate
-environmentVariables:
-  - name: "keys"
-    value: "/plots/keyfile"

test/chia/1.1.0/questions.yaml

@@ -1,6 +1,8 @@
 groups:
   - name: "Storage"
     description: "Configure Storage for Chia"
+  - name: "Chia Environment Variables"
+    description: "Set the environment that will be visible to the container"
 
 questions:
   - variable: appVolumeMounts
@@ -79,3 +81,49 @@ questions:
                       schema:
                         type: hostpath
                         required: true
+
+  - variable: extraAppVolumeMounts
+    label: "Chia Extra Host Path Volumes"
+    group: "Storage"
+    schema:
+      type: list
+      items:
+        - variable: extraAppVolume
+          label: "Chia Host Path Volume"
+          description: "Add an extra host path volume for chia application"
+          schema:
+            type: dict
+            attrs:
+              - variable: mountPath
+                label: "Mount Path in Pod"
+                description: "Path where the volume will be mounted inside the pod"
+                schema:
+                  type: path
+                  required: true
+              - variable: hostPath
+                label: "Host Path"
+                description: "Host path"
+                schema:
+                  type: hostpath
+                  required: true
+
+  - variable: environmentVariables
+    label: "Environment Variables for Chia"
+    group: "Chia Environment Variables"
+    schema:
+      type: list
+      default: []
+      items:
+        - variable: environmentVariable
+          label: "Environment Variable"
+          schema:
+            type: dict
+            attrs:
+              - variable: name
+                label: "Name"
+                schema:
+                  type: string
+              - variable: value
+                label: "Value"
+                schema:
+                  type: string

test/chia/1.1.0/requirements.lock

@@ -3,4 +3,4 @@ dependencies:
   repository: file://../../../library/common/2105.0.0
   version: 2105.0.0
 digest: sha256:11522ab36487826700d7ad0f86f713a4bb5d35248014bcef690fe94acbc09ef6
-generated: "2021-05-10T13:07:35.493091+05:00"
+generated: "2021-05-17T18:26:46.201544+05:00"

test/chia/1.1.0/templates/deployment.yaml

@@ -18,11 +18,22 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
-          {{ include "common.storage.allContainerVolumeMounts" .Values | nindent 10 }}
+          volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }}
+          {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
+            - name: extrappvolume-{{ $index }}
+              mountPath: {{ $hostPathConfiguration.mountPath }}
+          {{ end }}
           ports:
             - name: chia-network
               protocol: TCP
               containerPort: 8444
               hostPort: 8444
-{{ include "common.containers.allEnvironmentVariables" .Values | nindent 10 }}
-{{ include "common.storage.allAppVolumes" .Values | nindent 6 }}
+          {{ $envList := (default list .Values.environmentVariables) }}
+          {{ $envList = mustAppend $envList (dict "name" "keys" "value" "/plots/keyfile") }}
+          {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
+      volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
+      {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
+        - name: extrappvolume-{{ $index }}
+          hostPath:
+            path: {{ $hostPathConfiguration.hostPath }}
+      {{ end }}

test/chia/1.1.0/test_values.yaml

@@ -3,9 +3,6 @@ image:
   tag: 1.1.4
   pullPolicy: IfNotPresent
 updateStrategy: Recreate
-environmentVariables:
-  - name: "keys"
-    value: "/plots/keyfile"
 
 appVolumeMounts:
   staging: