From 7c4695761b6581cb3765980529f4079e9de9535a Mon Sep 17 00:00:00 2001
From: Quentin Boileau <qboileau@conduktor.io>
Date: Mon, 26 Feb 2024 18:16:48 +0100
Subject: [PATCH] Fix cortex tests and NOTES.txt

---
 charts/console/templates/NOTES.txt                     | 10 +++++-----
 .../console/templates/tests/03-platform-healthy.yaml   |  2 +-
 .../templates/tests/04-platform-cortex-healthy.yaml    |  7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/charts/console/templates/NOTES.txt b/charts/console/templates/NOTES.txt
index f50d0e4..66f566a 100644
--- a/charts/console/templates/NOTES.txt
+++ b/charts/console/templates/NOTES.txt
@@ -25,12 +25,12 @@ In order to replicate the container startup scripts execute this command:
 {{- end }}
 
 {{ if .Values.ingress.enabled }}
-Conduktor Platform will be accessible at :  http://{{ .Values.ingress.hostname }}
+Conduktor Console will be accessible at :  http://{{ .Values.ingress.hostname }}
 {{- else }}
-Forward Platform service locally with the command (may take a few seconds to be ready):
+Forward Console service locally with the command (may take a few seconds to be ready):
 kubectl port-forward -n {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} 8080:80
 
-Conduktor Platform will be accessible at : http://127.0.0.1:8080
+Conduktor Console will be accessible at : http://127.0.0.1:8080
 {{- end }}
 
 To connect use following admin account ADMIN_LOGIN and ADMIN_PASSWORD
@@ -38,11 +38,11 @@ To connect use following admin account ADMIN_LOGIN and ADMIN_PASSWORD
 ADMIN_LOGIN="{{ include "common.secrets.lookup" (dict "secret" (include "conduktor.platform.secretName" .) "key" "CDK_ADMIN_EMAIL" "defaultValue" .Values.config.admin.email "context" $) | b64dec }}"
 ADMIN_PASSWORD="$(kubectl get secret {{ include "conduktor.platform.secretName" .  }} -n {{ .Release.Namespace }} -o jsonpath="{.data.CDK_ADMIN_PASSWORD}" | base64 --decode)"
 
-More details on Platform configuration are available at https://docs.conduktor.io/platform/
+More details on Console configuration are available at https://docs.conduktor.io/platform/
 If you have any issue, please contact our support by browsing to https://www.conduktor.io/contact/support/
 
 {{ if and (empty .Values.config.license) (empty .Values.config.existingLicenseSecret) }}
-You are using the free version of Conduktor Platform.
+You are using the free version of Conduktor Console.
 If you need more, please contact our sales team by browsing to https://www.conduktor.io/contact/sales/
 {{- end }}
 
diff --git a/charts/console/templates/tests/03-platform-healthy.yaml b/charts/console/templates/tests/03-platform-healthy.yaml
index 519aac3..18c8c80 100644
--- a/charts/console/templates/tests/03-platform-healthy.yaml
+++ b/charts/console/templates/tests/03-platform-healthy.yaml
@@ -9,7 +9,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "common.names.fullname" . }}-test-platform"
+  name: "{{ include "common.names.fullname" . }}-test-console"
   annotations:
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": hook-succeeded
diff --git a/charts/console/templates/tests/04-platform-cortex-healthy.yaml b/charts/console/templates/tests/04-platform-cortex-healthy.yaml
index 9409f8a..16ecf40 100644
--- a/charts/console/templates/tests/04-platform-cortex-healthy.yaml
+++ b/charts/console/templates/tests/04-platform-cortex-healthy.yaml
@@ -6,10 +6,11 @@
 {{- $cortexUrl := printf "http://%v:%v/ready" $serviceName $cortexPort }}
 {{- $alertManagerUrl := printf "http://%v:%v/ready" $serviceName $alertManagerPort }}
 {{- $prometheusUrl := printf "http://%v:%v" $serviceName $prometheusPort }}
+{{- $prometheusTargetsUrl := printf "%v/api/v1/targets" $prometheusUrl }}
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "common.names.fullname" . }}-test-platform-cortex"
+  name: "{{ include "common.names.fullname" . }}-test-cortex"
   annotations:
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": hook-succeeded
@@ -32,10 +33,10 @@ spec:
         - |
           retries=0
           max_retries=10
-          retry_interval=3
+          retry_interval=5
 
           while [ $retries -lt $max_retries ]; do
-            if curl -s URL | jq -e '.data.activeTargets[0].health == "up" | if . then true else false end'; then
+            if curl -sv {{ $prometheusTargetsUrl }} | jq -e '.data.activeTargets[0].health == "up" | if . then true else false end'; then
               exit 0
             else
               echo "Retry $((retries+1)) of $max_retries. Retrying in $retry_interval seconds..."