From aa80b8218017299f4c442c7674f2938b46c8458b Mon Sep 17 00:00:00 2001
From: Miguel Martinez <migmartri@gmail.com>
Date: Tue, 14 Aug 2018 13:24:03 -0700
Subject: [PATCH 1/2] Update chart from upstream

---
 chart/kubeapps/Chart.yaml          |  2 +-
 chart/kubeapps/templates/NOTES.txt | 56 +++++++++++++++++++++++-------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml
index 63eb0ad17bb..c0c0b71b425 100644
--- a/chart/kubeapps/Chart.yaml
+++ b/chart/kubeapps/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kubeapps
-version: 0.1.0
+version: 0.1.1
 appVersion: 1.0.0.alpha.4
 description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm
 icon: https://raw.githubusercontent.com/kubeapps/kubeapps/master/docs/img/logo.png
diff --git a/chart/kubeapps/templates/NOTES.txt b/chart/kubeapps/templates/NOTES.txt
index 62b10e50e08..559c8617297 100644
--- a/chart/kubeapps/templates/NOTES.txt
+++ b/chart/kubeapps/templates/NOTES.txt
@@ -1,19 +1,49 @@
-1. Get the application URL by running these commands:
+** Please be patient while the chart is being deployed **
+
+Tip:
+
+  Watch the deployment status using the command: kubectl get pods -w --namespace {{ .Release.Namespace }}
+
+Kubeapps can be accessed via port {{ .Values.frontend.service.port }} on the following DNS name from within your cluster:
+
+   {{ template "kubeapps.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
+
+To access Kubeapps from outside your K8s cluster, follow the steps below:
+
 {{- if .Values.ingress.enabled }}
+
+1. Get the Kubeapps URL and associate Kubeapps hostname to your cluster external IP:
+
 {{- range .Values.ingress.hosts }}
-  echo http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
+   export CLUSTER_IP=$(minikube ip) # On Minikube. Use: `kubectl cluster-info` on others K8s clusters
+   echo "Kubeapps URL: http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}"
+   echo "$CLUSTER_IP  {{ . }}" | sudo tee -a /etc/hosts
 {{- end }}
-{{- else if contains "NodePort" .Values.frontend.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "kubeapps.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 }}
+
+1. Get the Kubeapps URL by running these commands:
+
+{{- if contains "NodePort" .Values.frontend.service.type }}
+
+   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "kubeapps.fullname" . }})
+   echo "Kubeapps URL: http://$NODE_IP:$NODE_PORT"
+
 {{- else if contains "LoadBalancer" .Values.frontend.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status by running 'kubectl get svc -w {{ template "kubeapps.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kubeapps.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.frontend.service.port }}
+
+ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+       Watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "kubeapps.fullname" . }}'
+
+   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kubeapps.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+   echo "Kubeapps URL: http://$SERVICE_IP:{{ .Values.frontend.service.port }}"
+
 {{- else if contains "ClusterIP" .Values.frontend.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "kubeapps.fullname" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 8080:8080
+
+   echo "Kubeapps URL: http://127.0.0.1:{{ .Values.frontend.service.port }}"
+   kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "kubeapps.fullname" . }} {{ .Values.frontend.service.port }}:{{ .Values.frontend.service.port }}
+
 {{- end }}
+{{- end }}
+
+2. Open a browser and access Kubeapps browsing to the obtained URL.

From 99d0b66532ea7c916095e35e95bab73ef6171073 Mon Sep 17 00:00:00 2001
From: Miguel Martinez <migmartri@gmail.com>
Date: Tue, 14 Aug 2018 13:32:37 -0700
Subject: [PATCH 2/2] Bump appVersion version

---
 chart/kubeapps/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml
index c0c0b71b425..630830b8a6c 100644
--- a/chart/kubeapps/Chart.yaml
+++ b/chart/kubeapps/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: kubeapps
 version: 0.1.1
-appVersion: 1.0.0.alpha.4
+appVersion: 1.0.0.alpha.5
 description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm
 icon: https://raw.githubusercontent.com/kubeapps/kubeapps/master/docs/img/logo.png
 keywords: