From 8da36972d822d794c039e92bf5d485a556d86928 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Mon, 7 Dec 2020 03:44:03 +0500
Subject: [PATCH] Clean post install notes

---
 test/plex/2.1.0/questions.yaml            | 15 ++++++++++++---
 test/plex/2.1.0/templates/NOTES.txt       | 18 ------------------
 test/plex/2.1.0/templates/deployment.yaml |  6 +++---
 test/plex/2.1.0/values.yaml               |  3 +++
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/test/plex/2.1.0/questions.yaml b/test/plex/2.1.0/questions.yaml
index a3e856473af..cb75533f095 100644
--- a/test/plex/2.1.0/questions.yaml
+++ b/test/plex/2.1.0/questions.yaml
@@ -76,6 +76,7 @@ questions:
     schema:
       type: dict
       additional_attrs: true
+      attrs: []
 
   - variable: proxy
     label: "Configure Proxy environment variable"
@@ -83,6 +84,11 @@ questions:
     schema:
       type: dict
       attrs:
+        - variable: enabled
+          label: "Enable Proxy"
+          schema:
+            type: boolean
+            default: false
         - variable: http
           label: "HTTP Proxy"
           schema:
@@ -143,8 +149,9 @@ questions:
                     - variable: hostPath
                       label: "Specify HostPath for Transcode"
                       schema:
-                        type: hostPath
+                        type: hostpath
                         required: true
+                        default: ""
               - variable: volume
                 label: "Configure iXVolume"
                 schema:
@@ -181,8 +188,9 @@ questions:
                     - variable: hostPath
                       label: "Specify HostPath for Data"
                       schema:
-                        type: hostPath
+                        type: hostpath
                         required: true
+                        default: ""
               - variable: volume
                 label: "Configure iXVolume"
                 schema:
@@ -219,8 +227,9 @@ questions:
                     - variable: hostPath
                       label: "Specify HostPath for Config"
                       schema:
-                        type: hostPath
+                        type: hostpath
                         required: true
+                        default: ""
               - variable: volume
                 label: "Configure iXVolume"
                 schema:
diff --git a/test/plex/2.1.0/templates/NOTES.txt b/test/plex/2.1.0/templates/NOTES.txt
index a4119425744..7d790da089b 100644
--- a/test/plex/2.1.0/templates/NOTES.txt
+++ b/test/plex/2.1.0/templates/NOTES.txt
@@ -1,19 +1 @@
 1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}
-{{- end }}
-{{- else if contains "NodePort" .Values.serviceTCP.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "plex.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.serviceTCP.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "plex.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "plex.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ .Values.serviceTCP.port }}
-{{- else if contains "ClusterIP" .Values.serviceTCP.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "plex.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
-{{- end }}
diff --git a/test/plex/2.1.0/templates/deployment.yaml b/test/plex/2.1.0/templates/deployment.yaml
index abcff76d586..b00cc3c967a 100644
--- a/test/plex/2.1.0/templates/deployment.yaml
+++ b/test/plex/2.1.0/templates/deployment.yaml
@@ -145,13 +145,13 @@ spec:
       volumes:
       - name: data
         hostPath:
-          path: {{ template "configuredHostPathData" }}
+          path: {{ template "configuredHostPathData" . }}
       - name: config
         hostPath:
-          path: {{ template "configuredHostPathConfig" }}
+          path: {{ template "configuredHostPathConfig" . }}
       - name: transcode
         hostPath:
-          path: {{ template "configuredHostPathTranscode" }}
+          path: {{ template "configuredHostPathTranscode" . }}
       - name: shared
         emptyDir: {}
       - name: shared-logs
diff --git a/test/plex/2.1.0/values.yaml b/test/plex/2.1.0/values.yaml
index a95ae2b0eab..2ecb6fec8a6 100644
--- a/test/plex/2.1.0/values.yaml
+++ b/test/plex/2.1.0/values.yaml
@@ -101,10 +101,13 @@ hostNetwork: false
 persistence:
   transcode:
     hostPathEnabled: false
+    hostPath: ""
   data:
     hostPathEnabled: false
+    hostPath: ""
   config:
     hostPathEnabled: false
+    hostPath: ""
 
 # Probes configuration
 probes: