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

Fixed: naming

Browse Source
This commit is contained in:
Valeriano Manassero 2023-03-20 11:28:10 +01:00
parent e17a2719a4
commit a476569eff
14 changed files with 60 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/clearml-serving/README.md
View File

@ -92,6 +92,6 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
| clearml_serving_triton.nodeSelector | object | `{}` | Node Selector configuration |
| clearml_serving_triton.resources | object | `{}` | Pod resources definition |
| clearml_serving_triton.tolerations | list | `[]` | Tolerations configuration |
| grafana | object | `{"adminPassword":"clearml","adminUser":"admin","datasources":{"datasources.yaml":{"apiVersion":1,"datasources":[{"access":"proxy","isDefault":true,"name":"Prometheus","type":"prometheus","url":"http://clearml-serving-prometheus-server"}]}},"enabled":true}` | Configuration from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml |
| grafana | object | `{"adminPassword":"clearml","adminUser":"admin","datasources":{"datasources.yaml":{"apiVersion":1,"datasources":[{"access":"proxy","isDefault":true,"name":"Prometheus","type":"prometheus","url":"http://{{ .Release.Name }}-prometheus-server"}]}},"enabled":true}` | Configuration from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml |
| kafka | object | `{"enabled":true}` | Configuration from https://github.com/bitnami/charts/blob/main/bitnami/kafka/values.yaml |
| prometheus | object | `{"enabled":true,"kube-state-metrics":{"enabled":false},"prometheus-node-exporter":{"enabled":false},"prometheus-pushgateway":{"enabled":false},"serverFiles":{"prometheus.yml":{"scrape_configs":[{"job_name":"prometheus","static_configs":[{"targets":["localhost:9090"]}]},{"job_name":"clearml-serving-stats","static_configs":[{"targets":["clearml-serving-statistics:9999"]}]}]}}}` | Configuration from https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus/values.yaml |
| prometheus | object | `{"enabled":true,"extraScrapeConfigs":"- job_name: \"{{ .Release.Name }}-stats\"\n static_configs:\n - targets:\n - \"{{ .Release.Name }}-statistics:9999\"\n","kube-state-metrics":{"enabled":false},"prometheus-node-exporter":{"enabled":false},"prometheus-pushgateway":{"enabled":false}}` | Configuration from https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus/values.yaml |

20
charts/clearml-serving/templates/_helpers.tpl
View File

