From 370ec24f6937523f8be410a0c6ae57e8db384d77 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 20 Jan 2021 17:08:32 +0500
Subject: [PATCH 01/16] Update nextcloud storage labels

---
 test/nextcloud/1.1.0/questions.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/nextcloud/1.1.0/questions.yaml b/test/nextcloud/1.1.0/questions.yaml
index fb50040f7c..71dbffed99 100644
--- a/test/nextcloud/1.1.0/questions.yaml
+++ b/test/nextcloud/1.1.0/questions.yaml
@@ -142,14 +142,14 @@ questions:
       show_if: [["nextcloudDataHostPathEnabled", "=", false]]
       attrs:
         - variable: mountPath
-          label: "Mount Path"
+          label: "Nextcloud Data Mount Path"
           description: "Path where the volume will be mounted inside the pod"
           schema:
             type: path
             editable: false
             default: "/var/www"
         - variable: datasetName
-          label: "Dataset Name"
+          label: "Nextcloud Dataset Name"
           schema:
             type: string
             default: "ix-nextcloud_data"
@@ -164,13 +164,13 @@ questions:
         - "normalize/ixVolume"
       attrs:
         - variable: mountPath
-          label: "Mount Path"
+          label: "Postgres Backup Mount Path"
           schema:
             type: path
             editable: false
             default: "/postgres_backups"
         - variable: datasetName
-          label: "Dataset Name"
+          label: "Postgres Backup Dataset Name"
           schema:
             type: string
             default: "ix-postgres_backups"
@@ -185,13 +185,13 @@ questions:
         - "normalize/ixVolume"
       attrs:
         - variable: mountPath
-          label: "Mount Path"
+          label: "Postgres Mount Path"
           schema:
             type: path
             editable: false
             default: "/var/lib/postgresql/data"
         - variable: datasetName
-          label: "Dataset Name"
+          label: "Postgres Dataset Name"
           schema:
             type: string
             default: "ix-postgres_data"

From ac7c3283149765da3defc21248d2c945a186cac5 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 20 Jan 2021 17:32:00 +0500
Subject: [PATCH 02/16] Update minio test version

---
 test/minio/{1.0.0 => 1.0.1}/.helmignore                   | 0
 test/minio/{1.0.0 => 1.0.1}/Chart.yaml                    | 0
 test/minio/{1.0.0 => 1.0.1}/README.md                     | 0
 test/minio/{1.0.0 => 1.0.1}/app-readme.md                 | 0
 test/minio/{1.0.0 => 1.0.1}/questions.yaml                | 0
 test/minio/{1.0.0 => 1.0.1}/templates/NOTES.txt           | 0
 test/minio/{1.0.0 => 1.0.1}/templates/_helpers.tpl        | 0
 test/minio/{1.0.0 => 1.0.1}/templates/_storage.tpl        | 0
 test/minio/{1.0.0 => 1.0.1}/templates/deployment.yaml     | 0
 test/minio/{1.0.0 => 1.0.1}/templates/secrets.yaml        | 0
 test/minio/{1.0.0 => 1.0.1}/templates/service.yaml        | 0
 test/minio/{1.0.0 => 1.0.1}/templates/serviceaccount.yaml | 0
 test/minio/{1.0.0 => 1.0.1}/test_values.yaml              | 0
 test/minio/{1.0.0 => 1.0.1}/values.yaml                   | 0
 14 files changed, 0 insertions(+), 0 deletions(-)
 rename test/minio/{1.0.0 => 1.0.1}/.helmignore (100%)
 rename test/minio/{1.0.0 => 1.0.1}/Chart.yaml (100%)
 rename test/minio/{1.0.0 => 1.0.1}/README.md (100%)
 rename test/minio/{1.0.0 => 1.0.1}/app-readme.md (100%)
 rename test/minio/{1.0.0 => 1.0.1}/questions.yaml (100%)
 rename test/minio/{1.0.0 => 1.0.1}/templates/NOTES.txt (100%)
 rename test/minio/{1.0.0 => 1.0.1}/templates/_helpers.tpl (100%)
 rename test/minio/{1.0.0 => 1.0.1}/templates/_storage.tpl (100%)
 rename test/minio/{1.0.0 => 1.0.1}/templates/deployment.yaml (100%)
 rename test/minio/{1.0.0 => 1.0.1}/templates/secrets.yaml (100%)
 rename test/minio/{1.0.0 => 1.0.1}/templates/service.yaml (100%)
 rename test/minio/{1.0.0 => 1.0.1}/templates/serviceaccount.yaml (100%)
 rename test/minio/{1.0.0 => 1.0.1}/test_values.yaml (100%)
 rename test/minio/{1.0.0 => 1.0.1}/values.yaml (100%)

