From d9e850b41d666f092b92fae62a699f9ffbebb634 Mon Sep 17 00:00:00 2001
From: Bhupendra <bdpiparva@gmail.com>
Date: Mon, 19 Mar 2018 21:47:03 +0530
Subject: [PATCH] [stable/gocd] Changed kubernetes plugin version to v1.0.0
 (#4268)

* Updated the kubernetes ea plugin version in values.yaml file.

* Rearranged contents of the Notes.txt file.

* Removed $ from Notes.txt
---
 stable/gocd/Chart.yaml          |  2 +-
 stable/gocd/templates/NOTES.txt | 69 ++++++++++++++++-----------------
 stable/gocd/values.yaml         |  2 +-
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/stable/gocd/Chart.yaml b/stable/gocd/Chart.yaml
index aba02be377..3e297a2a6f 100644
--- a/stable/gocd/Chart.yaml
+++ b/stable/gocd/Chart.yaml
@@ -1,6 +1,6 @@
 name: gocd
 home: https://www.gocd.org/
-version: 1.0.0
+version: 1.0.1
 appVersion: 18.2.0
 description: GoCD is an open-source continuous delivery server to model and visualize complex workflows with ease.
 icon: https://gocd.github.io/assets/images/go-icon-black-192x192.png
diff --git a/stable/gocd/templates/NOTES.txt b/stable/gocd/templates/NOTES.txt
index 937105ef67..4b6fde256f 100644
--- a/stable/gocd/templates/NOTES.txt
+++ b/stable/gocd/templates/NOTES.txt
@@ -1,10 +1,9 @@
 1. Get the GoCD server URL by running these commands:
 {{- if .Values.server.ingress.enabled }}
     It may take a few minutes before the IP is available to access the GoCD server.
-    ip=$(kubectl get ingress --namespace {{ .Release.Namespace }} {{ template "gocd.fullname" . }}-server -o jsonpath="{.status.loadBalancer.ingress[0].ip}")
-    echo "http://$ip"
+         echo "GoCD server public IP: http://$(kubectl get ingress {{ template "gocd.fullname" . }}-server --namespace={{ .Release.Namespace }}  -o jsonpath='{.status.loadBalancer.ingress[0].ip}')"
 {{- range .Values.server.ingress.hosts }}
-  http://{{ . }}
+    http://{{ . }}
 {{- end }}
 {{- else if contains "NodePort" .Values.server.service.type }}
     export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "gocd.fullname" . }}-server)
@@ -13,15 +12,43 @@
 {{- else if contains "LoadBalancer" .Values.server.service.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 svc -w {{ template "gocd.name" . }}-server'
-    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "gocd.name" . }}-server -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-    echo http://$SERVICE_IP:{{ .Values.server.service.externalPort }}
+        export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "gocd.name" . }}-server -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+        echo http://$SERVICE_IP:{{ .Values.server.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.server.service.type }}
     export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "gocd.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
     echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:{{ .Values.server.service.httpPort }}
+    kubectl port-forward $POD_NAME 8080:{{ .Values.server.service.httpPort }}
 {{- end }}
 