@ -1,7 +1,7 @@
{{/*
Expand the name of the chart.
*/}}
{{- define "clearml-serving.name" -}}
{{- define "clearmlServing.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end }}
@ -10,7 +10,7 @@ Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
If release name contains chart name it will be used as a full name.
*/}}
{{- define "clearml-serving.fullname" -}}
{{- define "clearmlServing.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
{{- else }}
@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
{{/*
Create chart name and version as used by the chart label.
*/}}
{{- define "clearml-serving.chart" -}}
{{- define "clearmlServing.chart" -}}
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
{{- end }}
{{/*
Common labels
*/}}
{{- define "clearml-serving.labels" -}}
helm.sh/chart: {{ include "clearml-serving.chart" . }}
{{ include "clearml-serving.selectorLabels" . }}
{{- define "clearmlServing.labels" -}}
helm.sh/chart: {{ include "clearmlServing.chart" . }}
{{ include "clearmlServing.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{/*
Selector labels
*/}}
{{- define "clearml-serving.selectorLabels" -}}
app.kubernetes.io/name: {{ include "clearml-serving.name" . }}
{{- define "clearmlServing.selectorLabels" -}}
app.kubernetes.io/name: {{ include "clearmlServing.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}
{{/*
Create the name of the service account to use
*/}}
{{- define "clearml-serving.serviceAccountName" -}}
{{- define "clearmlServing.serviceAccountName" -}}
{{- if .Values.serviceAccount.create }}
{{- default (include "clearml-serving.fullname" .) .Values.serviceAccount.name }}
{{- default (include "clearmlServing.fullname" .) .Values.serviceAccount.name }}
{{- else }}
{{- default "default" .Values.serviceAccount.name }}
{{- end }}

2
charts/clearml-serving/templates/clearml-serving-backend-networkpolicy.yaml
View File

@ -1,7 +1,7 @@
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: {{ include "clearml-serving.fullname" . }}-backend
name: {{ include "clearmlServing.fullname" . }}-backend
spec:
ingress:
- from:

14
charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
View File

@ -3,20 +3,20 @@ kind: Deployment
metadata:
annotations: {}
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
name: {{ include "clearml-serving.fullname" . }}-inference
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
name: {{ include "clearmlServing.fullname" . }}-inference
spec:
replicas: 1
selector:
matchLabels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
strategy: {}
template:
metadata:
annotations: {}
labels:
clearml.serving.network/clearml-serving-backend: "true"
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
spec:
containers:
- env:
@ -31,14 +31,14 @@ spec:
- name: CLEARML_WEB_HOST
value: "{{ .Values.clearml.webHost }}"
- name: CLEARML_DEFAULT_KAFKA_SERVE_URL
value: {{ include "clearml-serving.fullname" . }}-kafka:9092
value: {{ include "clearmlServing.fullname" . }}-kafka:9092
- name: CLEARML_SERVING_POLL_FREQ
value: "1.0"
- name: CLEARML_DEFAULT_BASE_SERVE_URL
value: "{{ .Values.clearml.defaultBaseServeUrl }}"
- name: CLEARML_DEFAULT_TRITON_GRPC_ADDR
{{- if .Values.clearml_serving_triton.enabled }}
value: "{{ include "clearml-serving.fullname" . }}-triton:8001"
value: "{{ include "clearmlServing.fullname" . }}-triton:8001"
{{- else }}
value: ""
{{- end }}
@ -55,7 +55,7 @@ spec:
value: '{{ join " " .Values.clearml_serving_inference.extraPythonPackages }}'
{{- end }}
image: "{{ .Values.clearml_serving_inference.image.repository }}:{{ .Values.clearml_serving_inference.image.tag }}"
name: {{ include "clearml-serving.fullname" . }}-inference
name: {{ include "clearmlServing.fullname" . }}-inference
ports:
- containerPort: 8080
resources: {}

6
charts/clearml-serving/templates/clearml-serving-inference-hpa.yaml
View File

@ -2,16 +2,16 @@
apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
kind: HorizontalPodAutoscaler
metadata:
name: {{ include "clearml-serving.fullname" . }}-inference-hpa
name: {{ include "clearmlServing.fullname" . }}-inference-hpa
namespace: {{ .Release.Namespace | quote }}
annotations: {}
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
spec:
scaleTargetRef:
apiVersion: "apps/v1"
kind: Deployment
name: {{ include "clearml-serving.fullname" . }}-inference
name: {{ include "clearmlServing.fullname" . }}-inference
minReplicas: {{ .Values.clearml_serving_inference.autoscaling.minReplicas }}
maxReplicas: {{ .Values.clearml_serving_inference.autoscaling.maxReplicas }}
metrics:

8
charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
View File

@ -8,9 +8,9 @@ apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ include "clearml-serving.fullname" . }}-inference
name: {{ include "clearmlServing.fullname" . }}-inference
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
annotations:
{{- toYaml .Values.clearml_serving_inference.ingress.annotations | nindent 4 }}
spec:
@ -29,12 +29,12 @@ spec:
pathType: Prefix
backend:
service:
name: {{ include "clearml-serving.fullname" . }}-inference
name: {{ include "clearmlServing.fullname" . }}-inference
port:
number: 8080
{{ else }}
backend:
servicename: {{ include "clearml-serving.fullname" . }}-inference
servicename: {{ include "clearmlServing.fullname" . }}-inference
servicePort: 8080
{{ end }}
{{- end }}

6
charts/clearml-serving/templates/clearml-serving-inference-service.yaml
View File

@ -3,12 +3,12 @@ kind: Service
metadata:
annotations: {}
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
name: {{ include "clearml-serving.fullname" . }}-inference
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
name: {{ include "clearmlServing.fullname" . }}-inference
spec:
ports:
- name: "8080"
port: 8080
targetPort: 8080
selector:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-inference
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference

12
charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
View File

@ -3,20 +3,20 @@ kind: Deployment
metadata:
annotations: {}
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
name: {{ include "clearml-serving.fullname" . }}-statistics
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
name: {{ include "clearmlServing.fullname" . }}-statistics
spec:
replicas: 1
selector:
matchLabels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
strategy: {}
template:
metadata:
annotations: {}
labels:
clearml.serving.network/clearml-serving-backend: "true"
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
spec:
containers:
- env:
@ -31,7 +31,7 @@ spec:
- name: CLEARML_WEB_HOST
value: "{{ .Values.clearml.webHost }}"
- name: CLEARML_DEFAULT_KAFKA_SERVE_URL
value: {{ include "clearml-serving.fullname" . }}-kafka:9092
value: {{ include "clearmlServing.fullname" . }}-kafka:9092
- name: CLEARML_SERVING_POLL_FREQ
value: "1.0"
- name: CLEARML_SERVING_TASK_ID
@ -41,7 +41,7 @@ spec:
value: '{{ join " " .Values.clearml_serving_statistics.extraPythonPackages }}'
{{- end }}
image: "{{ .Values.clearml_serving_statistics.image.repository }}:{{ .Values.clearml_serving_statistics.image.tag }}"
name: {{ include "clearml-serving.fullname" . }}-statistics
name: {{ include "clearmlServing.fullname" . }}-statistics
ports:
- containerPort: 9999
resources: {}

6
charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
View File

@ -3,12 +3,12 @@ kind: Service
metadata:
annotations: {}
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
name: {{ include "clearml-serving.fullname" . }}-statistics
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
name: {{ include "clearmlServing.fullname" . }}-statistics
spec:
ports:
- name: "9999"
port: 9999
targetPort: 9999
selector:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-statistics
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics

10
charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
View File

@ -4,20 +4,20 @@ kind: Deployment
metadata:
annotations: {}
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
name: {{ include "clearml-serving.fullname" . }}-triton
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
name: {{ include "clearmlServing.fullname" . }}-triton
spec:
replicas: 1
selector:
matchLabels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
strategy: {}
template:
metadata:
annotations: {}
labels:
clearml.serving.network/clearml-serving-backend: "true"
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
spec:
containers:
- env:
@ -42,7 +42,7 @@ spec:
value: '{{ join " " .Values.clearml_serving_triton.extraPythonPackages }}'
{{- end }}
image: "{{ .Values.clearml_serving_triton.image.repository }}:{{ .Values.clearml_serving_triton.image.tag }}"
name: {{ include "clearml-serving.fullname" . }}-triton
name: {{ include "clearmlServing.fullname" . }}-triton
ports:
- containerPort: 8001
resources: {}

6
charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
View File

@ -2,16 +2,16 @@
apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
kind: HorizontalPodAutoscaler
metadata:
name: {{ include "clearml-serving.fullname" . }}-triton-hpa
name: {{ include "clearmlServing.fullname" . }}-triton-hpa
namespace: {{ .Release.Namespace | quote }}
annotations: {}
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
spec:
scaleTargetRef:
apiVersion: "apps/v1"
kind: Deployment
name: {{ include "clearml-serving.fullname" . }}-triton
name: {{ include "clearmlServing.fullname" . }}-triton
minReplicas: {{ .Values.clearml_serving_triton.autoscaling.minReplicas }}
maxReplicas: {{ .Values.clearml_serving_triton.autoscaling.maxReplicas }}
metrics:

8
charts/clearml-serving/templates/clearml-serving-triton-ingress.yaml
View File

@ -9,9 +9,9 @@ apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ include "clearml-serving.fullname" . }}-triton
name: {{ include "clearmlServing.fullname" . }}-triton
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
annotations:
{{- toYaml .Values.clearml_serving_triton.ingress.annotations | nindent 4 }}
spec:
@ -30,12 +30,12 @@ spec:
pathType: Prefix
backend:
service:
name: {{ include "clearml-serving.fullname" . }}-triton
name: {{ include "clearmlServing.fullname" . }}-triton
port:
number: 8001
{{ else }}
backend:
servicename: {{ include "clearml-serving.fullname" . }}-triton
servicename: {{ include "clearmlServing.fullname" . }}-triton
servicePort: 8001
{{ end }}
{{- end }}