diff --git a/test/minio/1.0.0/.helmignore b/test/minio/1.0.1/.helmignore
similarity index 100%
rename from test/minio/1.0.0/.helmignore
rename to test/minio/1.0.1/.helmignore
diff --git a/test/minio/1.0.0/Chart.yaml b/test/minio/1.0.1/Chart.yaml
similarity index 100%
rename from test/minio/1.0.0/Chart.yaml
rename to test/minio/1.0.1/Chart.yaml
diff --git a/test/minio/1.0.0/README.md b/test/minio/1.0.1/README.md
similarity index 100%
rename from test/minio/1.0.0/README.md
rename to test/minio/1.0.1/README.md
diff --git a/test/minio/1.0.0/app-readme.md b/test/minio/1.0.1/app-readme.md
similarity index 100%
rename from test/minio/1.0.0/app-readme.md
rename to test/minio/1.0.1/app-readme.md
diff --git a/test/minio/1.0.0/questions.yaml b/test/minio/1.0.1/questions.yaml
similarity index 100%
rename from test/minio/1.0.0/questions.yaml
rename to test/minio/1.0.1/questions.yaml
diff --git a/test/minio/1.0.0/templates/NOTES.txt b/test/minio/1.0.1/templates/NOTES.txt
similarity index 100%
rename from test/minio/1.0.0/templates/NOTES.txt
rename to test/minio/1.0.1/templates/NOTES.txt
diff --git a/test/minio/1.0.0/templates/_helpers.tpl b/test/minio/1.0.1/templates/_helpers.tpl
similarity index 100%
rename from test/minio/1.0.0/templates/_helpers.tpl
rename to test/minio/1.0.1/templates/_helpers.tpl
diff --git a/test/minio/1.0.0/templates/_storage.tpl b/test/minio/1.0.1/templates/_storage.tpl
similarity index 100%
rename from test/minio/1.0.0/templates/_storage.tpl
rename to test/minio/1.0.1/templates/_storage.tpl
diff --git a/test/minio/1.0.0/templates/deployment.yaml b/test/minio/1.0.1/templates/deployment.yaml
similarity index 100%
rename from test/minio/1.0.0/templates/deployment.yaml
rename to test/minio/1.0.1/templates/deployment.yaml
diff --git a/test/minio/1.0.0/templates/secrets.yaml b/test/minio/1.0.1/templates/secrets.yaml
similarity index 100%
rename from test/minio/1.0.0/templates/secrets.yaml
rename to test/minio/1.0.1/templates/secrets.yaml
diff --git a/test/minio/1.0.0/templates/service.yaml b/test/minio/1.0.1/templates/service.yaml
similarity index 100%
rename from test/minio/1.0.0/templates/service.yaml
rename to test/minio/1.0.1/templates/service.yaml
diff --git a/test/minio/1.0.0/templates/serviceaccount.yaml b/test/minio/1.0.1/templates/serviceaccount.yaml
similarity index 100%
rename from test/minio/1.0.0/templates/serviceaccount.yaml
rename to test/minio/1.0.1/templates/serviceaccount.yaml
diff --git a/test/minio/1.0.0/test_values.yaml b/test/minio/1.0.1/test_values.yaml
similarity index 100%
rename from test/minio/1.0.0/test_values.yaml
rename to test/minio/1.0.1/test_values.yaml
diff --git a/test/minio/1.0.0/values.yaml b/test/minio/1.0.1/values.yaml
similarity index 100%
rename from test/minio/1.0.0/values.yaml
rename to test/minio/1.0.1/values.yaml

From 97b7c93410bced6c2187240df530f3945eafe080 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 20 Jan 2021 17:39:58 +0500
Subject: [PATCH 03/16] Render environment variables for minio in a more ui
 friendly way

---
 test/minio/1.0.1/questions.yaml            | 25 +++++++++++++++++-----
 test/minio/1.0.1/templates/deployment.yaml |  6 +++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/test/minio/1.0.1/questions.yaml b/test/minio/1.0.1/questions.yaml
index f6c3121acf..1ec0b95daf 100644
--- a/test/minio/1.0.1/questions.yaml
+++ b/test/minio/1.0.1/questions.yaml
@@ -102,9 +102,24 @@ questions:
     label: "Minio image environment"
     group: "Minio Configuration"
     schema:
-      type: dict
-      additional_attrs: true
-      attrs: []
+      type: list
+      default: []
+      items:
+        - variable: environmentVariable
+          label: "Environment Variable"
+          schema:
+            type: dict
+            attrs:
+              - variable: name
+                label: "Name"
+                schema:
+                  type: string
+                  required: true
+              - variable: value
+                label: value
+                schema:
+                  type: string
+                  required: true
 
   - variable: service
     description: "Minio Service Configuration"
@@ -146,14 +161,14 @@ questions:
       show_if: [["minioHostPathEnabled", "=", false]]
       attrs:
         - variable: mountPath
-          label: "Mount Path"
+          label: "Minio Data Mount Path"
           description: "Path where the volume will be mounted inside the pod"
           schema:
             type: path
             editable: false
             default: "/export"
         - variable: datasetName
-          label: "Dataset Name"
+          label: "Minio Dataset Name"
           schema:
             type: string
             default: "ix-minio"
diff --git a/test/minio/1.0.1/templates/deployment.yaml b/test/minio/1.0.1/templates/deployment.yaml
index ddbbebd51d..c4a2e8fa2f 100644
--- a/test/minio/1.0.1/templates/deployment.yaml
+++ b/test/minio/1.0.1/templates/deployment.yaml
@@ -50,9 +50,9 @@ spec:
                 secretKeyRef:
                   name: {{ template "minio.secretName" . }}
                   key: secretkey
-            {{- range $key, $val := .Values.environment }}
-            - name: {{ $key }}
-              value: {{ $val | quote }}
+            {{- range $envVariable := .Values.environment }}
+            - name: {{ $envVariable.name }}
+              value: {{ $envVariable.value | quote }}
             {{- end}}
       volumes:
         - name: export

From 03bcdb021be2c5997a1d697a4e1736b8991535b4 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 20 Jan 2021 17:41:58 +0500
Subject: [PATCH 04/16] Update minio chart version

---
 test/minio/1.0.1/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/minio/1.0.1/Chart.yaml b/test/minio/1.0.1/Chart.yaml
index b623cd58c3..787ff43d43 100644
--- a/test/minio/1.0.1/Chart.yaml
+++ b/test/minio/1.0.1/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: High Performance, Kubernetes Native Object Storage
 name: minio
