Merge pull request #295 from Sagittarius/master

NAS-114444 / 22.02 / Add Shibgreen support for Machinaris

charts/machinaris/1.1.1/Chart.yaml → charts/machinaris/1.1.2/Chart.yaml

@@ -14,4 +14,4 @@ keywords:
 name: machinaris
 sources:
 - https://github.com/guydavis/machinaris
-version: 1.1.1
+version: 1.1.2

test/machinaris/1.1.1/README.md → charts/machinaris/1.1.2/README.md

@@ -3,7 +3,7 @@ Machinaris
 
 [MACHINARIS](https://github.com/guydavis/machinaris) is an easy-to-use WebUI for Chia plotting and farming. This includes Chia, Plotman, MadMax, Chiadog under main node along with various coin-forks which can be enabled conditionally.
 
-Coins include Cactus, Chives, CrypoDoge, Flax, Flora, HDDCoin, Maize, NChain, StaiCoin, Stor and BTCGreen.
+Coins include Cactus, Chives, CrypoDoge, Flax, Flora, HDDCoin, Maize, NChain, StaiCoin, Stor, BTCGreen and Shibgreen.
 
 Introduction
 ------------
@@ -68,4 +68,4 @@ Following are the Volume Configurations for Machinaris main node & the coin-fork
 | 	`plotting`           |  `<ix-volumes>/plotting`                              | `/plotting`             | Plotting temp volume for main node & coin forks |
 | 	`<coinName>-config`  |  `<ix-volumes>/<coinName>-config`                     | `/root/.chia`           | Chia config for each of the coin-fork containers|
 
-Where `<ix-volumes>` is `/mnt/<pool_name>/ix-applications/releases/<application_name>/volumes/ix_volumes/` and `<coinName>` is one of the following: `[ cactus, chives, crypodoge, flax, flora, hddcoin, maize, nchain, staicoin, stor, btcgreen ]`.
+Where `<ix-volumes>` is `/mnt/<pool_name>/ix-applications/releases/<application_name>/volumes/ix_volumes/` and `<coinName>` is one of the following: `[ cactus, chives, crypodoge, flax, flora, hddcoin, maize, nchain, staicoin, stor, btcgreen, shibgreen ]`.

charts/machinaris/1.1.1/app-readme.md → charts/machinaris/1.1.2/app-readme.md

@@ -3,7 +3,7 @@ Machinaris
 
 [MACHINARIS](https://github.com/guydavis/machinaris) is an easy-to-use WebUI for Chia plotting and farming. This includes Chia, Plotman, MadMax, Chiadog under main node along with various coin-forks which can be enabled conditionally.
 
-Coins include Cactus, Chives, CrypoDoge, Flax, Flora, HDDCoin, Maize, NChain, StaiCoin, Stor and BTCGreen.
+Coins include Cactus, Chives, CrypoDoge, Flax, Flora, HDDCoin, Maize, NChain, StaiCoin, Stor, BTCGreen and Shibgreen.
 
 # Machinaris Defaults
 This section contains information about the defaults of Machinaris application for visibility.
@@ -63,4 +63,4 @@ Following are the Volume Configurations for Machinaris main node & the coin-fork
 | 	`plotting`           |  `<ix-volumes>/plotting`                              | `/plotting`             | Plotting temp volume for main node & coin forks |
 | 	`<coinName>-config`  |  `<ix-volumes>/<coinName>-config`                     | `/root/.chia`           | Chia config for each of the coin-fork containers|
 
-Where `<ix-volumes>` is `/mnt/<pool_name>/ix-applications/releases/<application_name>/volumes/ix_volumes/` and `<coinName>` is one of the following: `[ cactus, chives, crypodoge, flax, flora, hddcoin, maize, nchain, staicoin, stor, btcgreen ]`.
+Where `<ix-volumes>` is `/mnt/<pool_name>/ix-applications/releases/<application_name>/volumes/ix_volumes/` and `<coinName>` is one of the following: `[ cactus, chives, crypodoge, flax, flora, hddcoin, maize, nchain, staicoin, stor, btcgreen, shibgreen ]`.

test/machinaris/1.1.1/ix_values.yaml → charts/machinaris/1.1.2/ix_values.yaml

@@ -53,6 +53,7 @@ coins:
 - staicoin
 - stor
 - btcgreen
+- shibgreen
 cryptodoge:
   apiPort: 8937
   farmerPort: 16895
@@ -178,4 +179,17 @@ stor:
   - containerPort: 8337
     name: farming
     protocol: TCP
+shibgreen:
+  apiPort: 8939
+  farmerPort: 18974
+  ports:
+  - containerPort: 8939
+    name: api
+    protocol: TCP
+  - containerPort: 7442
+    name: blockchain
+    protocol: TCP
+  - containerPort: 18974
+    name: farming
+    protocol: TCP
 updateStrategy: Recreate

charts/machinaris/1.1.1/questions.yaml → charts/machinaris/1.1.2/questions.yaml

@@ -1621,3 +1621,128 @@ questions:
                             label: "Value"
                             schema:
                               type: string
+# Shibgreen Configurations
+  - variable: shibgreenEnabled
+    label: "Enable Shibgreen"
+    group: "Configure Coins"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: shibgreen
+          label: "Configure Shibgreen"
+          schema:
+            type: dict
+            additional_attrs: true
+            attrs:
+              - variable: volumeMounts
+                label: "Storage Configurations"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: config
+                      label: "Configuration Volume"
+                      schema:
+                        type: dict
+                        attrs:
+                          - variable: datasetName
+                            label: "Configuration Volume Dataset Name"
+                            schema:
+                              type: string
+                              hidden: true
+                              $ref:
+                                - "normalize/ixVolume"
+                              show_if: [["hostPathEnabled", "=", false]]
+                              default: "shibgreen-config"
+                              editable: false
+                          - variable: mountPath
+                            label: "Configuration Mount Path"
+                            description: "Path where the volume will be mounted inside the pod"
+                            schema:
+                              type: path
+                              hidden: true
+                              editable: false
+                              default: "/root/.chia"
+                          - variable: hostPathEnabled
+                            label: "Enable Custom Host Path for Configuration Volume"
+                            schema:
+                              type: boolean
+                              default: false
+                              show_subquestions_if: true
+                              subquestions:
+                                - variable: hostPath
+                                  label: "Host Path for Configuration Volume"
+                                  schema:
+                                    type: hostpath
+                                    required: true
+                    - variable: mnemonic
+                      label: "Mnemonic Volume"
+                      schema:
+                        type: dict
+                        attrs:
+                          - variable: datasetName
+                            label: "Mnemonic Volume Dataset Name"
+                            schema:
+                              type: string
+                              hidden: true
+                              $ref:
+                                - "normalize/ixVolume"
+                              show_if: [["hostPathEnabled", "=", false]]
+                              default: "config"
+                              editable: false
+                          - variable: mountPath
+                            label: "Mnemonic Mount Path"
+                            description: "Path where the volume will be mounted inside the pod"
+                            schema:
+                              type: path
+                              hidden: true
+                              editable: false
+                              default: "/root/.chia/mnemonic.txt"
+                          - variable: subPath
+                            label: "Subpath in the Dataset"
+                            schema:
+                              type: string
+                              hidden: true
+                              show_if: [["hostPathEnabled", "=", false]]
+                              default: "mnemonic.txt"
+                              editable: false
+                          - variable: readOnly
+                            label: "Mode"
+                            description: "Mnemonic file mode"
+                            schema:
+                              type: boolean
+                              hidden: true
+                              editable: false
+                              default: true
+                          - variable: hostPathEnabled
+                            label: "Enable Custom Host Path for Mnemonic Volume"
+                            schema:
+                              type: boolean
+                              default: false
+                              show_subquestions_if: true
+                              subquestions:
+                                - variable: hostPath
+                                  label: "Host Path for Mnemonic Volume"
+                                  schema:
+                                    type: hostpath
+                                    required: true
+              - variable: environmentVariables
+                label: "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/machinaris/1.1.1/templates/coins-deployment.yaml → charts/machinaris/1.1.2/templates/coins-deployment.yaml

@@ -34,7 +34,7 @@ spec:
             - name: extrappvolume-{{ $index }}
               mountPath: {{ $hostPathConfiguration.mountPath }}
           {{ end }}
-          {{ include "allEnvironmentVariables" (dict "defaultEnv" (dict "TZ" $ref.Values.timezone "worker_address" $ref.Values.nodeIP "worker_api_port" $coin.apiPort "controller_api_port" $coin.apiPort "farmer_port" $coin.farmerPort "blockchains" $coinName "plots_dir" $ref.Values.appVolumeMounts.plots.mountPath "mode" "fullnode") "environmentVariables" $coin.environmentVariables) | nindent 10 }}
+          {{ include "allEnvironmentVariables" (dict "defaultEnv" (dict "TZ" $ref.Values.timezone "worker_address" $ref.Values.nodeIP "worker_api_port" $coin.apiPort "controller_host" $ref.Values.nodeIP "controller_api_port" $ref.Values.apiPort "farmer_port" $coin.farmerPort "blockchains" $coinName "plots_dir" $ref.Values.appVolumeMounts.plots.mountPath "mode" "fullnode") "environmentVariables" $coin.environmentVariables) | nindent 10 }}
       volumes: {{ include "common.storage.configureAppVolumes" (dict "appVolumeMounts" $coin.volumeMounts "ixVolumes" $ref.Values.ixVolumes) | nindent 8 }}
       {{ range $index, $hostPathConfiguration := $ref.Values.extraAppVolumeMounts }}
         - name: extrappvolume-{{ $coinName }}-{{ $index }}

test/machinaris/1.1.1/Chart.yaml → test/machinaris/1.1.2/Chart.yaml

@@ -14,4 +14,4 @@ keywords:
 name: machinaris
 sources:
 - https://github.com/guydavis/machinaris
-version: 1.1.1
+version: 1.1.2

charts/machinaris/1.1.1/README.md → test/machinaris/1.1.2/README.md

@@ -3,7 +3,7 @@ Machinaris
 
 [MACHINARIS](https://github.com/guydavis/machinaris) is an easy-to-use WebUI for Chia plotting and farming. This includes Chia, Plotman, MadMax, Chiadog under main node along with various coin-forks which can be enabled conditionally.
 
-Coins include Cactus, Chives, CrypoDoge, Flax, Flora, HDDCoin, Maize, NChain, StaiCoin, Stor and BTCGreen.
+Coins include Cactus, Chives, CrypoDoge, Flax, Flora, HDDCoin, Maize, NChain, StaiCoin, Stor, BTCGreen and Shibgreen.
 
 Introduction
 ------------
@@ -68,4 +68,4 @@ Following are the Volume Configurations for Machinaris main node & the coin-fork
 | 	`plotting`           |  `<ix-volumes>/plotting`                              | `/plotting`             | Plotting temp volume for main node & coin forks |
 | 	`<coinName>-config`  |  `<ix-volumes>/<coinName>-config`                     | `/root/.chia`           | Chia config for each of the coin-fork containers|
 
-Where `<ix-volumes>` is `/mnt/<pool_name>/ix-applications/releases/<application_name>/volumes/ix_volumes/` and `<coinName>` is one of the following: `[ cactus, chives, crypodoge, flax, flora, hddcoin, maize, nchain, staicoin, stor, btcgreen ]`.
+Where `<ix-volumes>` is `/mnt/<pool_name>/ix-applications/releases/<application_name>/volumes/ix_volumes/` and `<coinName>` is one of the following: `[ cactus, chives, crypodoge, flax, flora, hddcoin, maize, nchain, staicoin, stor, btcgreen, shibgreen ]`.

test/machinaris/1.1.1/app-readme.md → test/machinaris/1.1.2/app-readme.md

@@ -3,7 +3,7 @@ Machinaris
 
 [MACHINARIS](https://github.com/guydavis/machinaris) is an easy-to-use WebUI for Chia plotting and farming. This includes Chia, Plotman, MadMax, Chiadog under main node along with various coin-forks which can be enabled conditionally.
 
-Coins include Cactus, Chives, CrypoDoge, Flax, Flora, HDDCoin, Maize, NChain, StaiCoin, Stor and BTCGreen.
+Coins include Cactus, Chives, CrypoDoge, Flax, Flora, HDDCoin, Maize, NChain, StaiCoin, Stor, BTCGreen and Shibgreen.
 
 # Machinaris Defaults
 This section contains information about the defaults of Machinaris application for visibility.
@@ -63,4 +63,4 @@ Following are the Volume Configurations for Machinaris main node & the coin-fork
 | 	`plotting`           |  `<ix-volumes>/plotting`                              | `/plotting`             | Plotting temp volume for main node & coin forks |
 | 	`<coinName>-config`  |  `<ix-volumes>/<coinName>-config`                     | `/root/.chia`           | Chia config for each of the coin-fork containers|
 
-Where `<ix-volumes>` is `/mnt/<pool_name>/ix-applications/releases/<application_name>/volumes/ix_volumes/` and `<coinName>` is one of the following: `[ cactus, chives, crypodoge, flax, flora, hddcoin, maize, nchain, staicoin, stor, btcgreen ]`.
+Where `<ix-volumes>` is `/mnt/<pool_name>/ix-applications/releases/<application_name>/volumes/ix_volumes/` and `<coinName>` is one of the following: `[ cactus, chives, crypodoge, flax, flora, hddcoin, maize, nchain, staicoin, stor, btcgreen, shibgreen ]`.

charts/machinaris/1.1.1/ix_values.yaml → test/machinaris/1.1.2/ix_values.yaml

@@ -53,6 +53,7 @@ coins:
 - staicoin
 - stor
 - btcgreen
+- shibgreen
 cryptodoge:
   apiPort: 8937
   farmerPort: 16895
@@ -178,4 +179,17 @@ stor:
   - containerPort: 8337
     name: farming
     protocol: TCP
+shibgreen:
+  apiPort: 8939
+  farmerPort: 18974
+  ports:
+  - containerPort: 8939
+    name: api
+    protocol: TCP
+  - containerPort: 7442
+    name: blockchain
+    protocol: TCP
+  - containerPort: 18974
+    name: farming
+    protocol: TCP
 updateStrategy: Recreate

test/machinaris/1.1.1/questions.yaml → test/machinaris/1.1.2/questions.yaml

@@ -1621,3 +1621,128 @@ questions:
                             label: "Value"
                             schema:
                               type: string
+# Shibgreen Configurations
+  - variable: shibgreenEnabled
+    label: "Enable Shibgreen"
+    group: "Configure Coins"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: shibgreen
+          label: "Configure Shibgreen"
+          schema:
+            type: dict
+            additional_attrs: true
+            attrs:
+              - variable: volumeMounts
+                label: "Storage Configurations"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: config
+                      label: "Configuration Volume"
+                      schema:
+                        type: dict
+                        attrs:
+                          - variable: datasetName
+                            label: "Configuration Volume Dataset Name"
+                            schema:
+                              type: string
+                              hidden: true
+                              $ref:
+                                - "normalize/ixVolume"
+                              show_if: [["hostPathEnabled", "=", false]]
+                              default: "shibgreen-config"
+                              editable: false
+                          - variable: mountPath
+                            label: "Configuration Mount Path"
+                            description: "Path where the volume will be mounted inside the pod"
+                            schema:
+                              type: path
+                              hidden: true
+                              editable: false
+                              default: "/root/.chia"
+                          - variable: hostPathEnabled
+                            label: "Enable Custom Host Path for Configuration Volume"
+                            schema:
+                              type: boolean
+                              default: false
+                              show_subquestions_if: true
+                              subquestions:
+                                - variable: hostPath
+                                  label: "Host Path for Configuration Volume"
+                                  schema:
+                                    type: hostpath
+                                    required: true
+                    - variable: mnemonic
+                      label: "Mnemonic Volume"
+                      schema:
+                        type: dict
+                        attrs:
+                          - variable: datasetName
+                            label: "Mnemonic Volume Dataset Name"
+                            schema:
+                              type: string
+                              hidden: true
+                              $ref:
+                                - "normalize/ixVolume"
+                              show_if: [["hostPathEnabled", "=", false]]
+                              default: "config"
+                              editable: false
+                          - variable: mountPath
+                            label: "Mnemonic Mount Path"
+                            description: "Path where the volume will be mounted inside the pod"
+                            schema:
+                              type: path
+                              hidden: true
+                              editable: false
+                              default: "/root/.chia/mnemonic.txt"
+                          - variable: subPath
+                            label: "Subpath in the Dataset"
+                            schema:
+                              type: string
+                              hidden: true
+                              show_if: [["hostPathEnabled", "=", false]]
+                              default: "mnemonic.txt"
+                              editable: false
+                          - variable: readOnly
+                            label: "Mode"
+                            description: "Mnemonic file mode"
+                            schema:
+                              type: boolean
+                              hidden: true
+                              editable: false
+                              default: true
+                          - variable: hostPathEnabled
+                            label: "Enable Custom Host Path for Mnemonic Volume"
+                            schema:
+                              type: boolean
+                              default: false
+                              show_subquestions_if: true
+                              subquestions:
+                                - variable: hostPath
+                                  label: "Host Path for Mnemonic Volume"
+                                  schema:
+                                    type: hostpath
+                                    required: true
+              - variable: environmentVariables
+                label: "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/machinaris/1.1.1/templates/coins-deployment.yaml → test/machinaris/1.1.2/templates/coins-deployment.yaml

@@ -34,7 +34,7 @@ spec:
             - name: extrappvolume-{{ $index }}
               mountPath: {{ $hostPathConfiguration.mountPath }}
           {{ end }}
-          {{ include "allEnvironmentVariables" (dict "defaultEnv" (dict "TZ" $ref.Values.timezone "worker_address" $ref.Values.nodeIP "worker_api_port" $coin.apiPort "controller_api_port" $coin.apiPort "farmer_port" $coin.farmerPort "blockchains" $coinName "plots_dir" $ref.Values.appVolumeMounts.plots.mountPath "mode" "fullnode") "environmentVariables" $coin.environmentVariables) | nindent 10 }}
+          {{ include "allEnvironmentVariables" (dict "defaultEnv" (dict "TZ" $ref.Values.timezone "worker_address" $ref.Values.nodeIP "worker_api_port" $coin.apiPort "controller_host" $ref.Values.nodeIP "controller_api_port" $ref.Values.apiPort "farmer_port" $coin.farmerPort "blockchains" $coinName "plots_dir" $ref.Values.appVolumeMounts.plots.mountPath "mode" "fullnode") "environmentVariables" $coin.environmentVariables) | nindent 10 }}
       volumes: {{ include "common.storage.configureAppVolumes" (dict "appVolumeMounts" $coin.volumeMounts "ixVolumes" $ref.Values.ixVolumes) | nindent 8 }}
       {{ range $index, $hostPathConfiguration := $ref.Values.extraAppVolumeMounts }}
         - name: extrappvolume-{{ $coinName }}-{{ $index }}