Merge pull request #83 from truenas/NAS-111331

Use custom image for chia

charts/chia/1.3.0/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 1.1.7
+appVersion: 1.2.0-pre2
 dependencies:
 - name: common
   repository: file://../../../library/common/2105.0.0
@@ -15,4 +15,4 @@ name: chia
 sources:
 - https://github.com/Chia-Network/chia-blockchain
 - https://github.com/orgs/chia-network/packages/container/package/chia
-version: 1.2.2
+version: 1.3.0

charts/chia/1.3.0/ix_values.yaml

@@ -1,5 +1,5 @@
 image:
   pullPolicy: IfNotPresent
-  repository: ghcr.io/chia-network/chia
-  tag: 1.1.7
+  repository: ixsystems/chia-docker
+  tag: 1.2.0-pre2
 updateStrategy: Recreate

charts/chia/1.3.0/questions.yaml

@@ -1,10 +1,36 @@
 groups:
   - name: "Storage"
     description: "Configure Storage for Chia"
+  - name: "Farmr.net Configuration"
+    description: "Configure farmr.net support"
   - name: "Chia Environment Variables"
     description: "Set the environment that will be visible to the container"
 
+portals:
+  web_portal:
+    protocols:
+      - "https"
+    host:
+      - "www.truepool.io"
+    ports:
+      - "443"
+    path: "/kb/truepool-docker-image/"
+
 questions:
+  - variable: farmr_env
+    label: "Enable 'farmr.net' support"
+    group: "Farmr.net Configuration"
+    description: "Configure 'farmr.net' support for chia"
+    schema:
+      type: string
+      default: "off"
+      enum:
+        - value: "off"
+          description: "OFF"
+        - value: "farmer"
+          description: "FARMER"
+        - value: "harvester"
+          description: "HARVESTER"
   - variable: appVolumeMounts
     label: "Chia Storage"
     group: "Storage"

charts/chia/1.3.0/templates/deployment.yaml

@@ -30,6 +30,7 @@ spec:
               hostPort: 8444
           {{ $envList := (default list .Values.environmentVariables) }}
           {{ $envList = mustAppend $envList (dict "name" "keys" "value" "/plots/keyfile") }}
+          {{ $envList = mustAppend $envList (dict "name" "farmr" "value" $.Values.farmr_env) }}
           {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
       volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
       {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}

charts/chia/1.3.0/test_values.yaml

@@ -1,6 +1,6 @@
 image:
-  repository: ghcr.io/chia-network/chia
-  tag: 1.1.7
+  repository: ixsystems/chia-docker
+  tag: 1.2.0-pre2
   pullPolicy: IfNotPresent
 updateStrategy: Recreate
 
@@ -11,3 +11,5 @@ appVolumeMounts:
   data:
     emptyDir: true
     mountPath: "/root/.chia"
+
+farmr_env: "off"

test/chia/1.3.0/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 1.1.7
+appVersion: 1.2.0-pre2
 dependencies:
 - name: common
   repository: file://../../../library/common/2105.0.0
@@ -15,4 +15,4 @@ name: chia
 sources:
 - https://github.com/Chia-Network/chia-blockchain
 - https://github.com/orgs/chia-network/packages/container/package/chia
-version: 1.2.2
+version: 1.3.0

test/chia/1.3.0/ix_values.yaml

@@ -1,5 +1,5 @@
 image:
   pullPolicy: IfNotPresent
-  repository: ghcr.io/chia-network/chia
-  tag: 1.1.7
+  repository: ixsystems/chia-docker
+  tag: 1.2.0-pre2
 updateStrategy: Recreate

test/chia/1.3.0/questions.yaml

@@ -1,10 +1,36 @@
 groups:
   - name: "Storage"
     description: "Configure Storage for Chia"
+  - name: "Farmr.net Configuration"
+    description: "Configure farmr.net support"
   - name: "Chia Environment Variables"
     description: "Set the environment that will be visible to the container"
 
+portals:
+  web_portal:
+    protocols:
+      - "https"
+    host:
+      - "www.truepool.io"
+    ports:
+      - "443"
+    path: "/kb/truepool-docker-image/"
+
 questions:
+  - variable: farmr_env
+    label: "Enable 'farmr.net' support"
+    group: "Farmr.net Configuration"
+    description: "Configure 'farmr.net' support for chia"
+    schema:
+      type: string
+      default: "off"
+      enum:
+        - value: "off"
+          description: "OFF"
+        - value: "farmer"
+          description: "FARMER"
+        - value: "harvester"
+          description: "HARVESTER"
   - variable: appVolumeMounts
     label: "Chia Storage"
     group: "Storage"

test/chia/1.3.0/templates/deployment.yaml

@@ -30,6 +30,7 @@ spec:
               hostPort: 8444
           {{ $envList := (default list .Values.environmentVariables) }}
           {{ $envList = mustAppend $envList (dict "name" "keys" "value" "/plots/keyfile") }}
+          {{ $envList = mustAppend $envList (dict "name" "farmr" "value" $.Values.farmr_env) }}
           {{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}
       volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
       {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}

test/chia/1.3.0/test_values.yaml

@@ -1,6 +1,6 @@
 image:
-  repository: ghcr.io/chia-network/chia
-  tag: 1.1.7
+  repository: ixsystems/chia-docker
+  tag: 1.2.0-pre2
   pullPolicy: IfNotPresent
 updateStrategy: Recreate
 
@@ -11,3 +11,5 @@ appVolumeMounts:
   data:
     emptyDir: true
     mountPath: "/root/.chia"
+
+farmr_env: "off"