-version: 1.0.0
+version: 1.0.1
 appVersion: master
 keywords:
 - storage

From 14ab59e005df33922913928562a50a22f3f7d434 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 20 Jan 2021 18:16:31 +0500
Subject: [PATCH 05/16] Update plex chart version

---
 test/plex/{1.0.0 => 1.0.1}/.helmignore                | 0
 test/plex/{1.0.0 => 1.0.1}/Chart.yaml                 | 2 +-
 test/plex/{1.0.0 => 1.0.1}/README.md                  | 0
 test/plex/{1.0.0 => 1.0.1}/app-readme.md              | 0
 test/plex/{1.0.0 => 1.0.1}/questions.yaml             | 0
 test/plex/{1.0.0 => 1.0.1}/templates/NOTES.txt        | 0
 test/plex/{1.0.0 => 1.0.1}/templates/_helpers.tpl     | 0
 test/plex/{1.0.0 => 1.0.1}/templates/_storage.tpl     | 0
 test/plex/{1.0.0 => 1.0.1}/templates/deployment.yaml  | 0
 test/plex/{1.0.0 => 1.0.1}/templates/service-tcp.yaml | 0
 test/plex/{1.0.0 => 1.0.1}/templates/service-udp.yaml | 0
 test/plex/{1.0.0 => 1.0.1}/test_values.yaml           | 0
 test/plex/{1.0.0 => 1.0.1}/values.yaml                | 0
 13 files changed, 1 insertion(+), 1 deletion(-)
 rename test/plex/{1.0.0 => 1.0.1}/.helmignore (100%)
 rename test/plex/{1.0.0 => 1.0.1}/Chart.yaml (95%)
 rename test/plex/{1.0.0 => 1.0.1}/README.md (100%)
 rename test/plex/{1.0.0 => 1.0.1}/app-readme.md (100%)
 rename test/plex/{1.0.0 => 1.0.1}/questions.yaml (100%)
 rename test/plex/{1.0.0 => 1.0.1}/templates/NOTES.txt (100%)
 rename test/plex/{1.0.0 => 1.0.1}/templates/_helpers.tpl (100%)
 rename test/plex/{1.0.0 => 1.0.1}/templates/_storage.tpl (100%)
 rename test/plex/{1.0.0 => 1.0.1}/templates/deployment.yaml (100%)
 rename test/plex/{1.0.0 => 1.0.1}/templates/service-tcp.yaml (100%)
 rename test/plex/{1.0.0 => 1.0.1}/templates/service-udp.yaml (100%)
 rename test/plex/{1.0.0 => 1.0.1}/test_values.yaml (100%)
 rename test/plex/{1.0.0 => 1.0.1}/values.yaml (100%)

diff --git a/test/plex/1.0.0/.helmignore b/test/plex/1.0.1/.helmignore
similarity index 100%
rename from test/plex/1.0.0/.helmignore
rename to test/plex/1.0.1/.helmignore
diff --git a/test/plex/1.0.0/Chart.yaml b/test/plex/1.0.1/Chart.yaml
similarity index 95%
rename from test/plex/1.0.0/Chart.yaml
rename to test/plex/1.0.1/Chart.yaml
index 222456f250..961dda9c20 100644
--- a/test/plex/1.0.0/Chart.yaml
+++ b/test/plex/1.0.1/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 1.20.2.3402
 description: Plex Media Server
 name: plex
-version: 1.0.0
+version: 1.0.1
 keywords:
   - plex
 home: https://plex.tv/
diff --git a/test/plex/1.0.0/README.md b/test/plex/1.0.1/README.md
similarity index 100%
rename from test/plex/1.0.0/README.md
rename to test/plex/1.0.1/README.md
diff --git a/test/plex/1.0.0/app-readme.md b/test/plex/1.0.1/app-readme.md
similarity index 100%
rename from test/plex/1.0.0/app-readme.md
rename to test/plex/1.0.1/app-readme.md
diff --git a/test/plex/1.0.0/questions.yaml b/test/plex/1.0.1/questions.yaml
similarity index 100%
rename from test/plex/1.0.0/questions.yaml
rename to test/plex/1.0.1/questions.yaml
diff --git a/test/plex/1.0.0/templates/NOTES.txt b/test/plex/1.0.1/templates/NOTES.txt
similarity index 100%
rename from test/plex/1.0.0/templates/NOTES.txt
rename to test/plex/1.0.1/templates/NOTES.txt
diff --git a/test/plex/1.0.0/templates/_helpers.tpl b/test/plex/1.0.1/templates/_helpers.tpl
similarity index 100%
rename from test/plex/1.0.0/templates/_helpers.tpl
rename to test/plex/1.0.1/templates/_helpers.tpl
diff --git a/test/plex/1.0.0/templates/_storage.tpl b/test/plex/1.0.1/templates/_storage.tpl
similarity index 100%
rename from test/plex/1.0.0/templates/_storage.tpl
rename to test/plex/1.0.1/templates/_storage.tpl
diff --git a/test/plex/1.0.0/templates/deployment.yaml b/test/plex/1.0.1/templates/deployment.yaml
similarity index 100%
rename from test/plex/1.0.0/templates/deployment.yaml
rename to test/plex/1.0.1/templates/deployment.yaml
diff --git a/test/plex/1.0.0/templates/service-tcp.yaml b/test/plex/1.0.1/templates/service-tcp.yaml
similarity index 100%
rename from test/plex/1.0.0/templates/service-tcp.yaml
rename to test/plex/1.0.1/templates/service-tcp.yaml
diff --git a/test/plex/1.0.0/templates/service-udp.yaml b/test/plex/1.0.1/templates/service-udp.yaml
similarity index 100%
rename from test/plex/1.0.0/templates/service-udp.yaml
rename to test/plex/1.0.1/templates/service-udp.yaml
diff --git a/test/plex/1.0.0/test_values.yaml b/test/plex/1.0.1/test_values.yaml
similarity index 100%
rename from test/plex/1.0.0/test_values.yaml
rename to test/plex/1.0.1/test_values.yaml
diff --git a/test/plex/1.0.0/values.yaml b/test/plex/1.0.1/values.yaml
similarity index 100%
rename from test/plex/1.0.0/values.yaml
rename to test/plex/1.0.1/values.yaml

