From 6321442a012e7e903061222bc1fe0be28b635a7c Mon Sep 17 00:00:00 2001
From: Christine Banek <cbanek@gmail.com>
Date: Tue, 12 Nov 2019 03:17:40 -0700
Subject: [PATCH] Better Helm NOTES.txt templating (#161)

* Better Helm chart NOTES.txt templating

Add some extra templating to NOTES.txt, which are displayed to the
user after a successful helm install command.  These are really
helpful notes, but if you didn't specify a release name of argocd
or put it in a separate namespace, these commands weren't exactly
working with a copy paste.  Now they should take into account
the release name and release namespace helm was given.

* Small CONTRIBUTING.md command line change

Instead of just doing `argocd version`, be a little more explicit
by passing in the server name and insecure flag.  This will make
sure that you're doing the version of the instance you're
port-forwarding above, as opposed to some other argocd.
---
 CONTRIBUTING.md                    | 2 +-
 charts/argo-cd/Chart.yaml          | 2 +-
 charts/argo-cd/templates/NOTES.txt | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3ca1d3c2..c7913b3a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,7 +32,7 @@ kubectl port-forward service/argo-cd-argocd-server -n argocd 8080:443
 In a new terminal:
 
 ```
-argocd version
+argocd version --server localhost:8080 --insecure
 # reset password to 'Password1!'
 kubectl -n argocd patch secret argocd-secret \
   -p '{"stringData": {
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index b8031b13..e7e48429 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.2.4"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.0.6
+version: 1.0.7
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/NOTES.txt b/charts/argo-cd/templates/NOTES.txt
index 451727d6..4bec139b 100644
--- a/charts/argo-cd/templates/NOTES.txt
+++ b/charts/argo-cd/templates/NOTES.txt
@@ -1,6 +1,6 @@
 In order to access the server UI you have the following options:
 
-1. kubectl port-forward service/argo-cd-argocd-server -n argocd 8080:443
+1. kubectl port-forward service/{{include "argo-cd.fullname" . }}-server -n {{ .Release.Namespace }} 8080:443
 
     and then open the browser on http://localhost:8080 and accept the certificate
 
@@ -12,4 +12,4 @@ In order to access the server UI you have the following options:
 After reaching the UI the first time you can login with username: admin and the password will be the
 name of the server pod. You can get the pod name by running:
 
-kubectl get pods -n argocd -l app.kubernetes.io/name={{ include "argo-cd.name" . }}-server -o name | cut -d'/' -f 2
\ No newline at end of file
+kubectl get pods -n {{ .Release.Namespace }} -l app.kubernetes.io/name={{ include "argo-cd.name" . }}-server -o name | cut -d'/' -f 2