ClearML/clearml-helm-charts
1
0
Fork 0
mirror of https://github.com/clearml/clearml-helm-charts synced 2025-04-17 01:31:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Wiktor Starzak 2021-08-31 17:15:30 +02:00
parent 618a269c97
commit dee9655ea4
13 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/clearml/Chart.yaml
View File

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

6
charts/clearml/templates/_helpers.tpl
View File

@ -107,7 +107,7 @@ Create the name of the App service to use
{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixApp .Values.ingress.host }}
{{- end }}
{{- else }}
{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-webserver:" (.Values.webserver.service.port | quote) }}
{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-webserver:" (.Values.webserver.service.port | toString) }}
{{- end }}
{{- end }}
@ -122,7 +122,7 @@ Create the name of the Api service to use
{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixApi .Values.ingress.host }}
{{- end }}
{{- else }}
{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-apiserver:" (.Values.apiserver.service.port | quote) }}
{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-apiserver:" (.Values.apiserver.service.port | toString) }}
{{- end }}
{{- end }}
@ -137,6 +137,6 @@ Create the name of the Files service to use
{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixFiles .Values.ingress.host }}
{{- end }}
{{- else }}
{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-fileserver:" (.Values.fileserver.service.port | quote) }}
{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-fileserver:" (.Values.fileserver.service.port | toString) }}
{{- end }}
{{- end }}

13
charts/clearml/templates/configmap-apiserver.yaml Normal file
View File

@ -0,0 +1,13 @@
{{- if .Values.apiserver.additionalConfigs -}}
apiVersion: v1
kind: ConfigMap
metadata:
name: "{{ include "clearml.fullname" . }}-apiserver-configmap"
labels:
{{- include "clearml.labels" . | nindent 4 }}
data:
{{- range $key, $val := .Values.apiserver.additionalConfigs }}
{{ $key }}: |
{{- $val | nindent 4 }}
{{- end }}
{{- end -}}

2
charts/clearml/templates/deployment-agent.yaml
View File

@ -1,4 +1,5 @@
{{- range $key, $value := .Values.agentGroups }}
{{ if $value.enabled }}
{{- with $value }}
---
apiVersion: apps/v1
@ -114,3 +115,4 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- end }}

14
charts/clearml/templates/deployment-apiserver.yaml
View File

@ -18,12 +18,6 @@ spec:
labels:
{{- include "clearml.selectorLabelsApiServer" . | nindent 8 }}
spec:
{{- if .Values.apiserver.storage.enableConfigVolume }}
volumes:
- name: apiserver-config
persistentVolumeClaim:
claimName: {{ include "clearml.fullname" . }}-apiserver-config
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag | default .Chart.AppVersion }}"
@ -101,13 +95,19 @@ spec:
httpGet:
path: /debug.ping
port: 8008
{{- if .Values.apiserver.storage.enableConfigVolume }}
{{- if .Values.apiserver.additionalConfigs }}
volumeMounts:
- name: apiserver-config
mountPath: /opt/clearml/config
{{- end }}
resources:
{{- toYaml .Values.apiserver.resources | nindent 12 }}
{{- if .Values.apiserver.additionalConfigs }}
volumes:
- name: apiserver-config
configMap:
name: "{{ include "clearml.fullname" . }}-apiserver-configmap"
{{- end }}
{{- with .Values.apiserver.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}

9
charts/clearml/templates/ingress-api.yaml
View File

@ -1,5 +1,4 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "clearml.fullname" . -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
@ -7,7 +6,7 @@ apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}-api
name: {{ include "clearml.fullname" . }}-api
labels:
{{- include "clearml.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
@ -18,11 +17,11 @@ spec:
{{- if .Values.ingress.tls.secretName }}
tls:
- hosts:
- "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
secretName: {{ .Values.ingress.tls.secretName }}
- "{{ .Values.ingress.hostPrefixApi }}.{{ .Values.ingress.host }}"
secretName: "{{ .Values.ingress.name }}-{{ .Values.ingress.hostPrefixApi }}"
{{- end }}
rules:
- host: "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
- host: "{{ .Values.ingress.hostPrefixApi }}.{{ .Values.ingress.host }}"
http:
paths:
- path: "/"

9
charts/clearml/templates/ingress-app.yaml
View File

@ -1,5 +1,4 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "clearml.fullname" . -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
@ -7,7 +6,7 @@ apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}-app
name: {{ include "clearml.fullname" . }}-app
labels:
{{- include "clearml.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
@ -18,11 +17,11 @@ spec:
{{- if .Values.ingress.tls.secretName }}
tls:
- hosts:
- "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
secretName: {{ .Values.ingress.tls.secretName }}
- "{{ .Values.ingress.hostPrefixApp }}.{{ .Values.ingress.host }}"
secretName: "{{ .Values.ingress.name }}-{{ .Values.ingress.hostPrefixApi }}"
{{- end }}
rules:
- host: "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
- host: "{{ .Values.ingress.hostPrefixApp }}.{{ .Values.ingress.host }}"
http:
paths:
- path: "/"

9
charts/clearml/templates/ingress-files.yaml
View File

@ -1,5 +1,4 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "clearml.fullname" . -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1beta1
{{- else -}}
@ -7,7 +6,7 @@ apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}-files
name: {{ include "clearml.fullname" . }}-files
labels:
{{- include "clearml.labels" . | nindent 4 }}
{{- with .Values.ingress.annotations }}
@ -18,11 +17,11 @@ spec:
{{- if .Values.ingress.tls.secretName }}
tls:
- hosts:
- "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
secretName: {{ .Values.ingress.tls.secretName }}
- "{{ .Values.ingress.hostPrefixFiles }}.{{ .Values.ingress.host }}"
secretName: "{{ .Values.ingress.name }}-{{ .Values.ingress.hostPrefixApi }}"
{{- end }}
rules:
- host: "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
- host: "{{ .Values.ingress.hostPrefixFiles }}.{{ .Values.ingress.host }}"
http:
paths:
- path: "/"

15
charts/clearml/templates/pvc-apiserver.yaml
View File

@ -1,15 +0,0 @@
{{- if .Values.apiserver.storage.enableConfigVolume }}
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ include "clearml.fullname" . }}-apiserver-config
labels:
{{- include "clearml.labels" . | nindent 4 }}
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.apiserver.storage.config.size | quote }}
storageClassName: {{ .Values.apiserver.storage.config.class | quote }}
{{- end }}

