Added: Support for additional ServiceAccount annotations (#337 )

Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>
[ClearML] Added service account annotations (#336 )
2025-04-17 01:31:13 +00:00 · 2025-01-02 16:36:58 +01:00 · 2025-01-02 15:56:11 +01:00 · 2024-10-07 14:24:19 +02:00 · 2024-10-07 14:21:23 +02:00 · 2024-10-07 14:20:39 +02:00
19 changed files with 137 additions and 58 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -3,7 +3,7 @@ description: Create a report to help us improve
 title: "[name of the chart e.g. clearml-agent] Issue Title"
 labels: [bug]
 assignees:
-  - valeriano-manassero
+  - filippo-clearml
 body:
  - type: markdown
    attributes:
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -3,7 +3,7 @@ description: Suggest an idea for this project
 title: "[name of the chart e.g. clearml-agent] Issue Title"
 labels: [enhancement]
 assignees:
-  - valeriano-manassero
+  - filippo-clearml
 body:
  - type: markdown
    attributes:
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,7 +11,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.7
        with:
          fetch-depth: 0
      - name: Run helm-docs
@@ -24,20 +24,20 @@ jobs:
    strategy:
      matrix:
        k8s:
-          - v1.28.9
-          - v1.29.4
-          - v1.30.0
+          - v1.29.8
+          - v1.30.4
+          - v1.31.0
    steps:
      - name: Checkout
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.7
        with:
          fetch-depth: 0
      - name: Create kind ${{ matrix.k8s }} cluster
-        uses: helm/kind-action@v1.8.0
+        uses: helm/kind-action@v1.10.0
        with:
          node_image: kindest/node:${{ matrix.k8s }}
      - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.5.0
+        uses: helm/chart-testing-action@v2.6.1
        with:
          version: v3.8.0
      - name: Add bitnami repo
--- a/charts/clearml-agent/Chart.yaml
+++ b/charts/clearml-agent/Chart.yaml
@@ -2,17 +2,17 @@ apiVersion: v2
 name: clearml-agent
 description: MLOps platform Task running agent
 type: application
-version: "5.2.1"
+version: "5.3.0"
 appVersion: "1.24"
-kubeVersion: ">= 1.21.0-0 < 1.31.0-0"
+kubeVersion: ">= 1.21.0-0 < 1.32.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
  - https://github.com/allegroai/clearml-helm-charts
  - https://github.com/allegroai/clearml
 maintainers:
-  - name: valeriano-manassero
-    url: https://github.com/valeriano-manassero
+  - name: filippo-clearml
+    url: https://github.com/filippo-clearml
 keywords:
  - clearml
  - "machine learning"
@@ -20,5 +20,5 @@ keywords:
  - "task agent"
 annotations:
  artifacthub.io/changes: |
-    - kind: fixed
-      description: Create queue must be disabled by default to preserve backward compatibility
+    - kind: added
+      description: "Support for additional ServiceAccount annotations"
--- a/charts/clearml-agent/README.md
+++ b/charts/clearml-agent/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Agent

-![Version: 5.2.1](https://img.shields.io/badge/Version-5.2.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)
+![Version: 5.3.0](https://img.shields.io/badge/Version-5.3.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)

 MLOps platform Task running agent

@@ -10,13 +10,21 @@ MLOps platform Task running agent

 | Name | Email | Url |
 | ---- | ------ | --- |
-| valeriano-manassero |  | <https://github.com/valeriano-manassero> |
+| filippo-clearml |  | <https://github.com/filippo-clearml> |

 ## Introduction

 The **clearml-agent** is the Kubernetes agent for for [ClearML](https://github.com/allegroai/clearml).
 It allows you to schedule distributed experiments on a Kubernetes cluster.

+## Add to local Helm repository
+
+To add this chart to your local Helm repository:
+
+```
+helm repo add allegroai https://allegroai.github.io/clearml-helm-charts
+```
+
 # Upgrading Chart

 ## Upgrades/ Values upgrades
@@ -47,13 +55,13 @@ Before issuing helm upgrade:

 ## Requirements

-Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.32.0-0`

 ## Values

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| agentk8sglue | object | `{"additionalClusterRoleBindings":[],"additionalRoleBindings":[],"affinity":{},"annotations":{},"apiServerUrlReference":"https://api.clear.ml","basePodTemplate":{"affinity":{},"annotations":{},"containerSecurityContext":{},"env":[],"fileMounts":[],"hostAliases":[],"initContainers":[],"labels":{},"nodeSelector":{},"podSecurityContext":{},"priorityClassName":"","resources":{},"schedulerName":"","tolerations":[],"volumeMounts":[],"volumes":[]},"clearmlcheckCertificate":true,"containerSecurityContext":{},"createQueueIfNotExists":false,"defaultContainerImage":"ubuntu:18.04","extraEnvs":[],"fileMounts":[],"fileServerUrlReference":"https://files.clear.ml","image":{"registry":"","repository":"allegroai/clearml-agent-k8s-base","tag":"1.24-21"},"initContainers":{"resources":{}},"labels":{},"nodeSelector":{},"podSecurityContext":{},"queue":"default","replicaCount":1,"resources":{},"serviceExistingAccountName":"","tolerations":[],"volumeMounts":[],"volumes":[],"webServerUrlReference":"https://app.clear.ml"}` | This agent will spawn queued experiments in new pods, a good use case is to combine this with GPU autoscaling nodes. https://github.com/allegroai/clearml-agent/tree/master/docker/k8s-glue |
+| agentk8sglue | object | `{"additionalClusterRoleBindings":[],"additionalRoleBindings":[],"affinity":{},"annotations":{},"apiServerUrlReference":"https://api.clear.ml","basePodTemplate":{"affinity":{},"annotations":{},"containerSecurityContext":{},"env":[],"fileMounts":[],"hostAliases":[],"initContainers":[],"labels":{},"nodeSelector":{},"podSecurityContext":{},"priorityClassName":"","resources":{},"schedulerName":"","tolerations":[],"volumeMounts":[],"volumes":[]},"clearmlcheckCertificate":true,"containerSecurityContext":{},"createQueueIfNotExists":false,"defaultContainerImage":"ubuntu:18.04","extraEnvs":[],"fileMounts":[],"fileServerUrlReference":"https://files.clear.ml","image":{"registry":"","repository":"allegroai/clearml-agent-k8s-base","tag":"1.24-21"},"initContainers":{"resources":{}},"labels":{},"nodeSelector":{},"podSecurityContext":{},"queue":"default","replicaCount":1,"resources":{},"serviceAccountAnnotations":{},"serviceExistingAccountName":"","tolerations":[],"volumeMounts":[],"volumes":[],"webServerUrlReference":"https://app.clear.ml"}` | This agent will spawn queued experiments in new pods, a good use case is to combine this with GPU autoscaling nodes. https://github.com/allegroai/clearml-agent/tree/master/docker/k8s-glue |
 | agentk8sglue.additionalClusterRoleBindings | list | `[]` | additional existing ClusterRoleBindings |
 | agentk8sglue.additionalRoleBindings | list | `[]` | additional existing RoleBindings |
 | agentk8sglue.affinity | object | `{}` | affinity setup for Agent pod (example in values.yaml comments) |
@@ -92,7 +100,8 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
 | agentk8sglue.queue | string | `"default"` | ClearML queue this agent will consume. Multiple queues can be specified with the following format: queue1,queue2,queue3 |
 | agentk8sglue.replicaCount | int | `1` | Glue Agent number of pods |
 | agentk8sglue.resources | object | `{}` | Glue Agent pod resources |
-| agentk8sglue.serviceExistingAccountName | string | `""` | if set, don't create a serviceAccountName but use defined existing one |
+| agentk8sglue.serviceAccountAnnotations | object | `{}` | Add the provided map to the annotations for the ServiceAccount resource created by this chart |
+| agentk8sglue.serviceExistingAccountName | string | `""` | If set, do not create a serviceAccountName and use the existing one with the provided name |
 | agentk8sglue.tolerations | list | `[]` | tolerations setup for Agent pod (example in values.yaml comments) |
 | agentk8sglue.volumeMounts | list | `[]` | volume mounts definition for Glue Agent (example in values.yaml comments) |
 | agentk8sglue.volumes | list | `[]` | volumes definition for Glue Agent (example in values.yaml comments) |
--- a/charts/clearml-agent/README.md.gotmpl
+++ b/charts/clearml-agent/README.md.gotmpl
@@ -14,6 +14,14 @@
 The **clearml-agent** is the Kubernetes agent for for [ClearML](https://github.com/allegroai/clearml).
 It allows you to schedule distributed experiments on a Kubernetes cluster.

+## Add to local Helm repository
+
+To add this chart to your local Helm repository:
+
+```
+helm repo add allegroai https://allegroai.github.io/clearml-helm-charts
+```
+
 # Upgrading Chart

 ## Upgrades/ Values upgrades
--- a/charts/clearml-agent/templates/agentk8sglue-rbac.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-rbac.yaml
@@ -4,6 +4,10 @@ kind: ServiceAccount
 metadata:
  name: {{ include "clearmlAgent.serviceAccountName" . }}
  namespace: {{ .Release.Namespace }}
+  {{- if .Values.agentk8sglue.serviceAccountAnnotations }}
+  annotations:
+    {{- toYaml .Values.agentk8sglue.serviceAccountAnnotations | nindent 4 }}
+  {{- end }}
 {{- end }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
--- a/charts/clearml-agent/values.yaml
+++ b/charts/clearml-agent/values.yaml
@@ -65,7 +65,9 @@ agentk8sglue:
    # -- Glue Agent initcontainers pod resources
    resources: {}

-  # -- if set, don't create a serviceAccountName but use defined existing one
+  # -- Add the provided map to the annotations for the ServiceAccount resource created by this chart
+  serviceAccountAnnotations: {}
+  # -- If set, do not create a serviceAccountName and use the existing one with the provided name
  serviceExistingAccountName: ""

  # -- Check certificates validity for evefry UrlReference below.
--- a/charts/clearml-serving/Chart.yaml
+++ b/charts/clearml-serving/Chart.yaml
@@ -2,17 +2,17 @@ apiVersion: v2
 name: clearml-serving
 description: ClearML Serving Helm Chart
 type: application
-version: "1.5.6"
+version: "1.5.8"
 appVersion: "1.3.0"
-kubeVersion: ">= 1.21.0-0 < 1.31.0-0"
+kubeVersion: ">= 1.21.0-0 < 1.32.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
  - https://github.com/allegroai/clearml-helm-charts
  - https://github.com/allegroai/clearml
 maintainers:
-  - name: valeriano-manassero
-    url: https://github.com/valeriano-manassero
+  - name: filippo-clearml
+    url: https://github.com/filippo-clearml
 keywords:
  - clearml
  - "machine learning"
@@ -33,5 +33,5 @@ dependencies:
    condition: grafana.enabled
 annotations:
  artifacthub.io/changes: |
-    - kind: added
-      description: k8s 1.30 support
+    - kind: fixed
+      description: Triton deployment tolerations placement fix
--- a/charts/clearml-serving/README.md
+++ b/charts/clearml-serving/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Serving

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

 ClearML Serving Helm Chart

@@ -10,13 +10,21 @@ ClearML Serving Helm Chart

 | Name | Email | Url |
 | ---- | ------ | --- |
-| valeriano-manassero |  | <https://github.com/valeriano-manassero> |
+| filippo-clearml |  | <https://github.com/filippo-clearml> |

 ## Introduction

 The **clearml-serving** is the Kubernetes serving for for [ClearML](https://github.com/allegroai/clearml-serving).
 It allows you to serve models on a Kubernetes cluster.

+## Add to local Helm repository
+
+To add this chart to your local Helm repository:
+
+```
+helm repo add allegroai https://allegroai.github.io/clearml-helm-charts
+```
+
 # Upgrading Chart

 ## Upgrades/ Values upgrades
@@ -41,7 +49,7 @@ helm upgrade clearml-serving allegroai/clearml-serving --version <CURRENT CHART

 ## Requirements

-Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.32.0-0`

 | Repository | Name | Version |
 |------------|------|---------|
--- a/charts/clearml-serving/README.md.gotmpl
+++ b/charts/clearml-serving/README.md.gotmpl
@@ -14,6 +14,14 @@
 The **clearml-serving** is the Kubernetes serving for for [ClearML](https://github.com/allegroai/clearml-serving).
 It allows you to serve models on a Kubernetes cluster.

+## Add to local Helm repository
+
+To add this chart to your local Helm repository:
+
+```
+helm repo add allegroai https://allegroai.github.io/clearml-helm-charts
+```
+
 # Upgrading Chart

 ## Upgrades/ Values upgrades
--- a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
@@ -48,6 +48,10 @@ spec:
      affinity:
        {{- toYaml . | nindent 8 }}
      {{- end }}
+      {{- with .Values.clearml_serving_triton.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      containers:
        - env:
            - name: CLEARML_API_ACCESS_KEY
@@ -82,10 +86,6 @@ spec:
            - name: additional-config
              mountPath: /opt/clearml/config
          {{- end }}
-          {{- with .Values.clearml_serving_triton.tolerations }}
-          tolerations:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
          resources:
            {{- toYaml .Values.clearml_serving_triton.resources | nindent 12 }}
      restartPolicy: Always
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,17 +2,17 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "7.10.1"
-appVersion: "1.15"
-kubeVersion: ">= 1.21.0-0 < 1.31.0-0"
+version: "7.12.0"
+appVersion: "1.16"
+kubeVersion: ">= 1.21.0-0 < 1.32.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
  - https://github.com/allegroai/clearml-helm-charts
  - https://github.com/allegroai/clearml
 maintainers:
-  - name: valeriano-manassero
-    url: https://github.com/valeriano-manassero
+  - name: filippo-clearml
+    url: https://github.com/filippo-clearml
 keywords:
  - clearml
  - "machine learning"
@@ -32,5 +32,5 @@ dependencies:
    condition: elasticsearch.enabled
 annotations:
  artifacthub.io/changes: |
-    - kind: fixed
-      description: additionalVolumeMount indentation is fixed
+    - kind: added
+      description: Added ability to add annotations to server service accounts
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes

-![Version: 7.10.1](https://img.shields.io/badge/Version-7.10.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.15](https://img.shields.io/badge/AppVersion-1.15-informational?style=flat-square)
+![Version: 7.12.0](https://img.shields.io/badge/Version-7.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16](https://img.shields.io/badge/AppVersion-1.16-informational?style=flat-square)

 MLOps platform

@@ -10,7 +10,7 @@ MLOps platform

 | Name | Email | Url |
 | ---- | ------ | --- |
-| valeriano-manassero |  | <https://github.com/valeriano-manassero> |
+| filippo-clearml |  | <https://github.com/filippo-clearml> |

 ## Introduction

@@ -25,6 +25,14 @@ It allows multiple users to collaborate and manage their experiments.
    * Querying experiments history, logs and results
 * Locally-hosted file server for storing images and models making them easily accessible using the Web-App

+## Add to local Helm repository
+
+To add this chart to your local Helm repository:
+
+```
+helm repo add allegroai https://allegroai.github.io/clearml-helm-charts
+```
+
 ## Local environment

 For development/evaluation it's possible to use [kind](https://kind.sigs.k8s.io).
@@ -133,7 +141,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a

 ## Requirements

-Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.32.0-0`

 | Repository | Name | Version |
 |------------|------|---------|
@@ -145,7 +153,7 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| apiserver | object | `{"additionalConfigs":{},"additionalVolumeMounts":{},"additionalVolumes":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":null,"enabled":true,"existingAdditionalConfigsConfigMap":"","existingAdditionalConfigsSecret":"","extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"},"ingress":{"annotations":{},"enabled":false,"hostName":"api.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"prepopulateEnabled":true,"processes":{"count":8,"maxRequests":1000,"maxRequestsJitter":300,"timeout":24000},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30008,"port":8008,"type":"NodePort"},"serviceAccountName":"clearml","tolerations":[]}` | Api Server configurations |
+| apiserver | object | `{"additionalConfigs":{},"additionalVolumeMounts":{},"additionalVolumes":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":null,"enabled":true,"existingAdditionalConfigsConfigMap":"","existingAdditionalConfigsSecret":"","extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.16.2-502"},"ingress":{"annotations":{},"enabled":false,"hostName":"api.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"prepopulateEnabled":true,"processes":{"count":8,"maxRequests":1000,"maxRequestsJitter":300,"timeout":24000},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30008,"port":8008,"type":"NodePort"},"serviceAccountAnnotations":{},"serviceAccountName":"clearml","tolerations":[]}` | Api Server configurations |
 | apiserver.additionalConfigs | object | `{}` | files declared in this parameter will be mounted and read by apiserver (examples in values.yaml) if not overridden by existingAdditionalConfigsSecret |
 | apiserver.additionalVolumeMounts | object | `{}` | Specifies where and how the volumes defined in additionalVolumes. |
 | apiserver.additionalVolumes | object | `{}` | # Defines extra Kubernetes volumes to be attached to the pod. |
@@ -156,7 +164,7 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
 | apiserver.existingAdditionalConfigsConfigMap | string | `""` | reference for files declared in existing ConfigMap will be mounted and read by apiserver (examples in values.yaml) |
 | apiserver.existingAdditionalConfigsSecret | string | `""` | reference for files declared in existing Secret will be mounted and read by apiserver (examples in values.yaml) if not overridden by existingAdditionalConfigsConfigMap |
 | apiserver.extraEnvs | list | `[]` | Api Server extra envrinoment variables |
-| apiserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"}` | Api Server image configuration |
+| apiserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.16.2-502"}` | Api Server image configuration |
 | apiserver.ingress | object | `{"annotations":{},"enabled":false,"hostName":"api.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""}` | Ingress configuration for Api Server component |
 | apiserver.ingress.annotations | object | `{}` | Ingress annotations |
 | apiserver.ingress.enabled | bool | `false` | Enable/Disable ingress |
@@ -179,6 +187,7 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
 | apiserver.service | object | `{"annotations":{},"nodePort":30008,"port":8008,"type":"NodePort"}` | Api Server internal service configuration |
 | apiserver.service.annotations | object | `{}` | specific annotation for Api Server service |
 | apiserver.service.nodePort | int | `30008` | If service.type set to NodePort, this will be set to service's nodePort field. If service.type is set to others, this field will be ignored |
+| apiserver.serviceAccountAnnotations | object | `{}` | Add the provided map to the annotations for the ServiceAccount resource created by this chart. |
 | apiserver.serviceAccountName | string | `"clearml"` | The default serviceAccountName to be used |
 | apiserver.tolerations | list | `[]` | Api Server tolerations setup |
 | clearml | object | `{"apiserverKey":"GGS9F4M6XB2DXJ5AFT9F","apiserverSecret":"2oGujVFhPfaozhpuz2GzQfA5OyxmMsR3WVJpsCR5hrgHFs20PO","clientConfigurationApiUrl":"","clientConfigurationFilesUrl":"","cookieDomain":"","cookieName":"clearml-token-k8s","defaultCompany":"d1bd92a3b039400cbafc60a7a5b1e52b","existingSecret":"","fileserverKey":"XXCRJ123CEE2KSQ068WO","fileserverSecret":"YIy8EVAC7QCT4FtgitxAQGyW7xRHDZ4jpYlTE7HKiscpORl1hG","readinessprobeKey":"GK4PRTVT3706T25K6BA1","readinessprobeSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","secureAuthTokenSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","testUserKey":"ENP39EQM4SLACGD5FXB7","testUserSecret":"lPcm0imbcBZ8mwgO7tpadutiS3gnJD05x9j7afwXPS35IKbpiQ"}` | ClearMl generic configurations |
@@ -204,7 +213,7 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
 | externalServices.mongodbConnectionStringBackend | string | `"mongodb://mongodb_hostnamehostname:27017/backend"` | Existing MongoDB connection string for AUTH to use if mongodb.enabled is false (example in values.yaml) |
 | externalServices.redisHost | string | `"redis_hostname"` | Existing Redis Hostname to use if redis.enabled is false (example in values.yaml) |
 | externalServices.redisPort | int | `6379` | Existing Redis Port to use if redis.enabled is false |
-| fileserver | object | `{"additionalVolumeMounts":{},"additionalVolumes":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"},"ingress":{"annotations":{},"enabled":false,"hostName":"files.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30081,"port":8081,"type":"NodePort"},"serviceAccountName":"clearml","storage":{"data":{"accessMode":"ReadWriteOnce","class":"","existingPVC":"","size":"50Gi"},"enabled":true},"tolerations":[]}` | File Server configurations |
+| fileserver | object | `{"additionalVolumeMounts":{},"additionalVolumes":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.16.2-502"},"ingress":{"annotations":{},"enabled":false,"hostName":"files.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30081,"port":8081,"type":"NodePort"},"serviceAccountAnnotations":{},"serviceAccountName":"clearml","storage":{"data":{"accessMode":"ReadWriteOnce","class":"","existingPVC":"","size":"50Gi"},"enabled":true},"tolerations":[]}` | File Server configurations |
 | fileserver.additionalVolumeMounts | object | `{}` | Specifies where and how the volumes defined in additionalVolumes. |
 | fileserver.additionalVolumes | object | `{}` | # Defines extra Kubernetes volumes to be attached to the pod. |
 | fileserver.affinity | object | `{}` | File Server affinity setup |
@@ -212,7 +221,7 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
 | fileserver.deploymentAnnotations | object | `{}` | Add the provided map to the annotations for the Deployment resource created by this chart. |
 | fileserver.enabled | bool | `true` | Enable/Disable component deployment |
 | fileserver.extraEnvs | list | `[]` | File Server extra envrinoment variables |
-| fileserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"}` | File Server image configuration |
+| fileserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.16.2-502"}` | File Server image configuration |
 | fileserver.ingress | object | `{"annotations":{},"enabled":false,"hostName":"files.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""}` | Ingress configuration for File Server component |
 | fileserver.ingress.annotations | object | `{}` | Ingress annotations |
 | fileserver.ingress.enabled | bool | `false` | Enable/Disable ingress |
@@ -229,6 +238,7 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
 | fileserver.service | object | `{"annotations":{},"nodePort":30081,"port":8081,"type":"NodePort"}` | File Server internal service configuration |
 | fileserver.service.annotations | object | `{}` | specific annotation for File Server service |
 | fileserver.service.nodePort | int | `30081` | If service.type set to NodePort, this will be set to service's nodePort field. If service.type is set to others, this field will be ignored |
+| fileserver.serviceAccountAnnotations | object | `{}` | Add the provided map to the annotations for the ServiceAccount resource created by this chart. |
 | fileserver.serviceAccountName | string | `"clearml"` | The default serviceAccountName to be used |
 | fileserver.storage | object | `{"data":{"accessMode":"ReadWriteOnce","class":"","existingPVC":"","size":"50Gi"},"enabled":true}` | File server persistence settings |
 | fileserver.storage.data.accessMode | string | `"ReadWriteOnce"` | Access mode (must be ReadWriteMany if fileserver replica > 1) |
@@ -247,7 +257,7 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
 | imageCredentials.username | string | `"someone"` | Registry username |
 | mongodb | object | `{"architecture":"standalone","auth":{"enabled":false},"enabled":true,"persistence":{"accessModes":["ReadWriteOnce"],"enabled":true,"size":"50Gi","storageClass":null},"replicaCount":1}` | Configuration from https://github.com/bitnami/charts/blob/master/bitnami/mongodb/values.yaml |
 | redis | object | `{"architecture":"standalone","auth":{"enabled":false},"databaseNumber":0,"enabled":true,"master":{"name":"{{ .Release.Name }}-redis-master","persistence":{"accessModes":["ReadWriteOnce"],"enabled":true,"size":"5Gi","storageClass":null},"port":6379}}` | Configuration from https://github.com/bitnami/charts/blob/master/bitnami/redis/values.yaml |
-| webserver | object | `{"additionalConfigs":{},"additionalVolumeMounts":{},"additionalVolumes":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"},"ingress":{"annotations":{},"enabled":false,"hostName":"app.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30080,"port":8080,"type":"NodePort"},"serviceAccountName":"clearml","tolerations":[]}` | Web Server configurations |
+| webserver | object | `{"additionalConfigs":{},"additionalVolumeMounts":{},"additionalVolumes":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.16.2-502"},"ingress":{"annotations":{},"enabled":false,"hostName":"app.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30080,"port":8080,"type":"NodePort"},"serviceAccountAnnotations":{},"serviceAccountName":"clearml","tolerations":[]}` | Web Server configurations |
 | webserver.additionalConfigs | object | `{}` | Additional specific webserver configurations |
 | webserver.additionalVolumeMounts | object | `{}` | Specifies where and how the volumes defined in additionalVolumes. |
 | webserver.additionalVolumes | object | `{}` | # Defines extra Kubernetes volumes to be attached to the pod. |
@@ -256,7 +266,7 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
 | webserver.deploymentAnnotations | object | `{}` | Add the provided map to the annotations for the Deployment resource created by this chart. |
 | webserver.enabled | bool | `true` | Enable/Disable component deployment |
 | webserver.extraEnvs | list | `[]` | Web Server extra envrinoment variables |
-| webserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"}` | Web Server image configuration |
+| webserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.16.2-502"}` | Web Server image configuration |
 | webserver.ingress | object | `{"annotations":{},"enabled":false,"hostName":"app.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""}` | Ingress configuration for Web Server component |
 | webserver.ingress.annotations | object | `{}` | Ingress annotations |
 | webserver.ingress.enabled | bool | `false` | Enable/Disable ingress |
@@ -273,5 +283,6 @@ Kubernetes: `>= 1.21.0-0 < 1.31.0-0`
 | webserver.service | object | `{"annotations":{},"nodePort":30080,"port":8080,"type":"NodePort"}` | Web Server internal service configuration |
 | webserver.service.annotations | object | `{}` | specific annotation for Web Server service |
 | webserver.service.nodePort | int | `30080` | If service.type set to NodePort, this will be set to service's nodePort field. If service.type is set to others, this field will be ignored |
+| webserver.serviceAccountAnnotations | object | `{}` | Add the provided map to the annotations for the ServiceAccount resource created by this chart. |
 | webserver.serviceAccountName | string | `"clearml"` | The default serviceAccountName to be used |
 | webserver.tolerations | list | `[]` | Web Server tolerations setup |
--- a/charts/clearml/README.md.gotmpl
+++ b/charts/clearml/README.md.gotmpl
@@ -22,6 +22,14 @@ It allows multiple users to collaborate and manage their experiments.
    * Querying experiments history, logs and results
 * Locally-hosted file server for storing images and models making them easily accessible using the Web-App

+## Add to local Helm repository
+
+To add this chart to your local Helm repository:
+
+```
+helm repo add allegroai https://allegroai.github.io/clearml-helm-charts
+```
+
 ## Local environment

 For development/evaluation it's possible to use [kind](https://kind.sigs.k8s.io).
--- a/charts/clearml/templates/apiserver-asyncdelete-deployment.yaml
+++ b/charts/clearml/templates/apiserver-asyncdelete-deployment.yaml
@@ -106,6 +106,13 @@ spec:
            value: {{ include "elasticsearch.connectionstring" . }}
          - name: CLEARML__HOSTS__ELASTIC__LOGS__HOSTS
            value: {{ include "elasticsearch.connectionstring" . }}
+          - name: CLEARML__secure__auth__token_secret
+            valueFrom:
+              secretKeyRef:
+                name: {{ include "clearml.confSecretName" .}}
+                key: secure_auth_token_secret
+          - name: CLEARML__apiserver__default_company_name
+            value: "{{ .Values.clearml.defaultCompany }}"
          - name: CLEARML__logging__handlers__text_file__filename
            value: "/dev/null"
          - name: PYTHONPATH
@@ -114,11 +121,6 @@ spec:
            value: "{{ .Values.clearml.defaultCompanyGuid }}"
          - name: CLEARML__services__async_urls_delete__fileserver__url_prefixes
            value: "[\"{{ include "clearml.fileUrl" . }}\"]"
-          - name: CLEARML__secure__auth__token_secret
-            valueFrom:
-              secretKeyRef:
-                name: {{ include "clearml.confSecretName" .}}
-                key: secure_auth_token_secret
          {{- if or .Values.apiserver.additionalConfigs .Values.apiserver.existingAdditionalConfigsConfigMap  .Values.apiserver.existingAdditionalConfigsSecret }}
          volumeMounts:  
            - name: apiserver-config
--- a/charts/clearml/templates/serviceAccount.yaml
+++ b/charts/clearml/templates/serviceAccount.yaml
@@ -2,13 +2,25 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ .Values.apiserver.serviceAccountName }}-apiserver
+  {{- if .Values.apiserver.serviceAccountAnnotations }}
+  annotations:
+    {{- toYaml .Values.apiserver.serviceAccountAnnotations | nindent 4 }}
+  {{- end }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ .Values.fileserver.serviceAccountName }}-fileserver
+  {{- if .Values.fileserver.serviceAccountAnnotations }}
+  annotations:
+    {{- toYaml .Values.fileserver.serviceAccountAnnotations | nindent 4 }}
+  {{- end }}
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ .Values.webserver.serviceAccountName }}-webserver
+  {{- if .Values.webserver.serviceAccountAnnotations }}
+  annotations:
+    {{- toYaml .Values.webserver.serviceAccountAnnotations | nindent 4 }}
+  {{- end }}
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -62,12 +62,14 @@ apiserver:
  prepopulateEnabled: true
  # -- The default serviceAccountName to be used
  serviceAccountName: clearml
+  # -- Add the provided map to the annotations for the ServiceAccount resource created by this chart.
+  serviceAccountAnnotations: {}
  # -- Api Server image configuration
  image:
    registry: ""
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.15.1-478"
+    tag: "1.16.2-502"
  # -- Api Server internal service configuration
  service:
    # -- specific annotation for Api Server service
@@ -190,12 +192,14 @@ fileserver:
  deploymentAnnotations: {}
  # -- The default serviceAccountName to be used
  serviceAccountName: clearml
+  # -- Add the provided map to the annotations for the ServiceAccount resource created by this chart.
+  serviceAccountAnnotations: {}
  # -- File Server image configuration
  image:
    registry: ""
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.15.1-478"
+    tag: "1.16.2-502"
  # -- File Server internal service configuration
  service:
    # -- specific annotation for File Server service
@@ -286,12 +290,14 @@ webserver:
  deploymentAnnotations: {}
  # -- The default serviceAccountName to be used
  serviceAccountName: clearml
+  # -- Add the provided map to the annotations for the ServiceAccount resource created by this chart.
+  serviceAccountAnnotations: {}
  # -- Web Server image configuration
  image:
    registry: ""
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.15.1-478"
+    tag: "1.16.2-502"
  # -- Web Server internal service configuration
  service:
    # -- specific annotation for Web Server service
Author	SHA1	Message	Date
Filippo Brintazzoli	7c53365cd8	Added: Support for additional ServiceAccount annotations (#337 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-01-02 16:36:58 +01:00
Daglar Berk Erdem	a51c7ee856	[ClearML] Added service account annotations (#336 ) * fix: removed harcoded apiVersion * feat: add support for custom annotations to the created service account * feat: added service account annotations * chore: updated README.md * chore: chart version bump * Revert "fix: removed harcoded apiVersion" This reverts commit `18da292366`. * Revert "feat: add support for custom annotations to the created service account" This reverts commit `8dc926bf1b`. --------- Co-authored-by: Dağlar Berk Erdem <daglar@codeway.co>	2025-01-02 15:56:11 +01:00
Filippo Brintazzoli	67c3720cf9	Changed: Kind versions for CI (#329 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2024-10-07 14:24:19 +02:00
Filippo Brintazzoli	c501ede9be	Added: Support for Kubernetes 1.31 (#328 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2024-10-07 14:21:23 +02:00
Filippo Brintazzoli	10a33b65f7	Added: Support for Kubernetes 1.31 (#327 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2024-10-07 14:20:39 +02:00
Filippo Brintazzoli	0866033bac	Fixed: Triton deployment tolerations placement fix (#325 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2024-09-27 17:10:16 +02:00
Ben Lewis	02a87e18f5	Fix duplicate `CLEARML__secure__auth__token_secret` in `apiserver-asyncdelete-deployment.yaml` (#322 ) * Fix duplicate `CLEARML__secure__auth__token_secret` in `apiserver-asyncdelete-deployment.yaml` * Bump `version` in `Chart.yaml` * Bump version in `README.md` * Update Chart.yaml Apply request to change `Chart.yaml`	2024-09-23 09:56:29 +02:00
Filippo Brintazzoli	7532609c35	Changed: Update to 1.16.2 (#315 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2024-08-27 17:21:54 +02:00
Filippo Brintazzoli	bf17429258	Updated clearml-serving README and CI (#313 ) * Changed: updated Readme * Changed: CI actions versions * Changed: CI default test values * Fixed: newline * Changed: tests for CI * Fixed: newline * Changed: removed CI values customization --------- Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2024-08-21 16:02:20 +02:00
Filippo Brintazzoli	adcb4b0fc9	Changed: updated Readme (#314 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2024-08-19 15:52:58 +02:00
Filippo Brintazzoli	873f222d68	Changed: updated Readme (#312 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2024-08-19 15:49:47 +02:00
Valeriano Manassero	fbbbee5ef2	1.16.1 release (#307 ) * Changed: image version 1.16.1 * Changed: bump up	2024-07-22 08:18:05 +02:00
Valeriano Manassero	e569ed3d9e	Changed: assign issue to filippo (#304 )	2024-06-27 09:32:48 +02:00
Valeriano Manassero	2b0d67000a	1.16 (#302 ) * Added: env vars * Changed: upgrade app to 1.16 * Changed: bump up * Changed: bump up	2024-06-27 08:54:39 +02:00
Valeriano Manassero	700d6b244b	Fixed: rename yml (#301 )	2024-06-19 13:48:30 +02:00
Valeriano Manassero	61c96ddf6d	Fixed: remove blank issues (#300 )	2024-06-19 13:46:31 +02:00