-2. Persistence
+2. Get the service account token to configure the elastic agent plugin by doing the following:
+{{- if .Values.rbac.create -}}
+    {{- if .Values.rbac.roleRef -}}
+    {{ else }}
+    A default role {{ template "gocd.fullname" . }} with cluster scoped privileges has been configured.
+    {{ end }}
+    The service account called {{ template "gocd.serviceAccountName" . }} in namespace {{ .Release.Namespace }} has been associated with the role. To check,
+        secret_name=$(kubectl get serviceaccount {{ template "gocd.serviceAccountName" . }} --namespace={{ .Release.Namespace }}  -o jsonpath="{.secrets[0].name}")
+        kubectl get secret $secret_name --namespace={{ .Release.Namespace }} -o jsonpath="{.data['token']}" | base64 --decode
+
+    To obtain the CA certificate, do
+        kubectl get secret $secret_name --namespace={{ .Release.Namespace }}  -o jsonpath="{.data['ca\.crt']}" | base64 --decode
+{{ else }}
+    Looks like rbac was disabled during installation.
+    For configuring the plugin settings for the kubernetes elastic agent plugin, ensure that the service account `{{ template "gocd.serviceAccountName" . }}` present in the namespace `{{ .Release.Namespace }}` or any manually created service account has been granted the following privileges.
+    Privileges:
+      - nodes: list, get
+      - events: list, watch
+      - namespace: list, get
+      - pods, pods/log: *
+{{ end }}
+
+3. The GoCD server URL for configuring the Kubernetes elastic agent plugin settings:
+    echo "https://$(kubectl get service {{ template "gocd.fullname" . }}-server --namespace={{ .Release.Namespace }}  -o jsonpath='{.spec.clusterIP}'):8154/go"
+
+4. The cluster URL for configuring the Kubernetes elastic agent plugin settings can be obtained by:
+    kubectl cluster-info
+
+5. Persistence
 {{- if .Values.server.persistence.enabled -}}
 {{ if not .Values.server.persistence.storageClass }}
     ################################################################################################
@@ -34,31 +61,3 @@
     WARNING: Persistence is disabled. You will lose all data at the time of pod termination!
     ################################################################################################
 {{ end }}
-
-3. Get the service account token to configure the elastic agent plugin by doing the following:
-{{- if .Values.rbac.create -}}
-    {{- if .Values.rbac.roleRef -}}
-    {{ else }}
-    A default role {{ template "gocd.fullname" . }} with cluster scoped privileges has been configured.
-    {{ end }}
-    The service account called {{ template "gocd.serviceAccountName" . }} in namespace {{ .Release.Namespace }} has been associated with the role. To check,
-    $ secret_name=$(kubectl --namespace={{ .Release.Namespace }} get serviceaccount {{ template "gocd.serviceAccountName" . }} -o jsonpath="{.secrets[0].name}")
-    $ kubectl --namespace={{ .Release.Namespace }} get secret $secret_name -o jsonpath="{.data['token']}" | base64 --decode
-
-    To obtain the CA certificate, do
-    $ kubectl --namespace={{ .Release.Namespace }} get secret $secret_name -o jsonpath="{.data['ca\.crt']}" | base64 --decode
-{{ else }}
-    Looks like rbac was disabled during installation.
-    For configuring the plugin settings for the kubernetes elastic agent plugin, ensure that the service account `{{ template "gocd.serviceAccountName" . }}` present in the namespace `{{ .Release.Namespace }}` or any manually created service account has been granted the following privileges.
-    Privileges:
-      - nodes: list, get
-      - events: list, watch
-      - namespace: list, get
-      - pods, pods/log: *
-{{ end }}
-
-4. The GoCD server URL for configuring the Kubernetes elastic agent plugin settings:
-    echo "https://$(kubectl --namespace --namespace={{ .Release.Namespace }} get service {{ template "gocd.fullname" . }}-server -o jsonpath='{.spec.clusterIP}'):8154/go"
-
-5. The cluster URL for configuring the Kubernetes elastic agent plugin settings can be obtained by
-    $ kubectl cluster-info
\ No newline at end of file
diff --git a/stable/gocd/values.yaml b/stable/gocd/values.yaml
index 7f12a970ae..ebee01460d 100644
--- a/stable/gocd/values.yaml
+++ b/stable/gocd/values.yaml
@@ -58,7 +58,7 @@ server:
     #  server.env.extraEnvVars is the list of environment variables passed to GoCD Server
     extraEnvVars:
       - name: GOCD_PLUGIN_INSTALL_kubernetes-elastic-agents
-        value: https://github.com/gocd/kubernetes-elastic-agents/releases/download/v0.0.1/kubernetes-elastic-agent-0.0.1-0.jar
+        value: https://github.com/gocd/kubernetes-elastic-agents/releases/download/v1.0.0/kubernetes-elastic-agent-1.0.0-94.jar
   service:
     # server.service.type is the GoCD Server service type
     type: "NodePort"