From 1a5f164d58155b72aa870e8f40c658400d19b856 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 17 May 2021 17:33:49 +0500 Subject: [PATCH 1/4] Bump chia app version --- charts/chia/{1.0.0 => 1.1.0}/.helmignore | 0 charts/chia/{1.0.0 => 1.1.0}/Chart.yaml | 2 +- charts/chia/{1.0.0 => 1.1.0}/README.md | 0 charts/chia/{1.0.0 => 1.1.0}/app-readme.md | 0 .../{1.0.0 => 1.1.0}/charts/common-2104.0.0.tgz | Bin charts/chia/{1.0.0 => 1.1.0}/default_values.yaml | 0 charts/chia/{1.0.0 => 1.1.0}/ix_values.yaml | 0 charts/chia/{1.0.0 => 1.1.0}/questions.yaml | 0 charts/chia/{1.0.0 => 1.1.0}/requirements.lock | 0 .../chia/{1.0.0 => 1.1.0}/templates/deployment.yaml | 0 .../templates/generate-mnemonic.yaml | 0 .../templates/mnemonic-configmap.yaml | 0 charts/chia/{1.0.0 => 1.1.0}/test_values.yaml | 0 charts/chia/{1.0.0 => 1.1.0}/values.yaml | 0 14 files changed, 1 insertion(+), 1 deletion(-) rename charts/chia/{1.0.0 => 1.1.0}/.helmignore (100%) rename charts/chia/{1.0.0 => 1.1.0}/Chart.yaml (96%) rename charts/chia/{1.0.0 => 1.1.0}/README.md (100%) rename charts/chia/{1.0.0 => 1.1.0}/app-readme.md (100%) rename charts/chia/{1.0.0 => 1.1.0}/charts/common-2104.0.0.tgz (100%) rename charts/chia/{1.0.0 => 1.1.0}/default_values.yaml (100%) rename charts/chia/{1.0.0 => 1.1.0}/ix_values.yaml (100%) rename charts/chia/{1.0.0 => 1.1.0}/questions.yaml (100%) rename charts/chia/{1.0.0 => 1.1.0}/requirements.lock (100%) rename charts/chia/{1.0.0 => 1.1.0}/templates/deployment.yaml (100%) rename charts/chia/{1.0.0 => 1.1.0}/templates/generate-mnemonic.yaml (100%) rename charts/chia/{1.0.0 => 1.1.0}/templates/mnemonic-configmap.yaml (100%) rename charts/chia/{1.0.0 => 1.1.0}/test_values.yaml (100%) rename charts/chia/{1.0.0 => 1.1.0}/values.yaml (100%) diff --git a/charts/chia/1.0.0/.helmignore b/charts/chia/1.1.0/.helmignore similarity index 100% rename from charts/chia/1.0.0/.helmignore rename to charts/chia/1.1.0/.helmignore diff --git a/charts/chia/1.0.0/Chart.yaml b/charts/chia/1.1.0/Chart.yaml similarity index 96% rename from charts/chia/1.0.0/Chart.yaml rename to charts/chia/1.1.0/Chart.yaml index ad2b94a969..d869641866 100644 --- a/charts/chia/1.0.0/Chart.yaml +++ b/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 diff --git a/charts/chia/1.0.0/README.md b/charts/chia/1.1.0/README.md similarity index 100% rename from charts/chia/1.0.0/README.md rename to charts/chia/1.1.0/README.md diff --git a/charts/chia/1.0.0/app-readme.md b/charts/chia/1.1.0/app-readme.md similarity index 100% rename from charts/chia/1.0.0/app-readme.md rename to charts/chia/1.1.0/app-readme.md diff --git a/charts/chia/1.0.0/charts/common-2104.0.0.tgz b/charts/chia/1.1.0/charts/common-2104.0.0.tgz similarity index 100% rename from charts/chia/1.0.0/charts/common-2104.0.0.tgz rename to charts/chia/1.1.0/charts/common-2104.0.0.tgz diff --git a/charts/chia/1.0.0/default_values.yaml b/charts/chia/1.1.0/default_values.yaml similarity index 100% rename from charts/chia/1.0.0/default_values.yaml rename to charts/chia/1.1.0/default_values.yaml diff --git a/charts/chia/1.0.0/ix_values.yaml b/charts/chia/1.1.0/ix_values.yaml similarity index 100% rename from charts/chia/1.0.0/ix_values.yaml rename to charts/chia/1.1.0/ix_values.yaml diff --git a/charts/chia/1.0.0/questions.yaml b/charts/chia/1.1.0/questions.yaml similarity index 100% rename from charts/chia/1.0.0/questions.yaml rename to charts/chia/1.1.0/questions.yaml diff --git a/charts/chia/1.0.0/requirements.lock b/charts/chia/1.1.0/requirements.lock similarity index 100% rename from charts/chia/1.0.0/requirements.lock rename to charts/chia/1.1.0/requirements.lock diff --git a/charts/chia/1.0.0/templates/deployment.yaml b/charts/chia/1.1.0/templates/deployment.yaml similarity index 100% rename from charts/chia/1.0.0/templates/deployment.yaml rename to charts/chia/1.1.0/templates/deployment.yaml diff --git a/charts/chia/1.0.0/templates/generate-mnemonic.yaml b/charts/chia/1.1.0/templates/generate-mnemonic.yaml similarity index 100% rename from charts/chia/1.0.0/templates/generate-mnemonic.yaml rename to charts/chia/1.1.0/templates/generate-mnemonic.yaml diff --git a/charts/chia/1.0.0/templates/mnemonic-configmap.yaml b/charts/chia/1.1.0/templates/mnemonic-configmap.yaml similarity index 100% rename from charts/chia/1.0.0/templates/mnemonic-configmap.yaml rename to charts/chia/1.1.0/templates/mnemonic-configmap.yaml diff --git a/charts/chia/1.0.0/test_values.yaml b/charts/chia/1.1.0/test_values.yaml similarity index 100% rename from charts/chia/1.0.0/test_values.yaml rename to charts/chia/1.1.0/test_values.yaml diff --git a/charts/chia/1.0.0/values.yaml b/charts/chia/1.1.0/values.yaml similarity index 100% rename from charts/chia/1.0.0/values.yaml rename to charts/chia/1.1.0/values.yaml From 624e33baa49e7dd01e0decce28ae4c56302d3d79 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 17 May 2021 17:53:42 +0500 Subject: [PATCH 2/4] Allow specifying host path volumes for chia app --- charts/chia/1.1.0/questions.yaml | 25 +++++++++++++++++++++ charts/chia/1.1.0/templates/deployment.yaml | 13 +++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/charts/chia/1.1.0/questions.yaml b/charts/chia/1.1.0/questions.yaml index 94b89a084e..30fd657aeb 100644 --- a/charts/chia/1.1.0/questions.yaml +++ b/charts/chia/1.1.0/questions.yaml @@ -79,3 +79,28 @@ 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 diff --git a/charts/chia/1.1.0/templates/deployment.yaml b/charts/chia/1.1.0/templates/deployment.yaml index abd836d571..e47a45386b 100644 --- a/charts/chia/1.1.0/templates/deployment.yaml +++ b/charts/chia/1.1.0/templates/deployment.yaml @@ -18,11 +18,20 @@ 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 }} + volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }} + {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} + - name: extrappvolume-{{ $index }} + hostPath: + path: {{ $hostPathConfiguration.hostPath }} + {{ end }} From baad4254e47e0729b730f2746e0ebd28de5c3d9f Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 17 May 2021 18:03:51 +0500 Subject: [PATCH 3/4] Allow specifying environment variables for chia --- charts/chia/1.1.0/ix_values.yaml | 3 --- charts/chia/1.1.0/questions.yaml | 23 +++++++++++++++++++++ charts/chia/1.1.0/templates/deployment.yaml | 4 +++- charts/chia/1.1.0/test_values.yaml | 3 --- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/charts/chia/1.1.0/ix_values.yaml b/charts/chia/1.1.0/ix_values.yaml index 1cbd7c5739..0c663f6714 100644 --- a/charts/chia/1.1.0/ix_values.yaml +++ b/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" diff --git a/charts/chia/1.1.0/questions.yaml b/charts/chia/1.1.0/questions.yaml index 30fd657aeb..1a56f3d2cb 100644 --- a/charts/chia/1.1.0/questions.yaml +++ b/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 @@ -104,3 +106,24 @@ questions: 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 diff --git a/charts/chia/1.1.0/templates/deployment.yaml b/charts/chia/1.1.0/templates/deployment.yaml index e47a45386b..7b3147b199 100644 --- a/charts/chia/1.1.0/templates/deployment.yaml +++ b/charts/chia/1.1.0/templates/deployment.yaml @@ -28,7 +28,9 @@ spec: protocol: TCP containerPort: 8444 hostPort: 8444 -{{ include "common.containers.allEnvironmentVariables" .Values | nindent 10 }} + {{ $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 }} diff --git a/charts/chia/1.1.0/test_values.yaml b/charts/chia/1.1.0/test_values.yaml index ed048e39f3..b2fd50d602 100644 --- a/charts/chia/1.1.0/test_values.yaml +++ b/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: From 14578c89831ec97892c4f6e97fa64a6c551320a9 Mon Sep 17 00:00:00 2001 From: Waqar Ahmed Date: Mon, 17 May 2021 18:15:52 +0500 Subject: [PATCH 4/4] Bump chia app in test train --- test/chia/1.0.0/charts/common-2105.0.0.tgz | Bin 4289 -> 0 bytes test/chia/{1.0.0 => 1.1.0}/.helmignore | 0 test/chia/{1.0.0 => 1.1.0}/Chart.yaml | 2 +- test/chia/{1.0.0 => 1.1.0}/README.md | 0 test/chia/{1.0.0 => 1.1.0}/app-readme.md | 0 test/chia/1.1.0/charts/common-2105.0.0.tgz | Bin 0 -> 4288 bytes .../chia/{1.0.0 => 1.1.0}/default_values.yaml | 0 test/chia/{1.0.0 => 1.1.0}/ix_values.yaml | 3 -- test/chia/{1.0.0 => 1.1.0}/questions.yaml | 48 ++++++++++++++++++ test/chia/{1.0.0 => 1.1.0}/requirements.lock | 2 +- .../templates/deployment.yaml | 17 +++++-- .../templates/generate-mnemonic.yaml | 0 .../templates/mnemonic-configmap.yaml | 0 test/chia/{1.0.0 => 1.1.0}/test_values.yaml | 3 -- test/chia/{1.0.0 => 1.1.0}/values.yaml | 0 15 files changed, 64 insertions(+), 11 deletions(-) delete mode 100644 test/chia/1.0.0/charts/common-2105.0.0.tgz rename test/chia/{1.0.0 => 1.1.0}/.helmignore (100%) rename test/chia/{1.0.0 => 1.1.0}/Chart.yaml (96%) rename test/chia/{1.0.0 => 1.1.0}/README.md (100%) rename test/chia/{1.0.0 => 1.1.0}/app-readme.md (100%) create mode 100644 test/chia/1.1.0/charts/common-2105.0.0.tgz rename test/chia/{1.0.0 => 1.1.0}/default_values.yaml (100%) rename test/chia/{1.0.0 => 1.1.0}/ix_values.yaml (62%) rename test/chia/{1.0.0 => 1.1.0}/questions.yaml (65%) rename test/chia/{1.0.0 => 1.1.0}/requirements.lock (79%) rename test/chia/{1.0.0 => 1.1.0}/templates/deployment.yaml (50%) rename test/chia/{1.0.0 => 1.1.0}/templates/generate-mnemonic.yaml (100%) rename test/chia/{1.0.0 => 1.1.0}/templates/mnemonic-configmap.yaml (100%) rename test/chia/{1.0.0 => 1.1.0}/test_values.yaml (78%) rename test/chia/{1.0.0 => 1.1.0}/values.yaml (100%) diff --git a/test/chia/1.0.0/charts/common-2105.0.0.tgz b/test/chia/1.0.0/charts/common-2105.0.0.tgz deleted file mode 100644 index 6a406ffcec6572d62ae8c6dc3738a211b22477c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4289 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 j2w<*7Dc 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 literal 0 HcmV?d00001 diff --git a/test/chia/1.0.0/default_values.yaml b/test/chia/1.1.0/default_values.yaml similarity index 100% rename from test/chia/1.0.0/default_values.yaml rename to test/chia/1.1.0/default_values.yaml diff --git a/test/chia/1.0.0/ix_values.yaml b/test/chia/1.1.0/ix_values.yaml similarity index 62% rename from test/chia/1.0.0/ix_values.yaml rename to test/chia/1.1.0/ix_values.yaml index 1cbd7c5739..0c663f6714 100644 --- a/test/chia/1.0.0/ix_values.yaml +++ b/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" diff --git a/test/chia/1.0.0/questions.yaml b/test/chia/1.1.0/questions.yaml similarity index 65% rename from test/chia/1.0.0/questions.yaml rename to test/chia/1.1.0/questions.yaml index 94b89a084e..1a56f3d2cb 100644 --- a/test/chia/1.0.0/questions.yaml +++ b/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 diff --git a/test/chia/1.0.0/requirements.lock b/test/chia/1.1.0/requirements.lock similarity index 79% rename from test/chia/1.0.0/requirements.lock rename to test/chia/1.1.0/requirements.lock index 5bd5487858..eba13d88bf 100644 --- a/test/chia/1.0.0/requirements.lock +++ b/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" diff --git a/test/chia/1.0.0/templates/deployment.yaml b/test/chia/1.1.0/templates/deployment.yaml similarity index 50% rename from test/chia/1.0.0/templates/deployment.yaml rename to test/chia/1.1.0/templates/deployment.yaml index abd836d571..7b3147b199 100644 --- a/test/chia/1.0.0/templates/deployment.yaml +++ b/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 }} diff --git a/test/chia/1.0.0/templates/generate-mnemonic.yaml b/test/chia/1.1.0/templates/generate-mnemonic.yaml similarity index 100% rename from test/chia/1.0.0/templates/generate-mnemonic.yaml rename to test/chia/1.1.0/templates/generate-mnemonic.yaml diff --git a/test/chia/1.0.0/templates/mnemonic-configmap.yaml b/test/chia/1.1.0/templates/mnemonic-configmap.yaml similarity index 100% rename from test/chia/1.0.0/templates/mnemonic-configmap.yaml rename to test/chia/1.1.0/templates/mnemonic-configmap.yaml diff --git a/test/chia/1.0.0/test_values.yaml b/test/chia/1.1.0/test_values.yaml similarity index 78% rename from test/chia/1.0.0/test_values.yaml rename to test/chia/1.1.0/test_values.yaml index ed048e39f3..b2fd50d602 100644 --- a/test/chia/1.0.0/test_values.yaml +++ b/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: diff --git a/test/chia/1.0.0/values.yaml b/test/chia/1.1.0/values.yaml similarity index 100% rename from test/chia/1.0.0/values.yaml rename to test/chia/1.1.0/values.yaml