From aa8bb30ecc246adbf92c20fd339f43162179b851 Mon Sep 17 00:00:00 2001
From: devOpsHelm <54980549+devOpsHelm@users.noreply.github.com>
Date: Fri, 14 Feb 2020 17:52:18 +0300
Subject: [PATCH] Clean up context path (#99) (#20762)

Signed-off-by: devOpsHelm <devops+1@hazelcast.com>
---
 stable/hazelcast/Chart.yaml                                 | 2 +-
 stable/hazelcast/templates/NOTES.txt                        | 6 +++---
 .../hazelcast/templates/tests/test-management-center.yaml   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/stable/hazelcast/Chart.yaml b/stable/hazelcast/Chart.yaml
index 64e2e84106..9634e0e381 100644
--- a/stable/hazelcast/Chart.yaml
+++ b/stable/hazelcast/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: hazelcast
-version: 3.0.1
+version: 3.0.2
 appVersion: "4.0"
 tillerVersion: ">=2.7.2"
 kubeVersion: ">=1.9.0-0"
diff --git a/stable/hazelcast/templates/NOTES.txt b/stable/hazelcast/templates/NOTES.txt
index 26726fec43..7e5d00110f 100644
--- a/stable/hazelcast/templates/NOTES.txt
+++ b/stable/hazelcast/templates/NOTES.txt
@@ -42,16 +42,16 @@ To access Hazelcast Management Center:
 {{- if contains "LoadBalancer" .Values.mancenter.service.type }}
   *) Check Management Center external IP:
      $ export MANCENTER_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mancenter.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  *) Open Browser at: http://$MANCENTER_IP:{{ .Values.mancenter.service.port }}{{- if .Values.mancenter.contextPath }}{{ .Values.mancenter.contextPath }}{{- else }}/hazelcast-mancenter{{- end }}
+  *) Open Browser at: http://$MANCENTER_IP:{{ .Values.mancenter.service.port }}{{ .Values.mancenter.contextPath }}
 {{- else if contains "ClusterIP" .Values.mancenter.service.type }}
   *) Forward port from POD:
      $ export POD=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ template "hazelcast.name" . }},role=mancenter" -o jsonpath="{.items[0].metadata.name}")
      $ kubectl port-forward --namespace {{ .Release.Namespace }} $POD 8080:8080
-  *) Open Browser at: http://127.0.0.1:8080{{- if .Values.mancenter.contextPath }}{{ .Values.mancenter.contextPath }}{{- else }}/hazelcast-mancenter{{- end }}
+  *) Open Browser at: http://127.0.0.1:8080{{ .Values.mancenter.contextPath }}
 {{- else if contains "NodePort" .Values.mancenter.service.type }}
   *) Check Node IP and Port:
      $ 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 "mancenter.fullname" . }})
-  *) Open Browser at: http://$NODE_IP:$NODE_PORT{{- if .Values.mancenter.contextPath }}{{ .Values.mancenter.contextPath }}{{- else }}/hazelcast-mancenter{{- end }}
+  *) Open Browser at: http://$NODE_IP:$NODE_PORT{{ .Values.mancenter.contextPath }}
 {{- end }}
 {{- end }}
diff --git a/stable/hazelcast/templates/tests/test-management-center.yaml b/stable/hazelcast/templates/tests/test-management-center.yaml
index a956e809ac..f8b35f0cfd 100644
--- a/stable/hazelcast/templates/tests/test-management-center.yaml
+++ b/stable/hazelcast/templates/tests/test-management-center.yaml
@@ -32,7 +32,7 @@ spec:
     - |
       set -ex
       # Get the HTTP Response Code of the Health Check
-      HEALTH_CHECK_HTTP_RESPONSE_CODE=$(curl --write-out %{http_code} --silent --output /dev/null {{ template "mancenter.fullname" . }}:{{ .Values.mancenter.service.port }}{{- if .Values.mancenter.contextPath }}{{ .Values.mancenter.contextPath }}{{- else }}/hazelcast-mancenter{{- end }}/health)
+      HEALTH_CHECK_HTTP_RESPONSE_CODE=$(curl --write-out %{http_code} --silent --output /dev/null {{ template "mancenter.fullname" . }}:{{ .Values.mancenter.service.port }}{{ .Values.mancenter.contextPath }}/health)
       # Test the currect number of Hazelcast members
       test ${HEALTH_CHECK_HTTP_RESPONSE_CODE} -eq 200
     securityContext: