mirror of
https://github.com/clearml/clearml-helm-charts
synced 2025-03-03 02:31:48 +00:00
New ingress style (#27)
* new ingress style * bump up version * hostName fix * helm-docs update
This commit is contained in:
parent
aa761dd450
commit
82ad17860d
@ -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
|
||||
|
@ -1,6 +1,6 @@
|
||||
# ClearML Ecosystem for Kubernetes
|
||||
|
||||
  
|
||||
  
|
||||
|
||||
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` | |
|
||||
|
@ -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: "/"
|
||||
|
@ -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: "/"
|
||||
|
@ -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: "/"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user