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/test/chia/1.0.0/ix_values.yaml b/charts/chia/1.1.0/ix_values.yaml similarity index 62% rename from test/chia/1.0.0/ix_values.yaml rename to charts/chia/1.1.0/ix_values.yaml index 1cbd7c5739..0c663f6714 100644 --- a/test/chia/1.0.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/test/chia/1.0.0/questions.yaml b/charts/chia/1.1.0/questions.yaml similarity index 65% rename from test/chia/1.0.0/questions.yaml rename to charts/chia/1.1.0/questions.yaml index 94b89a084e..1a56f3d2cb 100644 --- a/test/chia/1.0.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 @@ -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/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/test/chia/1.0.0/templates/deployment.yaml b/charts/chia/1.1.0/templates/deployment.yaml similarity index 50% rename from test/chia/1.0.0/templates/deployment.yaml rename to charts/chia/1.1.0/templates/deployment.yaml index abd836d571..7b3147b199 100644 --- a/test/chia/1.0.0/templates/deployment.yaml +++ b/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 }} 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 78% rename from charts/chia/1.0.0/test_values.yaml rename to charts/chia/1.1.0/test_values.yaml index ed048e39f3..b2fd50d602 100644 --- a/charts/chia/1.0.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: 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 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 6a406ffcec..0000000000 Binary files a/test/chia/1.0.0/charts/common-2105.0.0.tgz and /dev/null differ diff --git a/test/chia/1.0.0/.helmignore b/test/chia/1.1.0/.helmignore similarity index 100% rename from test/chia/1.0.0/.helmignore rename to test/chia/1.1.0/.helmignore diff --git a/test/chia/1.0.0/Chart.yaml b/test/chia/1.1.0/Chart.yaml similarity index 96% rename from test/chia/1.0.0/Chart.yaml rename to test/chia/1.1.0/Chart.yaml index 070995e077..949784f92c 100644 --- a/test/chia/1.0.0/Chart.yaml +++ b/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 diff --git a/test/chia/1.0.0/README.md b/test/chia/1.1.0/README.md similarity index 100% rename from test/chia/1.0.0/README.md rename to test/chia/1.1.0/README.md diff --git a/test/chia/1.0.0/app-readme.md b/test/chia/1.1.0/app-readme.md similarity index 100% rename from test/chia/1.0.0/app-readme.md rename to test/chia/1.1.0/app-readme.md diff --git a/test/chia/1.1.0/charts/common-2105.0.0.tgz b/test/chia/1.1.0/charts/common-2105.0.0.tgz new file mode 100644 index 0000000000..ef6f820efb Binary files /dev/null and b/test/chia/1.1.0/charts/common-2105.0.0.tgz differ 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/charts/chia/1.0.0/ix_values.yaml b/test/chia/1.1.0/ix_values.yaml similarity index 62% rename from charts/chia/1.0.0/ix_values.yaml rename to test/chia/1.1.0/ix_values.yaml index 1cbd7c5739..0c663f6714 100644 --- a/charts/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/charts/chia/1.0.0/questions.yaml b/test/chia/1.1.0/questions.yaml similarity index 65% rename from charts/chia/1.0.0/questions.yaml rename to test/chia/1.1.0/questions.yaml index 94b89a084e..1a56f3d2cb 100644 --- a/charts/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/charts/chia/1.0.0/templates/deployment.yaml b/test/chia/1.1.0/templates/deployment.yaml similarity index 50% rename from charts/chia/1.0.0/templates/deployment.yaml rename to test/chia/1.1.0/templates/deployment.yaml index abd836d571..7b3147b199 100644 --- a/charts/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