Fix helper typo (#30)

* fix helper typo on api service name

* bump up version

charts/clearml/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "3.0.1"
+version: "3.0.3"
 appVersion: "1.1.1"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg

charts/clearml/README.md

@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![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)
+![Version: 3.0.3](https://img.shields.io/badge/Version-3.0.3-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
 

charts/clearml/templates/_helpers.tpl

@@ -102,9 +102,9 @@ Create the name of the App service to use
 {{- define "clearml.serviceApp" -}}
 {{- if .Values.ingress.enabled }}
 {{- if .Values.ingress.app.tlsSecretName }}
-{{- printf "%s%s%s" "https://" .Values.ingress.app.hostName }}
+{{- printf "%s%s" "https://" .Values.ingress.app.hostName }}
 {{- else }}
-{{- printf "%s%s%s" "http://" .Values.ingress.app.hostName }}
+{{- printf "%s%s" "http://" .Values.ingress.app.hostName }}
 {{- end }}
 {{- else }}
 {{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-webserver:" (.Values.webserver.service.port | toString) }}
@@ -117,9 +117,9 @@ Create the name of the Api service to use
 {{- define "clearml.serviceApi" -}}
 {{- if .Values.ingress.enabled }}
 {{- if .Values.ingress.api.tlsSecretName }}
-{{- printf "%s%s%s" "https://" .Values.ingress.api.hostName }}
+{{- printf "%s%s" "https://" .Values.ingress.api.hostName }}
 {{- else }}
-{{- printf "%s%s%s" "http://" .Values.ingress.api.hostName }}
+{{- printf "%s%s" "http://" .Values.ingress.api.hostName }}
 {{- end }}
 {{- else }}
 {{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-apiserver:" (.Values.apiserver.service.port | toString) }}
@@ -132,9 +132,9 @@ Create the name of the Files service to use
 {{- define "clearml.serviceFiles" -}}
 {{- if .Values.ingress.enabled }}
 {{- if .Values.ingress.files.tlsSecretName }}
-{{- printf "%s%s%s" "https://" .Values.ingress.files.hostName }}
+{{- printf "%s%s" "https://" .Values.ingress.files.hostName }}
 {{- else }}
-{{- printf "%s%s%s" "http://" .Values.ingress.files.hostName }}
+{{- printf "%s%s" "http://" .Values.ingress.files.hostName }}
 {{- end }}
 {{- else }}
 {{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-fileserver:" (.Values.fileserver.service.port | toString) }}

charts/clearml/templates/ingress-api.yaml

@@ -23,12 +23,20 @@ spec:
       secretName: {{ .Values.ingress.api.tlsSecretName }}
   {{- end }}
   rules:
-    - host: {{ .Values.ingress.api.hostName }}
-      http:
-        paths:
-          - path: "/"
-            pathType: Prefix
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-apiserver
-              servicePort: {{ .Values.apiserver.service.port }}
+  - host: {{ .Values.ingress.api.hostName }}
+    http:
+      paths:
+      - path: "/"
+  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ include "clearml.fullname" . }}-apiserver
+            port:
+              number: {{ .Values.apiserver.service.port }}
+  {{ else }}
+        backend:
+          serviceName: {{ include "clearml.fullname" . }}-apiserver
+          servicePort: {{ .Values.apiserver.service.port }}
+  {{ end }}
 {{- end }}

charts/clearml/templates/ingress-app.yaml

@@ -23,12 +23,20 @@ spec:
       secretName: {{ .Values.ingress.app.tlsSecretName }}
   {{- end }}
   rules:
-    - host: {{ .Values.ingress.app.hostName }}
-      http:
-        paths:
-          - path: "/"
-            pathType: Prefix
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-webserver
-              servicePort: {{ .Values.webserver.service.port }}
+  - host: {{ .Values.ingress.app.hostName }}
+    http:
+      paths:
+      - path: "/"
+  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ include "clearml.fullname" . }}-webserver
+            port:
+              number: {{ .Values.webserver.service.port }}
+  {{ else }}
+        backend:
+          serviceName: {{ include "clearml.fullname" . }}-webserver
+          servicePort: {{ .Values.webserver.service.port }}
+  {{ end }}
 {{- end }}

charts/clearml/templates/ingress-files.yaml

@@ -23,12 +23,20 @@ spec:
       secretName: {{ .Values.ingress.files.tlsSecretName }}
   {{- end }}
   rules:
-    - host: {{ .Values.ingress.files.hostName }}
-      http:
-        paths:
-          - path: "/"
-            pathType: Prefix
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-fileserver
-              servicePort: {{ .Values.fileserver.service.port }}
+  - host: {{ .Values.ingress.files.hostName }}
+    http:
+      paths:
+      - path: "/"
+  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ include "clearml.fullname" . }}-fileserver
+            port:
+              number: {{ .Values.fileserver.service.port }}
+  {{ else }}
+        backend:
+          serviceName: {{ include "clearml.fullname" . }}-fileserver
+          servicePort: {{ .Values.fileserver.service.port }}
+  {{ end }}
 {{- end }}