From 82ad17860d42c23184dbddab29e61291f246932f Mon Sep 17 00:00:00 2001 From: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com> Date: Thu, 16 Sep 2021 08:51:07 +0200 Subject: [PATCH] New ingress style (#27) * new ingress style * bump up version * hostName fix * helm-docs update --- charts/clearml/Chart.yaml | 2 +- charts/clearml/README.md | 13 +++++++------ charts/clearml/templates/ingress-api.yaml | 9 ++++----- charts/clearml/templates/ingress-app.yaml | 9 ++++----- charts/clearml/templates/ingress-files.yaml | 9 ++++----- charts/clearml/values.yaml | 15 +++++++++------ 6 files changed, 29 insertions(+), 28 deletions(-) diff --git a/charts/clearml/Chart.yaml b/charts/clearml/Chart.yaml index b5926b8..885dbad 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: "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 diff --git a/charts/clearml/README.md b/charts/clearml/README.md index 92e4c24..3f67337 100644 --- a/charts/clearml/README.md +++ b/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.hostPrefixApi | string | `"api."` | | -| ingress.hostPrefixApp | string | `"app."` | | -| ingress.hostPrefixFiles | string | `"files."` | | +| ingress.files.hostName | string | `"files.clearml.127-0-0-1.nip.io"` | | +| ingress.files.tlsSecretName | string | `""` | | | ingress.name | string | `"clearml-server-ingress"` | | -| ingress.tls.secretName | string | `""` | | | mongodb.architecture | string | `"standalone"` | | | mongodb.auth.enabled | bool | `false` | | | mongodb.enabled | bool | `true` | | diff --git a/charts/clearml/templates/ingress-api.yaml b/charts/clearml/templates/ingress-api.yaml index 237af7a..bc39991 100644 --- a/charts/clearml/templates/ingress-api.yaml +++ b/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 }}" - secretName: {{ .Values.ingress.tls.secretName }} + - {{ .Values.ingress.api.hostName }} + secretName: {{ .Values.ingress.api.tlsSecretName }} {{- end }} rules: - - host: "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}" + - host: {{ .Values.ingress.api.hostName }} http: paths: - path: "/" diff --git a/charts/clearml/templates/ingress-app.yaml b/charts/clearml/templates/ingress-app.yaml index 54a003c..19de310 100644 --- a/charts/clearml/templates/ingress-app.yaml +++ b/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 }}" - secretName: {{ .Values.ingress.tls.secretName }} + - {{ .Values.ingress.app.hostName }} + secretName: {{ .Values.ingress.app.tlsSecretName }} {{- end }} rules: - - host: "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}" + - host: {{ .Values.ingress.app.hostName }} http: paths: - path: "/" diff --git a/charts/clearml/templates/ingress-files.yaml b/charts/clearml/templates/ingress-files.yaml index 31b42a2..1458dcb 100644 --- a/charts/clearml/templates/ingress-files.yaml +++ b/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 }}" - secretName: {{ .Values.ingress.tls.secretName }} + - {{ .Values.ingress.files.hostName }} + secretName: {{ .Values.ingress.files.tlsSecretName }} {{- end }} rules: - - host: "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}" + - host: {{ .Values.ingress.files.hostName }} http: paths: - path: "/" diff --git a/charts/clearml/values.yaml b/charts/clearml/values.yaml index c0ce81b..03dd22f 100644 --- a/charts/clearml/values.yaml +++ b/charts/clearml/values.yaml @@ -4,12 +4,15 @@ ingress: enabled: false name: clearml-server-ingress annotations: {} - host: "" - hostPrefixApp: "app." - hostPrefixApi: "api." - hostPrefixFiles: "files." - tls: - secretName: "" + app: + hostName: "app.clearml.127-0-0-1.nip.io" + tlsSecretName: "" + api: + hostName: "api.clearml.127-0-0-1.nip.io" + tlsSecretName: "" + files: + hostName: "files.clearml.127-0-0-1.nip.io" + tlsSecretName: "" apiserver: prepopulateEnabled: "true"