From 23006c60d242c072995eb384a6e97c24dc25984f Mon Sep 17 00:00:00 2001 From: sonicaj Date: Wed, 7 Jul 2021 21:58:28 +0500 Subject: [PATCH 1/4] Update chia item version --- test/chia/{1.2.2 => 1.3.0}/.helmignore | 0 test/chia/{1.2.2 => 1.3.0}/Chart.yaml | 2 +- test/chia/{1.2.2 => 1.3.0}/README.md | 0 test/chia/{1.2.2 => 1.3.0}/app-readme.md | 0 .../{1.2.2 => 1.3.0}/charts/common-2105.0.0.tgz | Bin test/chia/{1.2.2 => 1.3.0}/default_values.yaml | 0 test/chia/{1.2.2 => 1.3.0}/ix_values.yaml | 0 test/chia/{1.2.2 => 1.3.0}/questions.yaml | 0 test/chia/{1.2.2 => 1.3.0}/requirements.lock | 0 .../chia/{1.2.2 => 1.3.0}/templates/deployment.yaml | 0 .../templates/generate-mnemonic.yaml | 0 .../templates/mnemonic-configmap.yaml | 0 test/chia/{1.2.2 => 1.3.0}/test_values.yaml | 0 test/chia/{1.2.2 => 1.3.0}/values.yaml | 0 14 files changed, 1 insertion(+), 1 deletion(-) rename test/chia/{1.2.2 => 1.3.0}/.helmignore (100%) rename test/chia/{1.2.2 => 1.3.0}/Chart.yaml (96%) rename test/chia/{1.2.2 => 1.3.0}/README.md (100%) rename test/chia/{1.2.2 => 1.3.0}/app-readme.md (100%) rename test/chia/{1.2.2 => 1.3.0}/charts/common-2105.0.0.tgz (100%) rename test/chia/{1.2.2 => 1.3.0}/default_values.yaml (100%) rename test/chia/{1.2.2 => 1.3.0}/ix_values.yaml (100%) rename test/chia/{1.2.2 => 1.3.0}/questions.yaml (100%) rename test/chia/{1.2.2 => 1.3.0}/requirements.lock (100%) rename test/chia/{1.2.2 => 1.3.0}/templates/deployment.yaml (100%) rename test/chia/{1.2.2 => 1.3.0}/templates/generate-mnemonic.yaml (100%) rename test/chia/{1.2.2 => 1.3.0}/templates/mnemonic-configmap.yaml (100%) rename test/chia/{1.2.2 => 1.3.0}/test_values.yaml (100%) rename test/chia/{1.2.2 => 1.3.0}/values.yaml (100%) diff --git a/test/chia/1.2.2/.helmignore b/test/chia/1.3.0/.helmignore similarity index 100% rename from test/chia/1.2.2/.helmignore rename to test/chia/1.3.0/.helmignore diff --git a/test/chia/1.2.2/Chart.yaml b/test/chia/1.3.0/Chart.yaml similarity index 96% rename from test/chia/1.2.2/Chart.yaml rename to test/chia/1.3.0/Chart.yaml index 5c2d6dc2af..eb805c2cf9 100644 --- a/test/chia/1.2.2/Chart.yaml +++ b/test/chia/1.3.0/Chart.yaml @@ -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 diff --git a/test/chia/1.2.2/README.md b/test/chia/1.3.0/README.md similarity index 100% rename from test/chia/1.2.2/README.md rename to test/chia/1.3.0/README.md diff --git a/test/chia/1.2.2/app-readme.md b/test/chia/1.3.0/app-readme.md similarity index 100% rename from test/chia/1.2.2/app-readme.md rename to test/chia/1.3.0/app-readme.md diff --git a/test/chia/1.2.2/charts/common-2105.0.0.tgz b/test/chia/1.3.0/charts/common-2105.0.0.tgz similarity index 100% rename from test/chia/1.2.2/charts/common-2105.0.0.tgz rename to test/chia/1.3.0/charts/common-2105.0.0.tgz diff --git a/test/chia/1.2.2/default_values.yaml b/test/chia/1.3.0/default_values.yaml similarity index 100% rename from test/chia/1.2.2/default_values.yaml rename to test/chia/1.3.0/default_values.yaml diff --git a/test/chia/1.2.2/ix_values.yaml b/test/chia/1.3.0/ix_values.yaml similarity index 100% rename from test/chia/1.2.2/ix_values.yaml rename to test/chia/1.3.0/ix_values.yaml diff --git a/test/chia/1.2.2/questions.yaml b/test/chia/1.3.0/questions.yaml similarity index 100% rename from test/chia/1.2.2/questions.yaml rename to test/chia/1.3.0/questions.yaml diff --git a/test/chia/1.2.2/requirements.lock b/test/chia/1.3.0/requirements.lock similarity index 100% rename from test/chia/1.2.2/requirements.lock rename to test/chia/1.3.0/requirements.lock diff --git a/test/chia/1.2.2/templates/deployment.yaml b/test/chia/1.3.0/templates/deployment.yaml similarity index 100% rename from test/chia/1.2.2/templates/deployment.yaml rename to test/chia/1.3.0/templates/deployment.yaml diff --git a/test/chia/1.2.2/templates/generate-mnemonic.yaml b/test/chia/1.3.0/templates/generate-mnemonic.yaml similarity index 100% rename from test/chia/1.2.2/templates/generate-mnemonic.yaml rename to test/chia/1.3.0/templates/generate-mnemonic.yaml diff --git a/test/chia/1.2.2/templates/mnemonic-configmap.yaml b/test/chia/1.3.0/templates/mnemonic-configmap.yaml similarity index 100% rename from test/chia/1.2.2/templates/mnemonic-configmap.yaml rename to test/chia/1.3.0/templates/mnemonic-configmap.yaml diff --git a/test/chia/1.2.2/test_values.yaml b/test/chia/1.3.0/test_values.yaml similarity index 100% rename from test/chia/1.2.2/test_values.yaml rename to test/chia/1.3.0/test_values.yaml diff --git a/test/chia/1.2.2/values.yaml b/test/chia/1.3.0/values.yaml similarity index 100% rename from test/chia/1.2.2/values.yaml rename to test/chia/1.3.0/values.yaml From 22fa989faf2c73c74c1bb61d9c4151fbc9c78125 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Wed, 7 Jul 2021 22:01:33 +0500 Subject: [PATCH 2/4] Update chia docker image tag to use ix docker image --- test/chia/1.3.0/Chart.yaml | 2 +- test/chia/1.3.0/ix_values.yaml | 4 ++-- test/chia/1.3.0/questions.yaml | 10 ++++++++++ test/chia/1.3.0/test_values.yaml | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/test/chia/1.3.0/Chart.yaml b/test/chia/1.3.0/Chart.yaml index eb805c2cf9..eab9227883 100644 --- a/test/chia/1.3.0/Chart.yaml +++ b/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 diff --git a/test/chia/1.3.0/ix_values.yaml b/test/chia/1.3.0/ix_values.yaml index acac381046..f470c21a09 100644 --- a/test/chia/1.3.0/ix_values.yaml +++ b/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 diff --git a/test/chia/1.3.0/questions.yaml b/test/chia/1.3.0/questions.yaml index 1a56f3d2cb..c9a9065b25 100644 --- a/test/chia/1.3.0/questions.yaml +++ b/test/chia/1.3.0/questions.yaml @@ -4,6 +4,16 @@ groups: - 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: appVolumeMounts label: "Chia Storage" diff --git a/test/chia/1.3.0/test_values.yaml b/test/chia/1.3.0/test_values.yaml index e53da72e9c..d8b7b3a28f 100644 --- a/test/chia/1.3.0/test_values.yaml +++ b/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 From e8a6ed8abb08483de97b9a9c6a3a5e49f92ba0e9 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Wed, 7 Jul 2021 22:07:34 +0500 Subject: [PATCH 3/4] Allow configuring farmr env variable --- test/chia/1.3.0/questions.yaml | 18 +++++++++++++++++- test/chia/1.3.0/templates/deployment.yaml | 1 + test/chia/1.3.0/test_values.yaml | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/test/chia/1.3.0/questions.yaml b/test/chia/1.3.0/questions.yaml index c9a9065b25..6601a6f787 100644 --- a/test/chia/1.3.0/questions.yaml +++ b/test/chia/1.3.0/questions.yaml @@ -1,6 +1,8 @@ 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" @@ -11,10 +13,24 @@ portals: host: - "www.truepool.io" ports: - - 443 + - "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" diff --git a/test/chia/1.3.0/templates/deployment.yaml b/test/chia/1.3.0/templates/deployment.yaml index 7b3147b199..83eb2a02c6 100644 --- a/test/chia/1.3.0/templates/deployment.yaml +++ b/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 }} diff --git a/test/chia/1.3.0/test_values.yaml b/test/chia/1.3.0/test_values.yaml index d8b7b3a28f..15e6b6b278 100644 --- a/test/chia/1.3.0/test_values.yaml +++ b/test/chia/1.3.0/test_values.yaml @@ -11,3 +11,5 @@ appVolumeMounts: data: emptyDir: true mountPath: "/root/.chia" + +farmr_env: "off" From fddfc839bec0c5b70e36fb788867e30213812879 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Wed, 7 Jul 2021 22:28:14 +0500 Subject: [PATCH 4/4] Update charts train from test train --- charts/chia/{1.2.2 => 1.3.0}/.helmignore | 0 charts/chia/{1.2.2 => 1.3.0}/Chart.yaml | 4 +-- charts/chia/{1.2.2 => 1.3.0}/README.md | 0 charts/chia/{1.2.2 => 1.3.0}/app-readme.md | 0 .../charts/common-2105.0.0.tgz | Bin .../chia/{1.2.2 => 1.3.0}/default_values.yaml | 0 charts/chia/{1.2.2 => 1.3.0}/ix_values.yaml | 4 +-- charts/chia/{1.2.2 => 1.3.0}/questions.yaml | 26 ++++++++++++++++++ .../chia/{1.2.2 => 1.3.0}/requirements.lock | 0 .../templates/deployment.yaml | 1 + .../templates/generate-mnemonic.yaml | 0 .../templates/mnemonic-configmap.yaml | 0 charts/chia/{1.2.2 => 1.3.0}/test_values.yaml | 6 ++-- charts/chia/{1.2.2 => 1.3.0}/values.yaml | 0 14 files changed, 35 insertions(+), 6 deletions(-) rename charts/chia/{1.2.2 => 1.3.0}/.helmignore (100%) rename charts/chia/{1.2.2 => 1.3.0}/Chart.yaml (91%) rename charts/chia/{1.2.2 => 1.3.0}/README.md (100%) rename charts/chia/{1.2.2 => 1.3.0}/app-readme.md (100%) rename charts/chia/{1.2.2 => 1.3.0}/charts/common-2105.0.0.tgz (100%) rename charts/chia/{1.2.2 => 1.3.0}/default_values.yaml (100%) rename charts/chia/{1.2.2 => 1.3.0}/ix_values.yaml (52%) rename charts/chia/{1.2.2 => 1.3.0}/questions.yaml (87%) rename charts/chia/{1.2.2 => 1.3.0}/requirements.lock (100%) rename charts/chia/{1.2.2 => 1.3.0}/templates/deployment.yaml (95%) rename charts/chia/{1.2.2 => 1.3.0}/templates/generate-mnemonic.yaml (100%) rename charts/chia/{1.2.2 => 1.3.0}/templates/mnemonic-configmap.yaml (100%) rename charts/chia/{1.2.2 => 1.3.0}/test_values.yaml (72%) rename charts/chia/{1.2.2 => 1.3.0}/values.yaml (100%) diff --git a/charts/chia/1.2.2/.helmignore b/charts/chia/1.3.0/.helmignore similarity index 100% rename from charts/chia/1.2.2/.helmignore rename to charts/chia/1.3.0/.helmignore diff --git a/charts/chia/1.2.2/Chart.yaml b/charts/chia/1.3.0/Chart.yaml similarity index 91% rename from charts/chia/1.2.2/Chart.yaml rename to charts/chia/1.3.0/Chart.yaml index 5c2d6dc2af..eab9227883 100644 --- a/charts/chia/1.2.2/Chart.yaml +++ b/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 diff --git a/charts/chia/1.2.2/README.md b/charts/chia/1.3.0/README.md similarity index 100% rename from charts/chia/1.2.2/README.md rename to charts/chia/1.3.0/README.md diff --git a/charts/chia/1.2.2/app-readme.md b/charts/chia/1.3.0/app-readme.md similarity index 100% rename from charts/chia/1.2.2/app-readme.md rename to charts/chia/1.3.0/app-readme.md diff --git a/charts/chia/1.2.2/charts/common-2105.0.0.tgz b/charts/chia/1.3.0/charts/common-2105.0.0.tgz similarity index 100% rename from charts/chia/1.2.2/charts/common-2105.0.0.tgz rename to charts/chia/1.3.0/charts/common-2105.0.0.tgz diff --git a/charts/chia/1.2.2/default_values.yaml b/charts/chia/1.3.0/default_values.yaml similarity index 100% rename from charts/chia/1.2.2/default_values.yaml rename to charts/chia/1.3.0/default_values.yaml diff --git a/charts/chia/1.2.2/ix_values.yaml b/charts/chia/1.3.0/ix_values.yaml similarity index 52% rename from charts/chia/1.2.2/ix_values.yaml rename to charts/chia/1.3.0/ix_values.yaml index acac381046..f470c21a09 100644 --- a/charts/chia/1.2.2/ix_values.yaml +++ b/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 diff --git a/charts/chia/1.2.2/questions.yaml b/charts/chia/1.3.0/questions.yaml similarity index 87% rename from charts/chia/1.2.2/questions.yaml rename to charts/chia/1.3.0/questions.yaml index 1a56f3d2cb..6601a6f787 100644 --- a/charts/chia/1.2.2/questions.yaml +++ b/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" diff --git a/charts/chia/1.2.2/requirements.lock b/charts/chia/1.3.0/requirements.lock similarity index 100% rename from charts/chia/1.2.2/requirements.lock rename to charts/chia/1.3.0/requirements.lock diff --git a/charts/chia/1.2.2/templates/deployment.yaml b/charts/chia/1.3.0/templates/deployment.yaml similarity index 95% rename from charts/chia/1.2.2/templates/deployment.yaml rename to charts/chia/1.3.0/templates/deployment.yaml index 7b3147b199..83eb2a02c6 100644 --- a/charts/chia/1.2.2/templates/deployment.yaml +++ b/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 }} diff --git a/charts/chia/1.2.2/templates/generate-mnemonic.yaml b/charts/chia/1.3.0/templates/generate-mnemonic.yaml similarity index 100% rename from charts/chia/1.2.2/templates/generate-mnemonic.yaml rename to charts/chia/1.3.0/templates/generate-mnemonic.yaml diff --git a/charts/chia/1.2.2/templates/mnemonic-configmap.yaml b/charts/chia/1.3.0/templates/mnemonic-configmap.yaml similarity index 100% rename from charts/chia/1.2.2/templates/mnemonic-configmap.yaml rename to charts/chia/1.3.0/templates/mnemonic-configmap.yaml diff --git a/charts/chia/1.2.2/test_values.yaml b/charts/chia/1.3.0/test_values.yaml similarity index 72% rename from charts/chia/1.2.2/test_values.yaml rename to charts/chia/1.3.0/test_values.yaml index e53da72e9c..15e6b6b278 100644 --- a/charts/chia/1.2.2/test_values.yaml +++ b/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" diff --git a/charts/chia/1.2.2/values.yaml b/charts/chia/1.3.0/values.yaml similarity index 100% rename from charts/chia/1.2.2/values.yaml rename to charts/chia/1.3.0/values.yaml