From af4cb601dfe81fb5e9981c429f3a9c41d4979956 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 20 Jan 2021 18:19:00 +0500
Subject: [PATCH 06/16] Remove extra plex env variables

---
 test/plex/1.0.1/questions.yaml            | 26 -----------------------
 test/plex/1.0.1/templates/deployment.yaml | 18 ----------------
 2 files changed, 44 deletions(-)

diff --git a/test/plex/1.0.1/questions.yaml b/test/plex/1.0.1/questions.yaml
index f8978c6821..a6c26cc3b9 100644
--- a/test/plex/1.0.1/questions.yaml
+++ b/test/plex/1.0.1/questions.yaml
@@ -74,12 +74,6 @@ questions:
       type: string
       default: ""
 
-  - variable: advertiseIp
-    label: "Plex Advertise IP"
-    group: "Plex Configuration"
-    schema:
-      type: string
-
   - variable: extraEnv
     label: "Environment variables for plex"
     group: "Plex Configuration"
@@ -88,26 +82,6 @@ questions:
       additional_attrs: true
       attrs: []
 
-  - variable: proxy
-    label: "Configure Proxy environment variable"
-    group: "Plex Configuration"
-    schema:
-      type: dict
-      attrs:
-        - variable: enabled
-          label: "Enable Proxy"
-          schema:
-            type: boolean
-            default: false
-        - variable: http
-          label: "HTTP Proxy"
-          schema:
-            type: string
-        - variable: https
-          label: "HTTPS Proxy"
-          schema:
-            type: string
-
   - variable: hostNetwork
     label: "Configure Host Network"
     group: "Networking"
diff --git a/test/plex/1.0.1/templates/deployment.yaml b/test/plex/1.0.1/templates/deployment.yaml
index 059ecbef27..964d19d71f 100644
--- a/test/plex/1.0.1/templates/deployment.yaml
+++ b/test/plex/1.0.1/templates/deployment.yaml
@@ -67,24 +67,6 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
-  {{- if .Values.proxy.enabled }}
-    {{- if .Values.proxy.http }}
-          - name: "HTTP_PROXY"
-            value: "{{.Values.proxy.http}}"
-    {{- end }}
-    {{- if .Values.proxy.https }}
-          - name: "HTTPS_PROXY"
-            value: "{{.Values.proxy.https}}"
-    {{- end }}
-  {{- end }}
-  {{- if .Values.advertiseIp }}
-          - name: "ADVERTISE_IP"
-            value: "{{.Values.advertiseIp}}"
-{{- end }}
-{{- if .Values.allowedNetworks }}
-          - name: "ALLOWED_NETWORKS"
-            value: "{{include "joinListWithComma" .Values.allowedNetworks}}"
-{{- end }}
 # Extra ENV Values supplied by user
 {{- range $key, $value := .Values.extraEnv }}
           - name: {{ $key }}

From fe2ebf7b7f1c00041d0a4f762d982cbadaf88db1 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 20 Jan 2021 18:22:02 +0500
Subject: [PATCH 07/16] Allow specifying extra environment variables for plex

---
 test/plex/1.0.1/questions.yaml            | 31 +++++++++++++++++------
 test/plex/1.0.1/templates/deployment.yaml |  8 +++---
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/test/plex/1.0.1/questions.yaml b/test/plex/1.0.1/questions.yaml
index a6c26cc3b9..df1880be03 100644
--- a/test/plex/1.0.1/questions.yaml
+++ b/test/plex/1.0.1/questions.yaml
@@ -74,14 +74,6 @@ questions:
       type: string
       default: ""
 
-  - variable: extraEnv
-    label: "Environment variables for plex"
-    group: "Plex Configuration"
-    schema:
-      type: dict
-      additional_attrs: true
-      attrs: []
-
   - variable: hostNetwork
     label: "Configure Host Network"
     group: "Networking"
@@ -89,6 +81,29 @@ questions:
       type: boolean
       default: false
 
+  - variable: environmentVariables
+    label: "Environment Variables for Plex"
+    group: "Plex Configuration"
+    schema:
+      type: list
+      default: []
+      items:
+        - variable: environmentVariable
+          label: "Environment Variable"
+          schema:
+            type: dict
+            attrs:
+              - variable: name
+                label: "Name"
+                schema:
+                  type: string
+                  required: true
+              - variable: value
+                label: "Value"
+                schema:
+                  type: string
+                  required: true
+
   - variable: timezone
     label: "Plex container timezone"
     group: "Plex Configuration"
diff --git a/test/plex/1.0.1/templates/deployment.yaml b/test/plex/1.0.1/templates/deployment.yaml
index 964d19d71f..2457b9bb1e 100644
--- a/test/plex/1.0.1/templates/deployment.yaml
+++ b/test/plex/1.0.1/templates/deployment.yaml
@@ -68,10 +68,10 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
 # Extra ENV Values supplied by user
