From 7352f3583638403039f8a860b31d2ea875a96904 Mon Sep 17 00:00:00 2001
From: Valeriano Manassero
 <14011549+valeriano-manassero@users.noreply.github.com>
Date: Thu, 16 Sep 2021 09:11:58 +0200
Subject: [PATCH] Helpers fix (#28)

* fix wrong service names

* bump up version
---
 charts/clearml/Chart.yaml             |  2 +-
 charts/clearml/README.md              |  2 +-
 charts/clearml/templates/_helpers.tpl | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/charts/clearml/Chart.yaml b/charts/clearml/Chart.yaml
index 885dbad..0c28350 100644
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "3.0.0"
+version: "3.0.1"
 appVersion: "1.1.1"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
diff --git a/charts/clearml/README.md b/charts/clearml/README.md
index 3f67337..69939d4 100644
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
+![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
 
 MLOps platform
 
diff --git a/charts/clearml/templates/_helpers.tpl b/charts/clearml/templates/_helpers.tpl
index 6bf3977..89a2d22 100644
--- a/charts/clearml/templates/_helpers.tpl
+++ b/charts/clearml/templates/_helpers.tpl
@@ -101,10 +101,10 @@ Create the name of the App service to use
 */}}
 {{- define "clearml.serviceApp" -}}
 {{- if .Values.ingress.enabled }}
-{{- if .Values.ingress.tls.secretName }}
-{{- printf "%s%s%s" "https://" .Values.ingress.hostPrefixApp .Values.ingress.host }}
+{{- if .Values.ingress.app.tlsSecretName }}
+{{- printf "%s%s%s" "https://" .Values.ingress.app.hostName }}
 {{- else }}
-{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixApp .Values.ingress.host }}
+{{- printf "%s%s%s" "http://" .Values.ingress.app.hostName }}
 {{- end }}
 {{- else }}
 {{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-webserver:" (.Values.webserver.service.port | toString) }}
@@ -116,10 +116,10 @@ Create the name of the Api service to use
 */}}
 {{- define "clearml.serviceApi" -}}
 {{- if .Values.ingress.enabled }}
-{{- if .Values.ingress.tls.secretName }}
-{{- printf "%s%s%s" "https://" .Values.ingress.hostPrefixApi .Values.ingress.host }}
+{{- if .Values.ingress.api.tlsSecretName }}
+{{- printf "%s%s%s" "https://" .Values.ingress.api.hostName }}
 {{- else }}
-{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixApi .Values.ingress.host }}
+{{- printf "%s%s%s" "http://" .Values.ingress.api.hostName }}
 {{- end }}
 {{- else }}
 {{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-apiserver:" (.Values.apiserver.service.port | toString) }}
@@ -131,10 +131,10 @@ Create the name of the Files service to use
 */}}
 {{- define "clearml.serviceFiles" -}}
 {{- if .Values.ingress.enabled }}
-{{- if .Values.ingress.tls.secretName }}
-{{- printf "%s%s%s" "https://" .Values.ingress.hostPrefixFiles .Values.ingress.host }}
+{{- if .Values.ingress.files.tlsSecretName }}
+{{- printf "%s%s%s" "https://" .Values.ingress.files.hostName }}
 {{- else }}
-{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixFiles .Values.ingress.host }}
+{{- printf "%s%s%s" "http://" .Values.ingress.files.hostName }}
 {{- end }}
 {{- else }}
 {{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-fileserver:" (.Values.fileserver.service.port | toString) }}