Update to Console 1.21.0

charts/console/Chart.yaml

@@ -1,12 +1,12 @@
 apiVersion: v2
 name: console
-appVersion: 1.20.0
-version: 1.5.5
-description: Helm chart to deploy Conduktor Platform on Kubernetes
+appVersion: 1.21.0
+version: 1.6.0
+description: Helm chart to deploy Conduktor Console on Kubernetes
 icon: https://www.conduktor.io/svgs/logo/symbol.svg
 home: https://www.conduktor.io
 maintainers:
-  - name: Conduktor Platform
+  - name: Conduktor
     email: [email protected]
     url: https://docs.conduktor.io/platform
 sources:

charts/console/templates/NOTES.txt

@@ -25,24 +25,24 @@ 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
 
 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 }}
 

charts/console/templates/platform/deployment.yaml → charts/console/templates/console/deployment.yaml

@@ -30,9 +30,9 @@ spec:
         {{- if .Values.platform.podAnnotations }}
         {{- include "common.tplvalues.render" (dict "value" .Values.platform.podAnnotations "context" $) | nindent 8 }}
         {{- end }}
-        checksum/config: {{ include (print $.Template.BasePath "/platform/configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/console/configmap.yaml") . | sha256sum }}
         {{- if not .Values.config.existingSecret }}
-        checksum/credentials: {{ include (print $.Template.BasePath "/platform/secret-credentials.yaml") . | sha256sum }}
+        checksum/credentials: {{ include (print $.Template.BasePath "/console/secret-credentials.yaml") . | sha256sum }}
         {{- end }}
         {{- if and .Values.config.license (not .Values.config.existingLicenseSecret) }}
         checksum/license: {{ include (print $.Template.BasePath "/secret-license.yaml") . | sha256sum }}

charts/console/templates/platform-cortex/deployment.yaml → charts/console/templates/cortex/deployment.yaml

@@ -33,9 +33,9 @@ spec:
         {{- if .Values.platformCortex.podAnnotations }}
         {{- include "common.tplvalues.render" (dict "value" .Values.platformCortex.podAnnotations "context" $) | nindent 8 }}
         {{- end }}
-        checksum/config: {{ include (print $.Template.BasePath "/platform-cortex/configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/cortex/configmap.yaml") . | sha256sum }}
         {{- if not .Values.monitoringConfig.existingSecret }}
-        checksum/credentials: {{ include (print $.Template.BasePath "/platform-cortex/secrets.yaml") . | sha256sum }}
+        checksum/credentials: {{ include (print $.Template.BasePath "/cortex/secrets.yaml") . | sha256sum }}
         {{- end }}
       labels: {{- include "common.labels.standard" . | nindent 8 }}
         app.kubernetes.io/component: conduktor-platform-cortex

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

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..."