-{{- range $key, $value := .Values.extraEnv }}
-          - name: {{ $key }}
-            value: {{ $value }}
-{{- end }}
+{{- range $envVariable := .Values.environmentVariables }}
+          - name: {{ $envVariable.name }}
+            value: {{ $envVariable.value | quote }}
+{{- end}}
           readinessProbe:
             httpGet:
               path: /identity

From c4d3d029e046ab81e8fdaa4b228dfed0ec0019c7 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 20 Jan 2021 18:23:38 +0500
Subject: [PATCH 08/16] Update minio testing ci port

---
 test/minio/1.0.1/questions.yaml   | 2 +-
 test/minio/1.0.1/test_values.yaml | 2 +-
 test/plex/1.0.1/test_values.yaml  | 7 -------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/test/minio/1.0.1/questions.yaml b/test/minio/1.0.1/questions.yaml
index 1ec0b95daf..7543f22c44 100644
--- a/test/minio/1.0.1/questions.yaml
+++ b/test/minio/1.0.1/questions.yaml
@@ -116,7 +116,7 @@ questions:
                   type: string
                   required: true
               - variable: value
-                label: value
+                label: "Value"
                 schema:
                   type: string
                   required: true
diff --git a/test/minio/1.0.1/test_values.yaml b/test/minio/1.0.1/test_values.yaml
index 86f866e9f3..464cfbfa87 100644
--- a/test/minio/1.0.1/test_values.yaml
+++ b/test/minio/1.0.1/test_values.yaml
@@ -11,7 +11,7 @@ extraArgs: []
 updateStrategy: RollingUpdate
 
 service:
-  nodePort: 32000
+  nodePort: 32001
 
 environment:
   ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html
diff --git a/test/plex/1.0.1/test_values.yaml b/test/plex/1.0.1/test_values.yaml
index e87d30077c..53802c93f1 100644
--- a/test/plex/1.0.1/test_values.yaml
+++ b/test/plex/1.0.1/test_values.yaml
@@ -61,12 +61,5 @@ transcodeHostPathEnabled: false
 dataHostPathEnabled: false
 configHostPathEnabled: false
 
-proxy:
-  # This allows to set a proxy environment variable, which PMS uses to fetch the token and assets like movie cover
-  enabled: false
-  # http: "http://proxy:8080"
-  # https: "https://proxy:8080"
-  # noproxy: "localhost,127.0.0.1,10.96.0.0/12,10.244.0.0/12"
-
 gpuConfiguration: {}
 emptyDirVolumes: true

From 8ca4264d90a536596f5fff03b6d8a57da33756c2 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 27 Jan 2021 22:58:38 +0500
Subject: [PATCH 09/16] Add help text for minio acces keys variables

---
 test/minio/1.0.1/questions.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/minio/1.0.1/questions.yaml b/test/minio/1.0.1/questions.yaml
index 7543f22c44..898e201d0c 100644
--- a/test/minio/1.0.1/questions.yaml
+++ b/test/minio/1.0.1/questions.yaml
@@ -81,6 +81,7 @@ questions:
   - variable: accessKey
     label: "Access Key"
     group: "Minio Configuration"
+    description: "Enter the S3 access ID"
     schema:
       type: string
       private: true
@@ -91,6 +92,7 @@ questions:
   - variable: secretKey
     label: "Secret Key"
     group: "Minio Configuration"
+    description: "Enter the S3 secret access key"
     schema:
       type: string
       private: true
@@ -152,7 +154,7 @@ questions:
             type: hostpath
 
   - variable: minioDataVolume
-    label: "Configure iXVolume"
+    label: "Minio Data Volume Defaults"
     group: "Storage"
     schema:
       type: dict

From 5e1ff9b5cc7e2cc5a60d0ae356683fa64a72f18f Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 27 Jan 2021 23:17:04 +0500
Subject: [PATCH 10/16] Add description for nextcloud configuration fields

---
 test/nextcloud/1.1.0/questions.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/nextcloud/1.1.0/questions.yaml b/test/nextcloud/1.1.0/questions.yaml
index 71dbffed99..545fe5647b 100644
--- a/test/nextcloud/1.1.0/questions.yaml
+++ b/test/nextcloud/1.1.0/questions.yaml
@@ -74,12 +74,14 @@ questions:
               - "definitions/nodeIP"
         - variable: username
           label: "Username"
+          description: "Name of the Nextcloud admin user"
           schema:
             type: string
             default: "admin"
             required: true
         - variable: password
           label: "Password"
+          description: "Password for the Nextcloud admin user"
           schema:
             type: string
             private: true
@@ -87,6 +89,7 @@ questions:
             required: true
         - variable: datadir
           label: "Nextcloud data directory"
+          description: "Configures the data directory where nextcloud stores all files from the users"
           schema:
             type: path
             default: "/var/www/html/data"
@@ -133,7 +136,7 @@ questions:
             type: hostpath
 
   - variable: nextcloudDataVolume
-    label: "Configure iXVolume"
+    label: "Nextcloud Data Volume Defaults"
     group: "Storage"
     schema:
       type: dict
@@ -156,7 +159,7 @@ questions:
             editable: false
 
   - variable: postgresBackupVolume
-    label: "Postgres Backup Volume"
+    label: "Postgres Backup Volume Defaults"
     group: "Storage"
     schema:
       type: dict
@@ -177,7 +180,7 @@ questions:
             editable: false
 
   - variable: postgresDataVolume
-    label: "Postgresql Data Volume"
+    label: "Postgresql Data Volume Defaults"
     group: "Storage"
     schema:
       type: dict

From 8268636f504e513faa7a0de8a5325b822f1f2bd1 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Thu, 28 Jan 2021 00:07:18 +0500
Subject: [PATCH 11/16] Add description for plex configuration variables