1
charts/clearml/templates/service-apiserver.yaml
View File

@ -9,7 +9,6 @@ spec:
ports:
- port: {{ .Values.apiserver.service.port }}
targetPort: {{ .Values.apiserver.service.port }}
nodePort: 30008
protocol: TCP
selector:
{{- include "clearml.selectorLabelsApiServer" . | nindent 4 }}

1
charts/clearml/templates/service-fileserver.yaml
View File

@ -9,7 +9,6 @@ spec:
ports:
- port: {{ .Values.fileserver.service.port }}
targetPort: {{ .Values.fileserver.service.port }}
nodePort: 30081
protocol: TCP
selector:
{{- include "clearml.selectorLabelsFileServer" . | nindent 4 }}

1
charts/clearml/templates/service-webserver.yaml
View File

@ -9,7 +9,6 @@ spec:
ports:
- port: {{ .Values.webserver.service.port }}
targetPort: {{ .Values.webserver.service.port }}
nodePort: 30080
protocol: TCP
selector:
{{- include "clearml.selectorLabelsWebServer" . | nindent 4 }}

29
charts/clearml/values.yaml
View File

@ -5,10 +5,12 @@ ingress:
name: clearml-server-ingress
annotations: {}
host: ""
hostPrefixApp: "app."
hostPrefixApi: "api."
hostPrefixFiles: "files."
hostPrefixApp: "app"
hostPrefixApi: "api"
hostPrefixFiles: "files"
tls:
enabled: true
# If you do not set name it will fallback to "ingress.name-ingress.hostPrefix*" (3 secrets totall will be used)
secretName: ""
apiserver:
@ -53,12 +55,17 @@ apiserver:
affinity: {}
# Optional: used in pvc-apiserver containing optional server configuration files
storage:
enableConfigVolume: false
config:
class: "standard"
size: 1Gi
# This will create configmap that will be mounted in CLEARML_CONFIG_DIR
additionalConfigs:
services.conf: |
tasks {
non_responsive_tasks_watchdog {
# In-progress tasks that haven't been updated for at least 'value' seconds will be stopped by the watchdog
threshold_sec: 21000
# Watchdog will sleep for this number of seconds after each cycle
watch_interval_sec: 900
}
}
fileserver:
service:
@ -184,6 +191,8 @@ agentservices:
agentGroups:
agent-group-cpu:
enabled: true
name: agent-group-cpu
replicaCount: 1
updateStrategy: Recreate
@ -217,6 +226,8 @@ agentGroups:
affinity: {}
agent-group-gpu:
enabled: false
name: agent-group-gpu
replicaCount: 0
updateStrategy: Recreate