From cda05f36751c696d352efc24acf08dafcc3ba49f Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 3 Feb 2021 15:01:39 +0500
Subject: [PATCH] Standardize environment variable name in ipfs deployment

---
 test/ipfs/1.0.1/questions.yaml            | 12 ++++--------
 test/ipfs/1.0.1/templates/deployment.yaml |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/test/ipfs/1.0.1/questions.yaml b/test/ipfs/1.0.1/questions.yaml
index 38010ce618..d1dde09926 100644
--- a/test/ipfs/1.0.1/questions.yaml
+++ b/test/ipfs/1.0.1/questions.yaml
@@ -67,7 +67,7 @@ questions:
         - value: "Recreate"
           description: "Kill existing pods before creating new ones"
 
-  - variable: environment
+  - variable: environmentVariables
     label: "IPFS image environment"
     group: "IPFS Configuration"
     schema:
@@ -131,8 +131,6 @@ questions:
           label: "Staging Volume"
           schema:
             type: dict
-            $ref:
-              - "normalize/ixVolume"
             attrs:
               - variable: datasetName
                 label: "IPFS Staging Volume Dataset Name"
@@ -140,7 +138,7 @@ questions:
                   type: string
                   $ref:
                     - "normalize/ixVolume"
-                  show_if: [["hostPathEnabled", "=", false ]]
+                  show_if: [["hostPathEnabled", "=", false]]
                   default: "ix-ipfs-staging"
                   editable: false
               - variable: mountPath
@@ -158,7 +156,7 @@ questions:
                   show_subquestions_if: true
                   subquestions:
                     - variable: hostPath
-                      label: "Host Path"
+                      label: "Host Path for IPFS Staging Volume"
                       schema:
                         type: hostpath
                         required: true
@@ -166,8 +164,6 @@ questions:
           label: "Data Volume"
           schema:
             type: dict
-            $ref:
-              - "normalize/ixVolume"
             attrs:
               - variable: datasetName
                 label: "IPFS Data Volume Dataset Name"
@@ -193,7 +189,7 @@ questions:
                   show_subquestions_if: true
                   subquestions:
                     - variable: hostPath
-                      label: "Host Path"
+                      label: "Host Path for IPFS Data Volume"
                       schema:
                         type: hostpath
                         required: true
diff --git a/test/ipfs/1.0.1/templates/deployment.yaml b/test/ipfs/1.0.1/templates/deployment.yaml
index 414b097b48..c830a17a16 100644
--- a/test/ipfs/1.0.1/templates/deployment.yaml
+++ b/test/ipfs/1.0.1/templates/deployment.yaml
@@ -54,5 +54,5 @@ spec:
               containerPort: 9501
             - name: gateway
               containerPort: 9880
-{{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" .Values.environment) | nindent 10 }}
+{{ include "common.containers.allEnvironmentVariables" .Values | nindent 10 }}
 {{ include "common.storage.allAppVolumes" .Values | nindent 6 }}