---
 test/plex/1.0.1/questions.yaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/plex/1.0.1/questions.yaml b/test/plex/1.0.1/questions.yaml
index df1880be03..73db24f5ae 100644
--- a/test/plex/1.0.1/questions.yaml
+++ b/test/plex/1.0.1/questions.yaml
@@ -70,6 +70,7 @@ questions:
   - variable: claimToken
     label: "Plex Claim Token"
     group: "Plex Configuration"
+    description: "The claim token for the server to obtain a real server token. If not provided, server is will not be automatically logged in. If server is already logged in, this parameter is ignored. You can obtain a claim token to login your server to your plex account by visiting https://www.plex.tv/claim."
     schema:
       type: string
       default: ""
@@ -157,7 +158,7 @@ questions:
             required: true
 
   - variable: transcodeVolume
-    label: "Configure iXVolume"
+    label: "Transcode Volume Defaults"
     group: "Storage"
     schema:
       type: dict
@@ -173,7 +174,7 @@ questions:
             editable: false
             default: "/transcode"
         - variable: datasetName
-          label: "Dataset Name"
+          label: "Transcode Dataset Name"
           schema:
             type: string
             default: "ix-plex_transcode"
@@ -194,7 +195,7 @@ questions:
             required: true
 
   - variable: dataVolume
-    label: "Configure data iXVolume"
+    label: "Data Volume Defaults"
     group: "Storage"
     schema:
       type: dict
@@ -210,7 +211,7 @@ questions:
             editable: false
             default: "/data"
         - variable: datasetName
-          label: "Dataset Name"
+          label: "Data Dataset Name"
           schema:
             type: string
             default: "ix-plex_data"
@@ -231,7 +232,7 @@ questions:
             required: true
 
   - variable: configVolume
-    label: "Configure iXVolume"
+    label: "Configuration Volume Defaults"
     group: "Storage"
     schema:
       type: dict
@@ -247,7 +248,7 @@ questions:
             editable: false
             default: "/config"
         - variable: datasetName
-          label: "Dataset Name"
+          label: "Configuration Dataset Name"
           schema:
             type: string
             default: "ix-plex_config"

From fc9c6549f77c4464b2421b5069b57f483b693393 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Thu, 28 Jan 2021 00:15:55 +0500
Subject: [PATCH 12/16] Update ipfs version

