New ingress style (#27)

* new ingress style

* bump up version

* hostName fix

* helm-docs update

charts/clearml/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "2.4.0"
+version: "3.0.0"
 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: 2.4.0](https://img.shields.io/badge/Version-2.4.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.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)
 
 MLOps platform
 
@@ -252,13 +252,14 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | fileserver.storage.data.size | string | `"50Gi"` |  |
 | fileserver.tolerations | list | `[]` |  |
 | ingress.annotations | object | `{}` |  |
+| ingress.api.hostName | string | `"api.clearml.127-0-0-1.nip.io"` |  |
+| ingress.api.tlsSecretName | string | `""` |  |
+| ingress.app.hostName | string | `"app.clearml.127-0-0-1.nip.io"` |  |
+| ingress.app.tlsSecretName | string | `""` |  |
 | ingress.enabled | bool | `false` |  |
-| ingress.host | string | `""` |  |
+| ingress.files.hostName | string | `"files.clearml.127-0-0-1.nip.io"` |  |
-| ingress.hostPrefixApi | string | `"api."` |  |
+| ingress.files.tlsSecretName | string | `""` |  |
-| ingress.hostPrefixApp | string | `"app."` |  |
-| ingress.hostPrefixFiles | string | `"files."` |  |
 | ingress.name | string | `"clearml-server-ingress"` |  |
-| ingress.tls.secretName | string | `""` |  |
 | mongodb.architecture | string | `"standalone"` |  |
 | mongodb.auth.enabled | bool | `false` |  |
 | mongodb.enabled | bool | `true` |  |

charts/clearml/templates/ingress-api.yaml

@@ -1,5 +1,4 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "clearml.fullname" . -}}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -17,14 +16,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingress.tls.secretName }}
+  {{- if .Values.ingress.api.tlsSecretName }}
   tls:
     - hosts:
-        - "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
+        - {{ .Values.ingress.api.hostName }}
-      secretName: {{ .Values.ingress.tls.secretName }}
+      secretName: {{ .Values.ingress.api.tlsSecretName }}
   {{- end }}
   rules:
-    - host: "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
+    - host: {{ .Values.ingress.api.hostName }}
       http:
         paths:
           - path: "/"

charts/clearml/templates/ingress-app.yaml

@@ -1,5 +1,4 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "clearml.fullname" . -}}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -17,14 +16,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingress.tls.secretName }}
+  {{- if .Values.ingress.app.tlsSecretName }}
   tls:
     - hosts:
-        - "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
+        - {{ .Values.ingress.app.hostName }}
-      secretName: {{ .Values.ingress.tls.secretName }}
+      secretName: {{ .Values.ingress.app.tlsSecretName }}
   {{- end }}
   rules:
-    - host: "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
+    - host: {{ .Values.ingress.app.hostName }}
       http:
         paths:
           - path: "/"

charts/clearml/templates/ingress-files.yaml

@@ -1,5 +1,4 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "clearml.fullname" . -}}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -17,14 +16,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingress.tls.secretName }}
+  {{- if .Values.ingress.files.tlsSecretName }}
   tls:
     - hosts:
-        - "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
+        - {{ .Values.ingress.files.hostName }}
-      secretName: {{ .Values.ingress.tls.secretName }}
+      secretName: {{ .Values.ingress.files.tlsSecretName }}
   {{- end }}
   rules:
-    - host: "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
+    - host: {{ .Values.ingress.files.hostName }}
       http:
         paths:
           - path: "/"

charts/clearml/values.yaml

@@ -4,12 +4,15 @@ ingress:
   enabled: false
   name: clearml-server-ingress
   annotations: {}
-  host: ""
+  app:
-  hostPrefixApp: "app."
+    hostName: "app.clearml.127-0-0-1.nip.io"
-  hostPrefixApi: "api."
+    tlsSecretName: ""
-  hostPrefixFiles: "files."
+  api:
-  tls:
+    hostName: "api.clearml.127-0-0-1.nip.io"
-    secretName: ""
+    tlsSecretName: ""
+  files:
+    hostName: "files.clearml.127-0-0-1.nip.io"
+    tlsSecretName: ""
 
 apiserver:
   prepopulateEnabled: "true"