6
charts/clearml-serving/templates/clearml-serving-triton-service.yaml
View File

@ -4,13 +4,13 @@ kind: Service
metadata:
annotations: {}
labels:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
name: {{ include "clearml-serving.fullname" . }}-triton
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
name: {{ include "clearmlServing.fullname" . }}-triton
spec:
ports:
- name: "8001"
port: 8001
targetPort: 8001
selector:
clearml.serving.service: {{ include "clearml-serving.fullname" . }}-triton
clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
{{ end }}

18
charts/clearml-serving/values.yaml
View File

@ -122,17 +122,11 @@ prometheus:
enabled: false
prometheus-pushgateway:
enabled: false
serverFiles:
prometheus.yml:
scrape_configs:
- job_name: prometheus
static_configs:
- targets:
- localhost:9090
- job_name: "clearml-serving-stats"
static_configs:
- targets:
- "clearml-serving-statistics:9999"
extraScrapeConfigs: |
- job_name: "{{ .Release.Name }}-stats"
static_configs:
- targets:
- "{{ .Release.Name }}-statistics:9999"
# -- Configuration from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
grafana:
@ -145,6 +139,6 @@ grafana:
datasources:
- name: Prometheus
type: prometheus
url: "http://clearml-serving-prometheus-server"
url: "http://{{ .Release.Name }}-prometheus-server"
access: proxy
isDefault: true