From 9e97c03b5ff0d207bedee22ba2406c4d1ac37a0e Mon Sep 17 00:00:00 2001
From: Valeriano Manassero
 <14011549+valeriano-manassero@users.noreply.github.com>
Date: Wed, 25 Jan 2023 16:34:28 +0100
Subject: [PATCH] Fix override url (#139)

* Fixed: url override generation

* Changed: bump up version

* Changed: supported k8s versions

* Changed: changelog update
---
 charts/clearml/Chart.yaml                         | 8 +++++---
 charts/clearml/README.md                          | 4 ++--
 charts/clearml/templates/_helpers.tpl             | 6 +++---
 charts/clearml/templates/webserver-configmap.yaml | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/charts/clearml/Chart.yaml b/charts/clearml/Chart.yaml
index 6da5aa7..fa7e38b 100644
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "5.4.1"
+version: "5.4.2"
 appVersion: "1.9.2"
-kubeVersion: ">= 1.21.0-0 < 1.26.0-0"
+kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
@@ -32,5 +32,7 @@ dependencies:
     condition: elasticsearch.enabled
 annotations:
   artifacthub.io/changes: |
+    - kind: added
+      description: support for kubernetes 1.26
     - kind: fixed
-      description: enterprise apps deployment not working
+      description: wrong override display url for Enterprise
diff --git a/charts/clearml/README.md b/charts/clearml/README.md
index 51c5e09..1670252 100644
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![Version: 5.4.1](https://img.shields.io/badge/Version-5.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.2](https://img.shields.io/badge/AppVersion-1.9.2-informational?style=flat-square)
+![Version: 5.4.2](https://img.shields.io/badge/Version-5.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.2](https://img.shields.io/badge/AppVersion-1.9.2-informational?style=flat-square)
 
 MLOps platform
 
@@ -130,7 +130,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 
 ## Requirements
 
-Kubernetes: `>= 1.21.0-0 < 1.26.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
diff --git a/charts/clearml/templates/_helpers.tpl b/charts/clearml/templates/_helpers.tpl
index 0dc67c0..4f1eddb 100644
--- a/charts/clearml/templates/_helpers.tpl
+++ b/charts/clearml/templates/_helpers.tpl
@@ -202,11 +202,11 @@ clientConfiguration string compose
 {{- define "clearml.clientConfiguration" -}}
 {{- $clientConfiguration := "" }}
 {{- if and (.Values.clearml.clientConfigurationApiUrl) .Values.clearml.clientConfigurationFilesUrl }}
-{{- $clientConfiguration = "{\"apiServer\":\"{{ .Values.clearml.clientConfigurationApiUrl }}\",\"filesServer\":\"{{ .Values.clearml.clientConfigurationFilesUrl }}\"}" }}
+{{- $clientConfiguration = printf "%s%s%s%s%s" "{\"apiServer\":\"" .Values.clearml.clientConfigurationApiUrl "\",\"filesServer\":\"" .Values.clearml.clientConfigurationFilesUrl "\"}" }}
 {{- else if .Values.clearml.clientConfigurationApiUrl }}
-{{- $clientConfiguration = "{\"apiServer\":\"{{ .Values.clearml.clientConfigurationApiUrl }}\"}" }}
+{{- $clientConfiguration = printf "%s%s%s" "{\"apiServer\":\"" .Values.clearml.clientConfigurationApiUrl "\"}" }}
 {{- else if .Values.clearml.clientConfigurationFilesUrl }}
-{{- $clientConfiguration = "{\"filesServer\":\"{{ .Values.clearml.clientConfigurationFilesUrl }}\"}" }}
+{{- $clientConfiguration = printf "%s%s%s" "{\"filesServer\":\"" .Values.clearml.clientConfigurationFilesUrl "\"}" }}
 {{- end }}
 {{- $clientConfiguration }}
 {{- end }}
diff --git a/charts/clearml/templates/webserver-configmap.yaml b/charts/clearml/templates/webserver-configmap.yaml
index 4445b43..af8f693 100644
--- a/charts/clearml/templates/webserver-configmap.yaml
+++ b/charts/clearml/templates/webserver-configmap.yaml
@@ -17,7 +17,7 @@ data:
       },
       "docsLink": "https://clear.ml/docs/",
       "applicationsBackground": "ui-assets/apps-message.svg"
-      {{- if and .Values.webserver.overrideReferenceApiUrl .Values.enterpriseFeatures.overrideReferenceFileUrl }}
+      {{- if and .Values.enterpriseFeatures.overrideReferenceApiUrl .Values.enterpriseFeatures.overrideReferenceFileUrl }}
       ,
       "fileBaseUrl": "{{ .Values.enterpriseFeatures.overrideReferenceFileUrl }}",
       "apiBaseUrl": "{{ .Values.enterpriseFeatures.overrideReferenceApiUrl }}"