Upgrade 180 (#118 )

* Changed: bump up app to version 1.8.0 * Changed: bump up chart version
Serving refactoring (#116 )
2025-04-17 01:31:13 +00:00 · 2022-11-30 08:12:52 +01:00 · 2022-11-04 15:10:11 +01:00 · 2022-10-11 10:34:52 +02:00 · 2022-10-10 09:17:05 +02:00 · 2022-10-05 14:34:47 +02:00
31 changed files with 397 additions and 122 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -43,11 +43,6 @@ jobs:
            echo "::set-output name=changed::true"
            echo "::set-output name=changed_charts::\"${changed//$'\n'/,}\""
          fi
-      - name: Inject secrets
-        run: |
-          find ./charts/*/ci/*.yaml -type f -exec sed -i "s/AGENTK8SGLUEKEY/${{ secrets.agentk8sglueKey }}/g" {} \;
-          find ./charts/*/ci/*.yaml -type f -exec sed -i "s/AGENTK8SGLUESECRET/${{ secrets.agentk8sglueSecret }}/g" {} \;
-        if: steps.list-changed.outputs.changed == 'true'      
      - name: Run chart-testing (lint and install)
        run: ct lint-and-install --chart-dirs=charts --target-branch=main --helm-extra-args="--timeout=15m" --charts=${{steps.list-changed.outputs.changed_charts}} --debug=true
        if: steps.list-changed.outputs.changed == 'true'
--- a/charts/clearml-agent/Chart.yaml
+++ b/charts/clearml-agent/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: clearml-agent
 description: MLOps platform
 type: application
-version: "2.0.0"
+version: "2.0.1"
 appVersion: "1.24"
-kubeVersion: ">= 1.19.0-0 < 1.25.0-0"
+kubeVersion: ">= 1.19.0-0 < 1.26.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
--- a/charts/clearml-agent/README.md
+++ b/charts/clearml-agent/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Agent

-![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24](https://img.shields.io/badge/AppVersion-1.24-informational?style=flat-square)
+![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24](https://img.shields.io/badge/AppVersion-1.24-informational?style=flat-square)

 MLOps platform

@@ -24,7 +24,7 @@ It allows you to schedule distributed experiments on a Kubernetes cluster.

 ## Requirements

-Kubernetes: `>= 1.19.0-0 < 1.25.0-0`
+Kubernetes: `>= 1.19.0-0 < 1.26.0-0`

 ## Values

--- a/charts/clearml-serving/Chart.yaml
+++ b/charts/clearml-serving/Chart.yaml
@@ -2,13 +2,12 @@ apiVersion: v2
 name: clearml-serving
 description: ClearML Serving Helm Chart
 type: application
-version: 0.4.1
-appVersion: "0.9.0"
+version: 0.7.0
+appVersion: "1.2.0"
+kubeVersion: ">= 1.19.0-0 < 1.26.0-0"
 maintainers:
  - name: valeriano-manassero
    url: https://github.com/valeriano-manassero
-  - name: stefano-cherchi
-    url: https://github.com/stefano-cherchi
 keywords:
  - clearml
  - "machine learning"
--- a/charts/clearml-serving/README.md
+++ b/charts/clearml-serving/README.md
@@ -1,6 +1,6 @@
 # clearml-serving

-![Version: 0.4.1](https://img.shields.io/badge/Version-0.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.0](https://img.shields.io/badge/AppVersion-0.9.0-informational?style=flat-square)
+![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square)

 ClearML Serving Helm Chart

@@ -9,63 +9,47 @@ ClearML Serving Helm Chart
 | Name | Email | Url |
 | ---- | ------ | --- |
 | valeriano-manassero |  | <https://github.com/valeriano-manassero> |
-| stefano-cherchi |  | <https://github.com/stefano-cherchi> |
+
+## Requirements
+
+Kubernetes: `>= 1.19.0-0 < 1.26.0-0`

 ## Values

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| alertmanager.affinity | object | `{}` |  |
-| alertmanager.image | string | `"prom/alertmanager:v0.23.0"` |  |
-| alertmanager.nodeSelector | object | `{}` |  |
-| alertmanager.resources | object | `{}` |  |
-| alertmanager.tolerations | list | `[]` |  |
-| clearml.apiAccessKey | string | `"ClearML API Access Key"` |  |
-| clearml.apiHost | string | `"http://clearml-server-apiserver:8008"` |  |
-| clearml.apiSecretKey | string | `"ClearML API Secret Key"` |  |
-| clearml.defaultBaseServeUrl | string | `"http://127.0.0.1:8080/serve"` |  |
-| clearml.filesHost | string | `"http://clearml-server-fileserver:8081"` |  |
-| clearml.servingTaskId | string | `"ClearML Serving Task ID"` |  |
-| clearml.webHost | string | `"http://clearml-server-webserver:80"` |  |
-| clearml_serving_inference.affinity | object | `{}` |  |
+| alertmanager | object | `{"affinity":{},"image":{"repository":"prom/alertmanager","tag":"v0.23.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Alertmanager generic configigurations |
+| clearml | object | `{"apiAccessKey":"ClearML API Access Key","apiHost":"http://clearml-server-apiserver:8008","apiSecretKey":"ClearML API Secret Key","defaultBaseServeUrl":"http://127.0.0.1:8080/serve","filesHost":"http://clearml-server-fileserver:8081","servingTaskId":"ClearML Serving Task ID","webHost":"http://clearml-server-webserver:80"}` | ClearMl generic configurations |
+| clearml_serving_inference | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-inference","tag":"1.2.0"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving inference configurations |
+| clearml_serving_inference.affinity | object | `{}` | Affinity configuration |
+| clearml_serving_inference.autoscaling | object | `{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50}` | Autoscaling configuration |
 | clearml_serving_inference.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
-| clearml_serving_inference.image | string | `"allegroai/clearml-serving-inference"` |  |
-| clearml_serving_inference.nodeSelector | object | `{}` |  |
-| clearml_serving_inference.resources | object | `{}` |  |
-| clearml_serving_inference.tolerations | list | `[]` |  |
-| clearml_serving_statistics.affinity | object | `{}` |  |
+| clearml_serving_inference.image | object | `{"repository":"allegroai/clearml-serving-inference","tag":"1.2.0"}` | Container Image |
+| clearml_serving_inference.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
+| clearml_serving_inference.nodeSelector | object | `{}` | Node Selector configuration |
+| clearml_serving_inference.resources | object | `{}` | Pod resources definition |
+| clearml_serving_inference.tolerations | list | `[]` | Tolerations configuration |
+| clearml_serving_statistics | object | `{"affinity":{},"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-statistics","tag":"1.2.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving statistics configurations |
+| clearml_serving_statistics.affinity | object | `{}` | Affinity configuration |
 | clearml_serving_statistics.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
-| clearml_serving_statistics.image | string | `"allegroai/clearml-serving-statistics"` |  |
-| clearml_serving_statistics.nodeSelector | object | `{}` |  |
-| clearml_serving_statistics.resources | object | `{}` |  |
-| clearml_serving_statistics.tolerations | list | `[]` |  |
-| clearml_serving_triton.affinity | object | `{}` |  |
-| clearml_serving_triton.enabled | bool | `true` |  |
+| clearml_serving_statistics.image | object | `{"repository":"allegroai/clearml-serving-statistics","tag":"1.2.0"}` | Container Image |
+| clearml_serving_statistics.nodeSelector | object | `{}` | Node Selector configuration |
+| clearml_serving_statistics.resources | object | `{}` | Pod resources definition |
+| clearml_serving_statistics.tolerations | list | `[]` | Tolerations configuration |
+| clearml_serving_triton | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"enabled":true,"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-triton","tag":"1.2.0-22.07"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving-grpc.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving Triton configurations |
+| clearml_serving_triton.affinity | object | `{}` | Affinity configuration |
+| clearml_serving_triton.autoscaling | object | `{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50}` | Autoscaling configuration |
+| clearml_serving_triton.enabled | bool | `true` | Triton pod creation enable/disable |
 | clearml_serving_triton.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
-| clearml_serving_triton.image | string | `"allegroai/clearml-serving-triton"` |  |
-| clearml_serving_triton.nodeSelector | object | `{}` |  |
-| clearml_serving_triton.resources | object | `{}` |  |
-| clearml_serving_triton.tolerations | list | `[]` |  |
-| grafana.affinity | object | `{}` |  |
-| grafana.image | string | `"grafana/grafana:8.4.4-ubuntu"` |  |
-| grafana.nodeSelector | object | `{}` |  |
-| grafana.resources | object | `{}` |  |
-| grafana.tolerations | list | `[]` |  |
-| kafka.affinity | object | `{}` |  |
-| kafka.image | string | `"bitnami/kafka:3.1.0"` |  |
-| kafka.nodeSelector | object | `{}` |  |
-| kafka.resources | object | `{}` |  |
-| kafka.tolerations | list | `[]` |  |
-| prometheus.affinity | object | `{}` |  |
-| prometheus.image | string | `"prom/prometheus:v2.34.0"` |  |
-| prometheus.nodeSelector | object | `{}` |  |
-| prometheus.resources | object | `{}` |  |
-| prometheus.tolerations | list | `[]` |  |
-| zookeeper.affinity | object | `{}` |  |
-| zookeeper.image | string | `"bitnami/zookeeper:3.7.0"` |  |
-| zookeeper.nodeSelector | object | `{}` |  |
-| zookeeper.resources | object | `{}` |  |
-| zookeeper.tolerations | list | `[]` |  |
+| clearml_serving_triton.image | object | `{"repository":"allegroai/clearml-serving-triton","tag":"1.2.0-22.07"}` | Container Image |
+| clearml_serving_triton.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving-grpc.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
+| 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 | `{"affinity":{},"image":{"repository":"grafana/grafana","tag":"8.4.4-ubuntu"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving-grafana.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | Grafana generic configigurations |
+| kafka | object | `{"affinity":{},"image":{"repository":"bitnami/kafka","tag":"3.1.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Kafka generic configigurations |
+| prometheus | object | `{"affinity":{},"image":{"repository":"prom/prometheus","tag":"v2.34.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Prometheus generic configigurations |
+| zookeeper | object | `{"affinity":{},"image":{"repository":"bitnami/zookeeper","tag":"3.7.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Zookeeper generic configigurations |

 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
--- a/charts/clearml-serving/templates/_helpers.tpl
+++ b/charts/clearml-serving/templates/_helpers.tpl
@@ -60,3 +60,33 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Return the target Kubernetes version
+*/}}
+{{- define "common.capabilities.kubeVersion" -}}
+{{- if .Values.global }}
+    {{- if .Values.global.kubeVersion }}
+    {{- .Values.global.kubeVersion -}}
+    {{- else }}
+    {{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+    {{- end -}}
+{{- else }}
+{{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for Horizontal Pod Autoscaler.
+*/}}
+{{- define "common.capabilities.hpa.apiVersion" -}}
+{{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .context) -}}
+{{- if .beta2 -}}
+{{- print "autoscaling/v2beta2" -}}
+{{- else -}}
+{{- print "autoscaling/v2beta1" -}}
+{{- end -}}
+{{- else -}}
+{{- print "autoscaling/v2" -}}
+{{- end -}}
+{{- end -}}
--- a/charts/clearml-serving/templates/alertmanager-deployment.yaml
+++ b/charts/clearml-serving/templates/alertmanager-deployment.yaml
@@ -19,10 +19,9 @@ spec:
        clearml.serving.service: alertmanager
    spec:
      containers:
-        - image: {{ .Values.alertmanager.image }}
+        - image: "{{ .Values.alertmanager.image.repository }}:{{ .Values.alertmanager.image.tag }}"
          name: clearml-serving-alertmanager
          ports:
            - containerPort: 9093
          resources: {}
      restartPolicy: Always
-status: {}
--- a/charts/clearml-serving/templates/alertmanager-service.yaml
+++ b/charts/clearml-serving/templates/alertmanager-service.yaml
@@ -12,5 +12,3 @@ spec:
      targetPort: 9093
  selector:
    clearml.serving.service: alertmanager
-status:
-  loadBalancer: {}
--- a/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
@@ -54,10 +54,9 @@ spec:
            - name: EXTRA_PYTHON_PACKAGES
              value: '{{ join " " .Values.clearml_serving_inference.extraPythonPackages }}'
            {{- end }}
-          image: "{{ .Values.clearml_serving_inference.image }}:{{ .Chart.AppVersion }}"
+          image: "{{ .Values.clearml_serving_inference.image.repository }}:{{ .Values.clearml_serving_inference.image.tag }}"
          name: clearml-serving-inference
          ports:
            - containerPort: 8080
          resources: {}
      restartPolicy: Always
-status: {}
--- a/charts/clearml-serving/templates/clearml-serving-inference-hpa.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-hpa.yaml
@@ -0,0 +1,42 @@
+{{- if .Values.clearml_serving_inference.autoscaling.enabled }}
+apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
+kind: HorizontalPodAutoscaler
+metadata:
+  name: clearml-serving-inference-hpa
+  namespace: {{ .Release.Namespace | quote }}
+  annotations: {}
+  labels:
+    clearml.serving.service: clearml-serving-inference
+spec:
+  scaleTargetRef:
+    apiVersion: "apps/v1"
+    kind: Deployment
+    name: clearml-serving-inference
+  minReplicas: {{ .Values.clearml_serving_inference.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.clearml_serving_inference.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.clearml_serving_inference.autoscaling.targetCPU }}
+    - type: Resource
+      resource:
+        name: cpu
+        {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
+        targetAverageUtilization: {{ .Values.clearml_serving_inference.autoscaling.targetCPU }}
+        {{- else }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.clearml_serving_inference.autoscaling.targetCPU }}
+        {{- end }}
+    {{- end }}
+    {{- if .Values.clearml_serving_inference.autoscaling.targetMemory }}
+    - type: Resource
+      resource:
+        name: memory
+        {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
+        targetAverageUtilization: {{ .Values.clearml_serving_inference.autoscaling.targetMemory }}
+        {{- else }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.clearml_serving_inference.autoscaling.targetMemory }}
+        {{- end }}
+    {{- end }}
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
@@ -0,0 +1,40 @@
+{{- if .Values.clearml_serving_inference.ingress.enabled -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: clearml-serving-inference
+  labels:
+    clearml.serving.service: clearml-serving-inference
+  annotations:
+    {{- toYaml .Values.clearml_serving_inference.ingress.annotations | nindent 4 }}
+spec:
+  {{- if .Values.clearml_serving_inference.ingress.tlsSecretName }}
+  tls:
+    - hosts:
+        - {{ .Values.clearml_serving_inference.ingress.hostName }}
+      secretName: {{ .Values.clearml_serving_inference.ingress.tlsSecretName }}
+  {{- end }}
+  rules:
+  - host: {{ .Values.clearml_serving_inference.ingress.hostName }}
+    http:
+      paths:
+      - path: {{ .Values.clearml_serving_inference.ingress.path }}
+  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: Prefix
+        backend:
+          service:
+            name: clearml-serving-inference
+            port:
+              number: 8080
+  {{ else }}
+        backend:
+          serviceName: clearml-serving-inference
+          servicePort: 8080
+  {{ end }}
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-inference-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-service.yaml
@@ -12,5 +12,3 @@ spec:
      targetPort: 8080
  selector:
    clearml.serving.service: clearml-serving-inference
-status:
-  loadBalancer: {}
--- a/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
@@ -40,10 +40,9 @@ spec:
            - name: EXTRA_PYTHON_PACKAGES
              value: '{{ join " " .Values.clearml_serving_statistics.extraPythonPackages }}'
            {{- end }}
-          image: "{{ .Values.clearml_serving_statistics.image }}:{{ .Chart.AppVersion }}"
+          image: "{{ .Values.clearml_serving_statistics.image.repository }}:{{ .Values.clearml_serving_statistics.image.tag }}"
          name: clearml-serving-statistics
          ports:
            - containerPort: 9999
          resources: {}
      restartPolicy: Always
-status: {}
--- a/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
@@ -12,5 +12,3 @@ spec:
      targetPort: 9999
  selector:
    clearml.serving.service: clearml-serving-statistics
-status:
-  loadBalancer: {}
--- a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
@@ -41,12 +41,11 @@ spec:
            - name: EXTRA_PYTHON_PACKAGES
              value: '{{ join " " .Values.clearml_serving_triton.extraPythonPackages }}'
            {{- end }}
-          image: "{{ .Values.clearml_serving_triton.image }}:{{ .Chart.AppVersion }}"
+          image: "{{ .Values.clearml_serving_triton.image.repository }}:{{ .Values.clearml_serving_triton.image.tag }}"
          name: clearml-serving-triton
          ports:
            - containerPort: 8001
          resources: {}
      restartPolicy: Always
-status: {}
 {{ end }}

--- a/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
@@ -0,0 +1,42 @@
+{{- if .Values.clearml_serving_triton.autoscaling.enabled }}
+apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
+kind: HorizontalPodAutoscaler
+metadata:
+  name: clearml-serving-triton-hpa
+  namespace: {{ .Release.Namespace | quote }}
+  annotations: {}
+  labels:
+    clearml.serving.service: clearml-serving-triton
+spec:
+  scaleTargetRef:
+    apiVersion: "apps/v1"
+    kind: Deployment
+    name: clearml-serving-triton
+  minReplicas: {{ .Values.clearml_serving_triton.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.clearml_serving_triton.autoscaling.maxReplicas }}
+  metrics:
+    {{- if .Values.clearml_serving_triton.autoscaling.targetCPU }}
+    - type: Resource
+      resource:
+        name: cpu
+        {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
+        targetAverageUtilization: {{ .Values.clearml_serving_triton.autoscaling.targetCPU }}
+        {{- else }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.clearml_serving_triton.autoscaling.targetCPU }}
+        {{- end }}
+    {{- end }}
+    {{- if .Values.clearml_serving_triton.autoscaling.targetMemory }}
+    - type: Resource
+      resource:
+        name: memory
+        {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }}
+        targetAverageUtilization: {{ .Values.clearml_serving_triton.autoscaling.targetMemory }}
+        {{- else }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.clearml_serving_triton.autoscaling.targetMemory }}
+        {{- end }}
+    {{- end }}
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-triton-ingress.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-ingress.yaml
@@ -0,0 +1,42 @@
+{{- if .Values.clearml_serving_triton.enabled -}}
+{{- if .Values.clearml_serving_triton.ingress.enabled -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: clearml-serving-triton
+  labels:
+    clearml.serving.service: clearml-serving-triton
+  annotations:
+    {{- toYaml .Values.clearml_serving_triton.ingress.annotations | nindent 4 }}
+spec:
+  {{- if .Values.clearml_serving_triton.ingress.tlsSecretName }}
+  tls:
+    - hosts:
+        - {{ .Values.clearml_serving_triton.ingress.hostName }}
+      secretName: {{ .Values.clearml_serving_triton.ingress.tlsSecretName }}
+  {{- end }}
+  rules:
+  - host: {{ .Values.clearml_serving_triton.ingress.hostName }}
+    http:
+      paths:
+      - path: {{ .Values.clearml_serving_triton.ingress.path }}
+  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: Prefix
+        backend:
+          service:
+            name: clearml-serving-triton
+            port:
+              number: 8001
+  {{ else }}
+        backend:
+          serviceName: clearml-serving-triton
+          servicePort: 8001
+  {{ end }}
+{{- end }}
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-triton-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-service.yaml
@@ -13,6 +13,4 @@ spec:
      targetPort: 8001
  selector:
    clearml.serving.service: clearml-serving-triton
-status:
-  loadBalancer: {}
 {{ end }}
--- a/charts/clearml-serving/templates/grafana-deployment.yaml
+++ b/charts/clearml-serving/templates/grafana-deployment.yaml
@@ -20,7 +20,7 @@ spec:
        clearml.serving.service: grafana
    spec:
      containers:
-        - image: {{ .Values.grafana.image }}
+        - image: "{{ .Values.grafana.image.repository }}:{{ .Values.grafana.image.tag }}"
          name: clearml-serving-grafana
          ports:
            - containerPort: 3000
@@ -33,4 +33,3 @@ spec:
        - name: grafana-conf
          secret:
            secretName: grafana-config
-status: {}
--- a/charts/clearml-serving/templates/grafana-ingress.yaml
+++ b/charts/clearml-serving/templates/grafana-ingress.yaml
@@ -0,0 +1,40 @@
+{{- if .Values.grafana.ingress.enabled -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: clearml-serving-grafana
+  labels:
+    clearml.serving.service: clearml-serving-grafana
+  annotations:
+    {{- toYaml .Values.grafana.ingress.annotations | nindent 4 }}
+spec:
+  {{- if .Values.grafana.ingress.tlsSecretName }}
+  tls:
+    - hosts:
+        - {{ .Values.grafana.ingress.hostName }}
+      secretName: {{ .Values.grafana.ingress.tlsSecretName }}
+  {{- end }}
+  rules:
+  - host: {{ .Values.grafana.ingress.hostName }}
+    http:
+      paths:
+      - path: {{ .Values.grafana.ingress.path }}
+  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: Prefix
+        backend:
+          service:
+            name: clearml-serving-grafana
+            port:
+              number: 3000
+  {{ else }}
+        backend:
+          serviceName: clearml-serving-grafana
+          servicePort: 3000
+  {{ end }}
+{{- end }}
--- a/charts/clearml-serving/templates/grafana-service.yaml
+++ b/charts/clearml-serving/templates/grafana-service.yaml
@@ -12,5 +12,3 @@ spec:
      targetPort: 3000
  selector:
    clearml.serving.service: grafana
-status:
-  loadBalancer: {}
--- a/charts/clearml-serving/templates/kafka-deployment.yaml
+++ b/charts/clearml-serving/templates/kafka-deployment.yaml
@@ -32,10 +32,9 @@ spec:
              value: clearml-serving-zookeeper:2181
            - name: KAFKA_CREATE_TOPICS
              value: '"topic_test:1:1"'
-          image: {{ .Values.kafka.image }}
+          image: "{{ .Values.kafka.image.repository }}:{{ .Values.kafka.image.tag }}"
          name: clearml-serving-kafka
          ports:
            - containerPort: 9092
          resources: {}
      restartPolicy: Always
-status: {}
--- a/charts/clearml-serving/templates/kafka-service.yaml
+++ b/charts/clearml-serving/templates/kafka-service.yaml
@@ -12,5 +12,3 @@ spec:
      targetPort: 9092
  selector:
    clearml.serving.service: kafka
-status:
-  loadBalancer: {}
--- a/charts/clearml-serving/templates/prometheus-deployment.yaml
+++ b/charts/clearml-serving/templates/prometheus-deployment.yaml
@@ -27,7 +27,7 @@ spec:
            - --web.console.templates=/etc/prometheus/consoles
            - --storage.tsdb.retention.time=200h
            - --web.enable-lifecycle
-          image: {{ .Values.prometheus.image }}
+          image: "{{ .Values.prometheus.image.repository }}:{{ .Values.prometheus.image.tag }}"
          name: clearml-serving-prometheus
          ports:
            - containerPort: 9090
@@ -40,4 +40,3 @@ spec:
        - name: prometheus-conf
          secret:
            secretName: prometheus-config
-status: {}
--- a/charts/clearml-serving/templates/prometheus-service.yaml
+++ b/charts/clearml-serving/templates/prometheus-service.yaml
@@ -12,5 +12,3 @@ spec:
      targetPort: 9090
  selector:
    clearml.serving.service: prometheus
-status:
-  loadBalancer: {}
--- a/charts/clearml-serving/templates/zookeeper-deployment.yaml
+++ b/charts/clearml-serving/templates/zookeeper-deployment.yaml
@@ -22,10 +22,9 @@ spec:
        - env:
            - name: ALLOW_ANONYMOUS_LOGIN
              value: "yes"
-          image: {{ .Values.zookeeper.image }}
+          image: "{{ .Values.zookeeper.image.repository }}:{{ .Values.zookeeper.image.tag }}"
          name: clearml-serving-zookeeper
          ports:
            - containerPort: 2181
          resources: {}
      restartPolicy: Always
-status: {}
--- a/charts/clearml-serving/templates/zookeeper-service.yaml
+++ b/charts/clearml-serving/templates/zookeeper-service.yaml
@@ -12,5 +12,3 @@ spec:
      targetPort: 2181
  selector:
    clearml.serving.service: zookeeper
-status:
-  loadBalancer: {}
--- a/charts/clearml-serving/values.yaml
+++ b/charts/clearml-serving/values.yaml
@@ -1,5 +1,4 @@
-# Default values for clearml-serving.
-
+# -- ClearMl generic configurations
 clearml:
  apiAccessKey: "ClearML API Access Key"
  apiSecretKey: "ClearML API Secret Key"
@@ -9,71 +8,157 @@ clearml:
  defaultBaseServeUrl: http://127.0.0.1:8080/serve
  servingTaskId: "ClearML Serving Task ID"

+# -- Zookeeper generic configigurations
 zookeeper:
-  image: bitnami/zookeeper:3.7.0
+  image:
+    repository: "bitnami/zookeeper"
+    tag: "3.7.0"
  nodeSelector: {}
  tolerations: []
  affinity: {}
  resources: {}

+# -- Kafka generic configigurations
 kafka:
-  image: bitnami/kafka:3.1.0
+  image:
+    repository: "bitnami/kafka"
+    tag: "3.1.0"
  nodeSelector: {}
  tolerations: []
  affinity: {}
  resources: {}

+# -- Prometheus generic configigurations
 prometheus:
-  image: prom/prometheus:v2.34.0
+  image:
+    repository: "prom/prometheus"
+    tag: "v2.34.0"
  nodeSelector: {}
  tolerations: []
  affinity: {}
  resources: {}

+# -- Grafana generic configigurations
 grafana:
-  image: grafana/grafana:8.4.4-ubuntu
+  image:
+    repository: "grafana/grafana"
+    tag: "8.4.4-ubuntu"
  nodeSelector: {}
  tolerations: []
  affinity: {}
  resources: {}
+  ingress:
+    enabled: false
+    hostName: "serving-grafana.clearml.127-0-0-1.nip.io"
+    tlsSecretName: ""
+    annotations: {}
+    path: "/"

+# -- Alertmanager generic configigurations
 alertmanager:
-  image: prom/alertmanager:v0.23.0
+  image:
+    repository: "prom/alertmanager"
+    tag: "v0.23.0"
  nodeSelector: {}
  tolerations: []
  affinity: {}
  resources: {}

+# -- ClearML serving statistics configurations
 clearml_serving_statistics:
-  image: allegroai/clearml-serving-statistics
+  # -- Container Image
+  image:
+    repository: "allegroai/clearml-serving-statistics"
+    tag: "1.2.0"
+  # -- Node Selector configuration
  nodeSelector: {}
+  # -- Tolerations configuration
  tolerations: []
+  # -- Affinity configuration
  affinity: {}
+  # -- Pod resources definition
  resources: {}
  # -- Extra Python Packages to be installed in running pods
  extraPythonPackages: []
  #  - numpy==1.22.4
  #  - pandas==1.4.2

+# -- ClearML serving inference configurations
 clearml_serving_inference:
-  image: allegroai/clearml-serving-inference
+  # -- Container Image
+  image:
+    repository: "allegroai/clearml-serving-inference"
+    tag: "1.2.0"
+  # -- Node Selector configuration
  nodeSelector: {}
+  # -- Tolerations configuration
  tolerations: []
+  # -- Affinity configuration
  affinity: {}
+  # -- Pod resources definition
  resources: {}
  # -- Extra Python Packages to be installed in running pods
  extraPythonPackages: []
  #  - numpy==1.22.4
  #  - pandas==1.4.2
+  # -- Autoscaling configuration
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 11
+    targetCPU: 50
+    targetMemory: 50
+  # -- Ingress exposing configurations
+  ingress:
+    enabled: false
+    hostName: "serving.clearml.127-0-0-1.nip.io"
+    tlsSecretName: ""
+    annotations: {}
+    path: "/"

+# -- ClearML serving Triton configurations
 clearml_serving_triton:
+  # -- Triton pod creation enable/disable
  enabled: true
-  image: allegroai/clearml-serving-triton
+  # -- Container Image
+  image:
+    repository: "allegroai/clearml-serving-triton"
+    tag: "1.2.0-22.07"
+  # -- Node Selector configuration
  nodeSelector: {}
+  # -- Tolerations configuration
  tolerations: []
+  # -- Affinity configuration
  affinity: {}
+  # -- Pod resources definition
  resources: {}
  # -- Extra Python Packages to be installed in running pods
  extraPythonPackages: []
  #  - numpy==1.22.4
  #  - pandas==1.4.2
+  # -- Autoscaling configuration
+  autoscaling:
+    enabled: false
+    minReplicas: 1
+    maxReplicas: 11
+    targetCPU: 50
+    targetMemory: 50
+  # -- Ingress exposing configurations
+  ingress:
+    enabled: false
+    hostName: "serving-grpc.clearml.127-0-0-1.nip.io"
+    tlsSecretName: ""
+    annotations: {}
+    #  # Example for AWS ALB
+    #  kubernetes.io/ingress.class: alb
+    #  alb.ingress.kubernetes.io/backend-protocol: HTTP
+    #  alb.ingress.kubernetes.io/backend-protocol-version: GRPC
+    #  alb.ingress.kubernetes.io/certificate-arn: <cerntificate arn>
+    #  alb.ingress.kubernetes.io/ssl-redirect: '443'
+    #  alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
+    #  alb.ingress.kubernetes.io/target-type: ip
+    #
+    #  # Example for NNGINX ingress controller
+    #  nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    #  nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
+    path: "/"
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "4.2.1"
-appVersion: "1.6.0"
+version: "4.4.0"
+appVersion: "1.8.0"
 kubeVersion: ">= 1.21.0-0 < 1.26.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes

-![Version: 4.2.1](https://img.shields.io/badge/Version-4.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.0](https://img.shields.io/badge/AppVersion-1.6.0-informational?style=flat-square)
+![Version: 4.4.0](https://img.shields.io/badge/Version-4.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.8.0](https://img.shields.io/badge/AppVersion-1.8.0-informational?style=flat-square)

 MLOps platform

@@ -138,7 +138,7 @@ Kubernetes: `>= 1.21.0-0 < 1.26.0-0`
 | apiserver.extraEnvs | list | `[]` |  |
 | apiserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | apiserver.image.repository | string | `"allegroai/clearml"` |  |
-| apiserver.image.tag | string | `"1.6.0"` |  |
+| apiserver.image.tag | string | `"1.8.0"` |  |
 | apiserver.livenessDelay | int | `60` |  |
 | apiserver.nodeSelector | object | `{}` |  |
 | apiserver.podAnnotations | object | `{}` |  |
@@ -190,15 +190,15 @@ Kubernetes: `>= 1.21.0-0 < 1.26.0-0`
 | elasticsearch.volumeClaimTemplate.resources.requests.storage | string | `"50Gi"` |  |
 | externalServices.elasticsearchHost | string | `""` | Existing ElasticSearch Hostname to use if elasticsearch.enabled is false |
 | externalServices.elasticsearchPort | int | `9200` | Existing ElasticSearch Port to use if elasticsearch.enabled is false |
-| externalServices.mongodbHost | string | `""` | Existing MongoDB Hostname to use if elasticsearch.enabled is false |
-| externalServices.mongodbPort | int | `27017` | Existing MongoDB Port to use if elasticsearch.enabled is false |
-| externalServices.redisHost | string | `""` | Existing Redis Hostname to use if elasticsearch.enabled is false |
-| externalServices.redisPort | int | `6379` | Existing Redis Port to use if elasticsearch.enabled is false |
+| externalServices.mongodbHost | string | `""` | Existing MongoDB Hostname to use if mongodb.enabled is false |
+| externalServices.mongodbPort | int | `27017` | Existing MongoDB Port to use if mongodb.enabled is false |
+| externalServices.redisHost | string | `""` | Existing Redis Hostname to use if redis.enabled is false |
+| externalServices.redisPort | int | `6379` | Existing Redis Port to use if redis.enabled is false |
 | fileserver.affinity | object | `{}` |  |
 | fileserver.extraEnvs | list | `[]` |  |
 | fileserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | fileserver.image.repository | string | `"allegroai/clearml"` |  |
-| fileserver.image.tag | string | `"1.6.0"` |  |
+| fileserver.image.tag | string | `"1.8.0"` |  |
 | fileserver.nodeSelector | object | `{}` |  |
 | fileserver.podAnnotations | object | `{}` |  |
 | fileserver.replicaCount | int | `1` |  |
@@ -265,7 +265,7 @@ Kubernetes: `>= 1.21.0-0 < 1.26.0-0`
 | webserver.extraEnvs | list | `[]` |  |
 | webserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | webserver.image.repository | string | `"allegroai/clearml"` |  |
-| webserver.image.tag | string | `"1.6.0"` |  |
+| webserver.image.tag | string | `"1.8.0"` |  |
 | webserver.nodeSelector | object | `{}` |  |
 | webserver.podAnnotations | object | `{}` |  |
 | webserver.replicaCount | int | `1` |  |
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -83,7 +83,7 @@ apiserver:
  image:
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.6.0"
+    tag: "1.8.0"

  extraEnvs: []

@@ -155,7 +155,7 @@ fileserver:
  image:
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.6.0"
+    tag: "1.8.0"

  extraEnvs: []

@@ -200,7 +200,7 @@ webserver:
  image:
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.6.0"
+    tag: "1.8.0"

  podAnnotations: {}

@@ -229,13 +229,13 @@ externalServices:
  elasticsearchHost: ""
  # -- Existing ElasticSearch Port to use if elasticsearch.enabled is false
  elasticsearchPort: 9200
-  # -- Existing MongoDB Hostname to use if elasticsearch.enabled is false
+  # -- Existing MongoDB Hostname to use if mongodb.enabled is false
  mongodbHost: ""
-  # -- Existing MongoDB Port to use if elasticsearch.enabled is false
+  # -- Existing MongoDB Port to use if mongodb.enabled is false
  mongodbPort: 27017
-  # -- Existing Redis Hostname to use if elasticsearch.enabled is false
+  # -- Existing Redis Hostname to use if redis.enabled is false
  redisHost: ""
-  # -- Existing Redis Port to use if elasticsearch.enabled is false
+  # -- Existing Redis Port to use if redis.enabled is false
  redisPort: 6379

 redis:  # configuration from https://github.com/bitnami/charts/blob/master/bitnami/redis/values.yaml
Author	SHA1	Message	Date
Valeriano Manassero	c54e6ef44a	Upgrade 180 (#118 ) * Changed: bump up app to version 1.8.0 * Changed: bump up chart version	2022-11-30 08:12:52 +01:00
Valeriano Manassero	ca54cb570f	Serving refactoring (#116 ) * Changed: remove unused status * Changed: image tags refactoring * Changed: Images references refactoring * Added: serving ingresses * Added: grafana ingress * Added: grafana ingress * Changed: chart version bump * Changed: maintainers * Added: value comments * Fixed: typo * Fixed: typos	2022-11-04 15:10:11 +01:00
Valeriano Manassero	5035814ed9	Changed: serving app version to 1.2.0 (#114 )	2022-10-11 10:34:52 +02:00
Valeriano Manassero	462a8da239	Serving hpa (#113 ) * Added: basic hpa * Changed: version bump	2022-10-10 09:17:05 +02:00
Valeriano Manassero	8747bceb4e	1.7.0 upgrade (#112 ) * Changed: mage update * Changed: version update	2022-10-05 14:34:47 +02:00
Valeriano Manassero	6aea682b0d	Fix: agent release (#109 ) * Fix: agent release * Changed: version bump	2022-09-16 08:42:34 +02:00