---
 test/ipfs/{1.0.0 => 1.0.1}/.helmignore                   | 0
 test/ipfs/{1.0.0 => 1.0.1}/Chart.yaml                    | 2 +-
 test/ipfs/{1.0.0 => 1.0.1}/README.md                     | 0
 test/ipfs/{1.0.0 => 1.0.1}/app-readme.md                 | 0
 test/ipfs/{1.0.0 => 1.0.1}/questions.yaml                | 0
 test/ipfs/{1.0.0 => 1.0.1}/templates/NOTES.txt           | 0
 test/ipfs/{1.0.0 => 1.0.1}/templates/_helpers.tpl        | 0
 test/ipfs/{1.0.0 => 1.0.1}/templates/_storage.tpl        | 0
 test/ipfs/{1.0.0 => 1.0.1}/templates/deployment.yaml     | 0
 test/ipfs/{1.0.0 => 1.0.1}/templates/service.yaml        | 0
 test/ipfs/{1.0.0 => 1.0.1}/templates/serviceaccount.yaml | 0
 test/ipfs/{1.0.0 => 1.0.1}/test_values.yaml              | 0
 test/ipfs/{1.0.0 => 1.0.1}/values.yaml                   | 0
 13 files changed, 1 insertion(+), 1 deletion(-)
 rename test/ipfs/{1.0.0 => 1.0.1}/.helmignore (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/Chart.yaml (95%)
 rename test/ipfs/{1.0.0 => 1.0.1}/README.md (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/app-readme.md (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/questions.yaml (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/templates/NOTES.txt (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/templates/_helpers.tpl (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/templates/_storage.tpl (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/templates/deployment.yaml (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/templates/service.yaml (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/templates/serviceaccount.yaml (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/test_values.yaml (100%)
 rename test/ipfs/{1.0.0 => 1.0.1}/values.yaml (100%)

diff --git a/test/ipfs/1.0.0/.helmignore b/test/ipfs/1.0.1/.helmignore
similarity index 100%
rename from test/ipfs/1.0.0/.helmignore
rename to test/ipfs/1.0.1/.helmignore
diff --git a/test/ipfs/1.0.0/Chart.yaml b/test/ipfs/1.0.1/Chart.yaml
similarity index 95%
rename from test/ipfs/1.0.0/Chart.yaml
rename to test/ipfs/1.0.1/Chart.yaml
index 9cbe207526..fe0a145769 100644
--- a/test/ipfs/1.0.0/Chart.yaml
+++ b/test/ipfs/1.0.1/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Global, Versioned, peer-to-peer filesystem.
 name: ipfs
-version: 1.0.0
+version: 1.0.1
 appVersion: master
 keywords:
 - storage
diff --git a/test/ipfs/1.0.0/README.md b/test/ipfs/1.0.1/README.md
similarity index 100%
rename from test/ipfs/1.0.0/README.md
rename to test/ipfs/1.0.1/README.md
diff --git a/test/ipfs/1.0.0/app-readme.md b/test/ipfs/1.0.1/app-readme.md
similarity index 100%
rename from test/ipfs/1.0.0/app-readme.md
rename to test/ipfs/1.0.1/app-readme.md
diff --git a/test/ipfs/1.0.0/questions.yaml b/test/ipfs/1.0.1/questions.yaml
similarity index 100%
rename from test/ipfs/1.0.0/questions.yaml
rename to test/ipfs/1.0.1/questions.yaml
diff --git a/test/ipfs/1.0.0/templates/NOTES.txt b/test/ipfs/1.0.1/templates/NOTES.txt
similarity index 100%
rename from test/ipfs/1.0.0/templates/NOTES.txt
rename to test/ipfs/1.0.1/templates/NOTES.txt
diff --git a/test/ipfs/1.0.0/templates/_helpers.tpl b/test/ipfs/1.0.1/templates/_helpers.tpl
similarity index 100%
rename from test/ipfs/1.0.0/templates/_helpers.tpl
rename to test/ipfs/1.0.1/templates/_helpers.tpl
diff --git a/test/ipfs/1.0.0/templates/_storage.tpl b/test/ipfs/1.0.1/templates/_storage.tpl
similarity index 100%
rename from test/ipfs/1.0.0/templates/_storage.tpl
rename to test/ipfs/1.0.1/templates/_storage.tpl
diff --git a/test/ipfs/1.0.0/templates/deployment.yaml b/test/ipfs/1.0.1/templates/deployment.yaml
similarity index 100%
rename from test/ipfs/1.0.0/templates/deployment.yaml
rename to test/ipfs/1.0.1/templates/deployment.yaml
diff --git a/test/ipfs/1.0.0/templates/service.yaml b/test/ipfs/1.0.1/templates/service.yaml
similarity index 100%
rename from test/ipfs/1.0.0/templates/service.yaml
rename to test/ipfs/1.0.1/templates/service.yaml
diff --git a/test/ipfs/1.0.0/templates/serviceaccount.yaml b/test/ipfs/1.0.1/templates/serviceaccount.yaml
similarity index 100%
rename from test/ipfs/1.0.0/templates/serviceaccount.yaml
rename to test/ipfs/1.0.1/templates/serviceaccount.yaml
diff --git a/test/ipfs/1.0.0/test_values.yaml b/test/ipfs/1.0.1/test_values.yaml
similarity index 100%
rename from test/ipfs/1.0.0/test_values.yaml
rename to test/ipfs/1.0.1/test_values.yaml
diff --git a/test/ipfs/1.0.0/values.yaml b/test/ipfs/1.0.1/values.yaml
similarity index 100%
rename from test/ipfs/1.0.0/values.yaml
rename to test/ipfs/1.0.1/values.yaml

From 3e10661c9b24e8e1a5e7cb3e2802926afa728ff9 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Thu, 28 Jan 2021 00:19:42 +0500
Subject: [PATCH 13/16] Update ipfs description/validation

---
 test/ipfs/1.0.1/questions.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/ipfs/1.0.1/questions.yaml b/test/ipfs/1.0.1/questions.yaml
index 6bba2062d4..6983ebef3b 100644
--- a/test/ipfs/1.0.1/questions.yaml
+++ b/test/ipfs/1.0.1/questions.yaml
@@ -102,7 +102,7 @@ questions:
           label: "Swarm Port to use for IPFS (Public)"
           schema:
             type: int
-            min: 4000
+            min: 9000
             max: 65535
             default: 9401
             required: true
@@ -110,7 +110,7 @@ questions:
           label: "API Port to use for IPFS (local)"
           schema:
             type: int
-            min: 4000
+            min: 9000
             max: 65535
             default: 9501
             required: true
@@ -118,7 +118,7 @@ questions:
           label: "Gateway Port to use for IPFS (local)"
           schema:
             type: int
-            min: 4000
+            min: 9000
             max: 65535
             default: 9880
             required: true
@@ -138,7 +138,7 @@ questions:
             type: hostpath
 
   - variable: ipfsDataVolume
-    label: "Configure iXVolume"
+    label: "IPFS Data Volume Defaults"
     group: "Storage"
     schema:
       type: dict
@@ -154,7 +154,7 @@ questions:
             editable: false
             default: "/data/ipfs"
         - variable: datasetName
-          label: "Dataset Name"
+          label: "IPFS Data Dataset Name"
           schema:
             type: string
             default: "ix-ipfs-data"
@@ -174,7 +174,7 @@ questions:
             type: hostpath
 
   - variable: ipfsStagingVolume
-    label: "Configure iXVolume"
+    label: "IPFS Staging Volume Defaults"
     group: "Storage"
     schema:
       type: dict
@@ -190,7 +190,7 @@ questions:
             editable: false
             default: "/export"
         - variable: datasetName
-          label: "Dataset Name"
+          label: "IPFS Staging Dataset Name"
           schema:
             type: string
             default: "ix-ipfs-staging"

From f9459f88b0d52efb502572269960f1c1aacefb03 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Thu, 28 Jan 2021 00:42:12 +0500
Subject: [PATCH 14/16] Bug fix for specifying env variable for ipfs chart

---
 test/ipfs/1.0.1/templates/deployment.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/ipfs/1.0.1/templates/deployment.yaml b/test/ipfs/1.0.1/templates/deployment.yaml
index fed49db153..baa21dcc30 100644
--- a/test/ipfs/1.0.1/templates/deployment.yaml
+++ b/test/ipfs/1.0.1/templates/deployment.yaml
@@ -103,10 +103,13 @@ spec:
               containerPort: 9501
             - name: gateway
               containerPort: 9880
+          {{- if .Values.environment }}
+          env:
             {{- range $key, $val := .Values.environment }}
             - name: {{ $key }}
               value: {{ $val | quote }}
             {{- end}}
+          {{- end }}
       volumes:
         - name: data
         {{- if .Values.emptyDirVolumes }}

From 51d5e88952cf7f43c1a5a3841bdeffd03505f692 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Thu, 28 Jan 2021 00:49:44 +0500
Subject: [PATCH 15/16] Properly render environment variable

---
 test/ipfs/1.0.1/templates/deployment.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/ipfs/1.0.1/templates/deployment.yaml b/test/ipfs/1.0.1/templates/deployment.yaml
index baa21dcc30..687342e595 100644
--- a/test/ipfs/1.0.1/templates/deployment.yaml
+++ b/test/ipfs/1.0.1/templates/deployment.yaml
@@ -105,9 +105,9 @@ spec:
               containerPort: 9880
           {{- if .Values.environment }}
           env:
-            {{- range $key, $val := .Values.environment }}
-            - name: {{ $key }}
-              value: {{ $val | quote }}
+            {{- range $envVariable := .Values.environment }}
+            - name: {{ $envVariable.name }}
+              value: {{ $envVariable.value | quote }}
             {{- end}}
           {{- end }}
       volumes:

From 06a75d2c168aa84b57b17e8d43c891ee72da57fb Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Thu, 28 Jan 2021 17:42:21 +0500
Subject: [PATCH 16/16] Add check for env variable at chart level instead of
 schema

This commit introduces a change by marking env variable name/value variables as not required as UI cannot properly handle this right now.
---
 test/ipfs/1.0.1/questions.yaml             | 2 --
 test/ipfs/1.0.1/templates/deployment.yaml  | 4 ++++
 test/minio/1.0.1/questions.yaml            | 2 --
 test/minio/1.0.1/templates/deployment.yaml | 4 ++++
 test/plex/1.0.1/questions.yaml             | 2 --
 test/plex/1.0.1/templates/deployment.yaml  | 4 ++++
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/test/ipfs/1.0.1/questions.yaml b/test/ipfs/1.0.1/questions.yaml
index 6983ebef3b..02d188240f 100644
--- a/test/ipfs/1.0.1/questions.yaml
+++ b/test/ipfs/1.0.1/questions.yaml
@@ -83,12 +83,10 @@ questions:
                 label: "Name"
                 schema:
                   type: string
-                  required: true
               - variable: value
                 label: "Value"
                 schema:
                   type: string
-                  required: true
 
   - variable: service
     description: "IPFS Service Configuration"
diff --git a/test/ipfs/1.0.1/templates/deployment.yaml b/test/ipfs/1.0.1/templates/deployment.yaml
index 687342e595..af4963cca5 100644
--- a/test/ipfs/1.0.1/templates/deployment.yaml
+++ b/test/ipfs/1.0.1/templates/deployment.yaml
@@ -106,8 +106,12 @@ spec:
           {{- if .Values.environment }}
           env:
             {{- range $envVariable := .Values.environment }}
+            {{- if and $envVariable.name $envVariable.value }}
             - name: {{ $envVariable.name }}
               value: {{ $envVariable.value | quote }}
+            {{- else }}
+              {{- fail "Please specify name/value for environment variable" }}
+            {{- end }}
             {{- end}}
           {{- end }}
       volumes:
diff --git a/test/minio/1.0.1/questions.yaml b/test/minio/1.0.1/questions.yaml
index 898e201d0c..32060e019d 100644
--- a/test/minio/1.0.1/questions.yaml
+++ b/test/minio/1.0.1/questions.yaml
@@ -116,12 +116,10 @@ questions:
                 label: "Name"
                 schema:
                   type: string
-                  required: true
               - variable: value
                 label: "Value"
                 schema:
                   type: string
-                  required: true
 
   - variable: service
     description: "Minio Service Configuration"
diff --git a/test/minio/1.0.1/templates/deployment.yaml b/test/minio/1.0.1/templates/deployment.yaml
index c4a2e8fa2f..6b35f87903 100644
--- a/test/minio/1.0.1/templates/deployment.yaml
+++ b/test/minio/1.0.1/templates/deployment.yaml
@@ -51,8 +51,12 @@ spec:
                   name: {{ template "minio.secretName" . }}
                   key: secretkey
             {{- range $envVariable := .Values.environment }}
+            {{- if and $envVariable.name $envVariable.value }}
             - name: {{ $envVariable.name }}
               value: {{ $envVariable.value | quote }}
+            {{- else }}
+              {{- fail "Please specify name/value for environment variable" }}
+            {{- end }}
             {{- end}}
       volumes:
         - name: export
diff --git a/test/plex/1.0.1/questions.yaml b/test/plex/1.0.1/questions.yaml
index 73db24f5ae..2107548760 100644
--- a/test/plex/1.0.1/questions.yaml
+++ b/test/plex/1.0.1/questions.yaml
@@ -98,12 +98,10 @@ questions:
                 label: "Name"
                 schema:
                   type: string
-                  required: true
               - variable: value
                 label: "Value"
                 schema:
                   type: string
-                  required: true
 
   - variable: timezone
     label: "Plex container timezone"
diff --git a/test/plex/1.0.1/templates/deployment.yaml b/test/plex/1.0.1/templates/deployment.yaml
index 2457b9bb1e..1344cf8f3d 100644
--- a/test/plex/1.0.1/templates/deployment.yaml
+++ b/test/plex/1.0.1/templates/deployment.yaml
@@ -69,8 +69,12 @@ spec:
                 fieldPath: metadata.namespace
 # Extra ENV Values supplied by user
 {{- range $envVariable := .Values.environmentVariables }}
+          {{- if and $envVariable.name $envVariable.value }}
           - name: {{ $envVariable.name }}
             value: {{ $envVariable.value | quote }}
+          {{- else }}
+            {{- fail "Please specify name/value for environment variable" }}
+          {{- end }}
 {{- end}}
           readinessProbe:
             httpGet: