Issue 343: [clearml] apiserver-asyncdelete cannot start (-> CrashLoopBackOff in kubernetes) (#353 )

Fixed: casted port to string before concatenation Co-authored-by: Casell <supercasell@gmail.com>
Changed: Support kubernetes 1.32 (#351 )
2025-04-17 01:31:13 +00:00 · 2025-03-12 10:27:22 +01:00 · 2025-02-25 11:47:55 +01:00 · 2025-02-25 11:31:22 +01:00 · 2025-02-25 11:28:07 +01:00 · 2025-01-21 17:29:57 +01:00
62 changed files with 1080 additions and 1360 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,47 @@
+name: Bug Report
+description: Create a report to help us improve
+title: "[name of the chart e.g. clearml-agent] Issue Title"
+labels: [bug]
+assignees:
+  - filippo-clearml
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! Please be cautious with the sensitive information/logs while filing the issue.
+  - type: textarea
+    id: desc
+    attributes:
+      label: Describe the bug a clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: input
+    id: helm-version
+    attributes:
+      label: What's your helm version?
+      description: Enter the output of `$ helm version`
+      placeholder: Copy paste the entire output of the above 
+    validations:
+      required: true
+  - type: input
+    id: kubectl-version
+    attributes:
+      label: What's your kubectl version?
+      description: Enter the output of `$ kubectl version`
+    validations:
+      required: true
+  - type: input
+    id: chart-version
+    attributes:
+      label: What's the chart version?
+      description: Enter the version of the chart that you encountered this bug.
+    validations:
+      required: true
+  - type: textarea
+    id: changed-values
+    attributes:
+      label: Enter the changed values of values.yaml?
+      description: Please enter only values which differ from the defaults. Enter `NONE` if nothing's changed.
+      placeholder: 'key: value'
+    validations:
+      required: false
--- 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
@@ -0,0 +1,40 @@
+name: Feature request
+description: Suggest an idea for this project
+title: "[name of the chart e.g. clearml-agent] Issue Title"
+labels: [enhancement]
+assignees:
+  - filippo-clearml
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: desc
+    attributes:
+      label: Is your feature request related to a problem ?
+      description: Give a clear and concise description of what the problem is.
+      placeholder:  ex. I'd like to have [...]
+    validations:
+      required: true
+  - type: textarea
+    id: prop-solution
+    attributes:
+      label: Describe the solution you'd like.
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered.
+      description: A clear and concise description of any alternative solutions or features you've considered. If nothing, please enter `NONE`
+    validations:
+      required: true
+  - type: textarea
+    id: additional-ctxt
+    attributes:
+      label: Additional context.
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,18 @@
+**What this PR does / why we need it**:
+
+
+**Checklist**
+- [ ] Reviewed the [`CONTRIBUTING.md`](https://github.com/clearml/clearml-helm-charts/blob/main/CONTRIBUTING.md#pull-requests) guide (**required**)
+- [ ] Verify the work you plan to merge addresses an existing [issue](https://github.com/clearml/clearml-helm-charts/issues) (If not, open a new one) (**required**)
+- [ ] Check your branch with `helm lint` (**required**)
+- [ ] Update `version` in `Chart.yaml` according [semver](https://semver.org/) rules (**required**)
+- [ ] Substitute `annotations` section in `Chart.yaml` annotating implementations (useful for Artifecthub changelog) (**required**)
+- [ ] Update chart README using [helm-docs](https://github.com/norwoodj/helm-docs) (**required**)
+
+
+**Which issue(s) this PR fixes**:
+
+Fixes #<issue number>
+
+**Special notes for your reviewer**:
+
--- a/.github/helm-docs.sh
+++ b/.github/helm-docs.sh
@@ -1,7 +1,12 @@
-#!/bin/bash
+#!/bin/bash -xe

 CHART_DIRS="$(git diff --find-renames --name-only "$(git rev-parse --abbrev-ref HEAD)" remotes/origin/main -- 'charts' | grep '[cC]hart.yaml' | sed -e 's#/[Cc]hart.yaml##g')"
-HELM_DOCS_VERSION="1.11.0"
+if [[ -z "$CHART_DIRS" ]]; then
+    echo "No Chart.yaml changes detected, aborting helm-docs"
+    exit 1
+fi
+
+HELM_DOCS_VERSION="1.11.3"

 curl --silent --show-error --fail --location --output /tmp/helm-docs.tar.gz https://github.com/norwoodj/helm-docs/releases/download/v"${HELM_DOCS_VERSION}"/helm-docs_"${HELM_DOCS_VERSION}"_Linux_x86_64.tar.gz
 tar -xf /tmp/helm-docs.tar.gz helm-docs
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,7 +11,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4.1.7
+        with:
+          fetch-depth: 0
      - name: Run helm-docs
        run: .github/helm-docs.sh
  install-chart:
@@ -22,18 +24,22 @@ jobs:
    strategy:
      matrix:
        k8s:
-          - v1.24.7
-          - v1.25.3
-          - v1.26.0
+          - v1.29.8
+          - v1.30.4
+          - v1.31.0
    steps:
      - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4.1.7
+        with:
+          fetch-depth: 0
      - name: Create kind ${{ matrix.k8s }} cluster
-        uses: helm/kind-action@v1.5.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.3.1
+        uses: helm/chart-testing-action@v2.6.1
+        with:
+          version: v3.8.0
      - name: Add bitnami repo
        run: helm repo add bitnami https://charts.bitnami.com/bitnami
      - name: Add elastic repo
@@ -45,11 +51,16 @@ jobs:
      - name: Run chart-testing (list-changed)
        id: list-changed
        run: |
-          changed=$(ct list-changed --chart-dirs=charts --target-branch=main)
+          changed=$(ct list-changed --chart-dirs charts --target-branch main)
          if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
-            echo "::set-output name=changed_charts::\"${changed//$'\n'/,}\""
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+            echo "changed_charts=\"${changed//$'\n'/,}\"" >> "$GITHUB_OUTPUT"
          fi
-      - 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
+      - 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/.github/workflows/inactive-issues.yaml
+++ b/.github/workflows/inactive-issues.yaml
@@ -10,7 +10,7 @@ jobs:
      issues: write
      pull-requests: write
    steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8.0.0
        with:
          days-before-issue-stale: 28
          days-before-issue-close: 14
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -5,7 +5,7 @@ on:
    branches:
      - main
    paths:
-      - '**'
+      - 'charts/**'

 jobs:
  release:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,8 +3,8 @@
 :+1::tada: Firstly, we thank you for taking the time to contribute! :tada::+1:

 Contribution comes in many forms:
-* Reporting [issues](https://github.com/allegroai/clearml-helm-charts/issues) you've come upon
-* Participating in issue discussions in the [issue tracker](https://github.com/allegroai/clearml-helm-charts/issues) and the [ClearML community slack space](https://join.slack.com/t/allegroai-trains/shared_invite/enQtOTQyMTI1MzQxMzE4LTY5NTUxOTY1NmQ1MzQ5MjRhMGRhZmM4ODE5NTNjMTg2NTBlZGQzZGVkMWU3ZDg1MGE1MjQxNDEzMWU2NmVjZmY)
+* Reporting [issues](https://github.com/clearml/clearml-helm-charts/issues) you've come upon
+* Participating in issue discussions in the [issue tracker](https://github.com/clearml/clearml-helm-charts/issues) and the [ClearML community slack space](https://joinslack.clear.ml)
 * Suggesting new features or enhancements
 * Implementing new features or fixing outstanding issues

@@ -16,7 +16,7 @@ Use your best judgment and feel free to propose changes to this document in a pu

 By following these guidelines, you help maintainers and the community understand your report, reproduce the behavior, and find related reports.

-Before reporting an issue, please check whether it already appears [here](https://github.com/allegroai/clearml-helm-charts/issues).
+Before reporting an issue, please check whether it already appears [here](https://github.com/clearml/clearml-helm-charts/issues).
 If it does, join the on-going discussion instead.

 **Note**: If you find a **Closed** issue that may be the same issue which you are currently experiencing,
@@ -50,11 +50,14 @@ Enhancement suggestions are tracked as GitHub issues. After you determine which

 Before you submit a new PR:

-* Verify the work you plan to merge addresses an existing [issue](https://github.com/allegroai/clearml-helm-charts/issues) (If not, open a new one)
-* Check related discussions in the [ClearML slack community](https://join.slack.com/t/allegroai-trains/shared_invite/enQtOTQyMTI1MzQxMzE4LTY5NTUxOTY1NmQ1MzQ5MjRhMGRhZmM4ODE5NTNjMTg2NTBlZGQzZGVkMWU3ZDg1MGE1MjQxNDEzMWU2NmVjZmY) (Or start your own discussion on the `#clearml-dev` channel)
-* Make sure your code conforms to the ClearML coding standards by running:  
-  `flake8 --max-line-length=120 --statistics --show-source --extend-ignore=E501 ./clearml*`
+* Verify the work you plan to merge addresses an existing [issue](https://github.com/clearml/clearml-helm-charts/issues) (If not, open a new one)
+* Check related discussions in the [ClearML slack community](https://joinslack.clear.ml) (or start your own discussion on the `#clearml-dev` channel)
+* Check your branch with `helm lint`
+* Update `version` in `Chart.yaml` according [semver](https://semver.org/) rules
+* Substitute `annotations` section in `Chart.yaml` annotating implementations (useful for Artifecthub changelog)
+* Update chart README using [helm-docs](https://github.com/norwoodj/helm-docs)

 In your PR include:
+
 * A reference to the issue it addresses
 * A brief description of the approach you've taken for implementing
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -4,9 +4,9 @@

 * Set up a Kubernetes Cluster - for setting up Kubernetes on various platforms refer to the Kubernetes [getting started guide](http://kubernetes.io/docs/getting-started-guides/).
  * Set up a single-node LOCAL Kubernetes on laptop/desktop - for setting up Kubernetes on your laptop/desktop, we suggest [kind](https://kind.sigs.k8s.io).
-  * For **Kubernetes Tanzu users** - see [prerequisites](https://github.com/allegroai/clearml-helm-charts/tree/main/platform-specific-configs/tanzu) 
+  * For **Kubernetes Tanzu users** - see [prerequisites](https://github.com/clearml/clearml-helm-charts/tree/main/platform-specific-configs/tanzu) 
  for setting up ClearML on a Tanzu cluster 
-  * For **Kubernetes Openshift users** - see [prerequisites](https://github.com/allegroai/clearml-helm-charts/tree/main/platform-specific-configs/openshift) 
+  * For **Kubernetes Openshift users** - see [prerequisites](https://github.com/clearml/clearml-helm-charts/tree/main/platform-specific-configs/openshift) 
  for setting up ClearML on an Openshift cluster, 

 * Install Helm - Helm is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes 
@@ -17,13 +17,13 @@ resources. To install Helm, refer to the [Helm install guide](https://github.com
 ### Helm Repo

 ```bash
-$ helm repo add allegroai https://allegroai.github.io/clearml-helm-charts
+$ helm repo add clearml https://clearml.github.io/clearml-helm-charts
 $ helm repo update
 ```
 ### ClearML Server Ecosystem

 ```bash
-$ helm install clearml allegroai/clearml
+$ helm install clearml clearml/clearml
 ```

 ### ClearML Agent
@@ -43,5 +43,5 @@ In the Helm chart `install` command below:
 * Set `WEBSERVERURL` to the new credentials' `web_server` value

 ```bash
-$ helm install clearml-agent allegroai/clearml-agent --set clearml.agentk8sglueKey=ACCESSKEY --set clearml.agentk8sglueSecret=SECRETKEY --set agentk8sglue.apiServerUrlReference=APISERVERURL --set agentk8sglue.fileServerUrlReference=FILESERVERURL --set agentk8sglue.webServerUrlReference=WEBSERVERURL
+$ helm install clearml-agent clearml/clearml-agent --set clearml.agentk8sglueKey=ACCESSKEY --set clearml.agentk8sglueSecret=SECRETKEY --set agentk8sglue.apiServerUrlReference=APISERVERURL --set agentk8sglue.fileServerUrlReference=FILESERVERURL --set agentk8sglue.webServerUrlReference=WEBSERVERURL
 ```
--- a/README.md
+++ b/README.md
@@ -2,11 +2,11 @@

 ##  Auto-Magical Experiment Manager & Version Control for AI

-Helm charts provided by [Allegro AI](https://clear.ml), ready to launch on Kubernetes using [Kubernetes Helm](https://github.com/helm/helm).
+Helm charts provided by [ClearML](https://clear.ml), ready to launch on Kubernetes using [Kubernetes Helm](https://github.com/helm/helm).

 ## Introduction

-The **clearml-server** is the backend service infrastructure for [ClearML](https://github.com/allegroai/clearml).
+The **clearml-server** is the backend service infrastructure for [ClearML](https://github.com/clearml/clearml).
 It allows multiple users to collaborate and manage their experiments.
 By default, **ClearML** is set up to work with the **ClearML** demo server, which is open to anyone and resets periodically. 
 In order to host your own server, you will need to install **clearml-server** and point **ClearML** to it.
@@ -23,11 +23,11 @@ Use this repository to deploy **clearml-server** on Kubernetes clusters.

 ## Provided in this repository

-### [ClearML server chart](https://github.com/allegroai/clearml-helm-charts/tree/main/charts/clearml)
+### [ClearML server chart](https://github.com/clearml/clearml-helm-charts/tree/main/charts/clearml)

-### [ClearML agent chart](https://github.com/allegroai/clearml-helm-charts/tree/main/charts/clearml-agent)
+### [ClearML agent chart](https://github.com/clearml/clearml-helm-charts/tree/main/charts/clearml-agent)

-### [ClearML serving chart](https://github.com/allegroai/clearml-helm-charts/tree/main/charts/clearml-serving)
+### [ClearML serving chart](https://github.com/clearml/clearml-helm-charts/tree/main/charts/clearml-serving)

 ## Who We Are

@@ -46,21 +46,21 @@ Apache License, Version 2.0, (see the [LICENSE](https://www.apache.org/licenses/

 ## Installation Guide

-For installation instruction, follow related [Installation Guide](INSTALL.md).
+For installation instructions, follow related [Installation Guide](INSTALL.md).

 ## Documentation, Community & Support

 See more information in the [official documentation](https://clear.ml/docs/latest/docs) and [on YouTube](https://www.youtube.com/c/ClearML).

-If you have any questions, post on our [Slack Channel](https://join.slack.com/t/clearml/shared_invite/zt-c0t13pty-aVUZZW1TSSSg2vyIGVPBhg), or tag your questions on [stackoverflow](https://stackoverflow.com/questions/tagged/clearml) with '**[clearml](https://stackoverflow.com/questions/tagged/clearml)**' tag (*previously [trains](https://stackoverflow.com/questions/tagged/trains) tag*).
+If you have any questions, post on our [Slack Channel](https://joinslack.clear.ml), or tag your questions on [stackoverflow](https://stackoverflow.com/questions/tagged/clearml) with '**[clearml](https://stackoverflow.com/questions/tagged/clearml)**' tag (*previously [trains](https://stackoverflow.com/questions/tagged/trains) tag*).

-For feature requests or bug reports, please use [GitHub issues](https://github.com/allegroai/clearml-helm-charts/issues).
+For feature requests or bug reports, please use [GitHub Issues](https://github.com/clearml/clearml-helm-charts/issues).

 Additionally, you can always find us at *support@clear.ml*

 ## Contributing

-**PRs are always welcomed** :heart: See more details in the ClearML [Guidelines for Contributing](https://github.com/allegroai/clearml-helm-charts/blob/main/CONTRIBUTING.md).
+**PRs are always welcomed** :heart: See more details in the ClearML [Guidelines for Contributing](https://github.com/clearml/clearml-helm-charts/blob/main/CONTRIBUTING.md).


 _May the force (and the goddess of learning rates) be with you!_
--- 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: "4.0.2"
+version: "5.3.2"
 appVersion: "1.24"
-kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
+kubeVersion: ">= 1.21.0-0 < 1.33.0-0"
 home: https://clear.ml
-icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
+icon: https://raw.githubusercontent.com/clearml/clearml/master/docs/clearml-logo.svg
 sources:
-  - https://github.com/allegroai/clearml-helm-charts
-  - https://github.com/allegroai/clearml
+  - https://github.com/clearml/clearml-helm-charts
+  - https://github.com/clearml/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,7 +20,5 @@ keywords:
  - "task agent"
 annotations:
  artifacthub.io/changes: |
-    - kind: fixed
-      description: extra envs in base pod template
-    - kind: fixed
-      description: fullname usage
+    - kind: changed
+      description: "Support kubernetes 1.32"
--- a/charts/clearml-agent/README.md
+++ b/charts/clearml-agent/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Agent

-![Version: 4.0.2](https://img.shields.io/badge/Version-4.0.2-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.2](https://img.shields.io/badge/Version-5.3.2-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).
+The **clearml-agent** is the Kubernetes agent for for [ClearML](https://github.com/clearml/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 clearml https://clearml.github.io/clearml-helm-charts
+```
+
 # Upgrading Chart

 ## Upgrades/ Values upgrades
@@ -25,49 +33,35 @@ Updating to latest version of this chart can be done in two steps:

 ```
 helm repo update
-helm upgrade clearml-agent allegroai/clearml-agent
+helm upgrade clearml-agent clearml/clearml-agent
 ```

 Changing values on existing installation can be done with:

 ```
-helm upgrade clearml-agent allegroai/clearml-agent --version <CURRENT CHART VERSION> -f custom_values.yaml
+helm upgrade clearml-agent clearml/clearml-agent --version <CURRENT CHART VERSION> -f custom_values.yaml
 ```

-### Major upgrade from 5.* to 6.*
+### Major upgrade from 3.* to 4.*

 Before issuing helm upgrade:

 * if using securityContexts check for new value form in values.yaml (podSecurityContext and containerSecurityContext)

-## ENTERPRISE Version
-
-There are some specific Enterprise version features that can be enabled only with specific Enterprise licensed images.
-Enabling this features on OSS version can cause the entire installation to break.
-
-### Non root/privileged environments
-
-*This feature is available for Enterprise version only*
-
-In environments like Openshift or Tanzu it can be required to run non-root/non-privileged pods/containers.
-In this case it's recommended to use `values-enterprise-non-root-privileged.yaml` as base for override file.
-
-Keep in mind it's not possible to install packages on non-root containers so images used for Tasks must already have python, pip and git installed.
-
 ## Source Code

-* <https://github.com/allegroai/clearml-helm-charts>
-* <https://github.com/allegroai/clearml>
+* <https://github.com/clearml/clearml-helm-charts>
+* <https://github.com/clearml/clearml>

 ## Requirements

-Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.33.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,"containerCustomBashScript":"","containerSecurityContext":{},"customBashScript":"","debugMode":false,"defaultContainerImage":"ubuntu:18.04","extraEnvs":[],"fileMounts":[],"fileServerUrlReference":"https://files.clear.ml","image":{"registry":"","repository":"allegroai/clearml-agent-k8s-base","tag":"1.24-21"},"labels":{},"nodeSelector":{},"podSecurityContext":{},"queue":"default","replicaCount":1,"serviceExistingAccountName":"","taskAsJob":false,"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/clearml/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) |
@@ -91,22 +85,23 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | agentk8sglue.basePodTemplate.volumeMounts | list | `[]` | volume mounts definition for pods spawned to consume ClearML Task (example in values.yaml comments) |
 | agentk8sglue.basePodTemplate.volumes | list | `[]` | volumes definition for pods spawned to consume ClearML Task (example in values.yaml comments) |
 | agentk8sglue.clearmlcheckCertificate | bool | `true` | Check certificates validity for evefry UrlReference below. |
-| agentk8sglue.containerCustomBashScript | string | `""` | Custom Bash script for the Task Pods ran by Glue Agent |
 | agentk8sglue.containerSecurityContext | object | `{}` | container securityContext setup for Agent pod (example in values.yaml comments) |
-| agentk8sglue.customBashScript | string | `""` | Custom Bash script for the Agent pod ran by Glue Agent |
-| agentk8sglue.debugMode | bool | `false` | Enable Debugging logs for Agent pod |
+| agentk8sglue.createQueueIfNotExists | bool | `false` | if ClearML queue does not exist, it will be create it if the value is set to true |
 | agentk8sglue.defaultContainerImage | string | `"ubuntu:18.04"` | default container image for ClearML Task pod |
 | agentk8sglue.extraEnvs | list | `[]` | Extra Environment variables for Glue Agent |
 | agentk8sglue.fileMounts | list | `[]` | file definition for Glue Agent (example in values.yaml comments) |
 | agentk8sglue.fileServerUrlReference | string | `"https://files.clear.ml"` | Reference to File server url |
 | agentk8sglue.image | object | `{"registry":"","repository":"allegroai/clearml-agent-k8s-base","tag":"1.24-21"}` | Glue Agent image configuration |
+| agentk8sglue.initContainers | object | `{"resources":{}}` | Glue Agent pod initContainers configs |
+| agentk8sglue.initContainers.resources | object | `{}` | Glue Agent initcontainers pod resources |
 | agentk8sglue.labels | object | `{}` | labels setup for Agent pod (example in values.yaml comments) |
 | agentk8sglue.nodeSelector | object | `{}` | nodeSelector setup for Agent pod (example in values.yaml comments) |
 | agentk8sglue.podSecurityContext | object | `{}` | container securityContext setup for Agent pod (example in values.yaml comments) |
-| agentk8sglue.queue | string | `"default"` | ClearML queue this agent will consume |
+| 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.serviceExistingAccountName | string | `""` | if set, don't create a serviceAccountName but use defined existing one |
-| agentk8sglue.taskAsJob | bool | `false` | ClearML spawn tasks as jobs instead of pods |
+| agentk8sglue.resources | object | `{}` | Glue Agent pod resources |
+| 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) |
@@ -117,19 +112,6 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | clearml.clearmlConfig | string | `"sdk {\n}"` | ClearML configuration file |
 | clearml.existingAgentk8sglueSecret | string | `""` | If this is set, chart will not generate a secret but will use what is defined here |
 | clearml.existingClearmlConfigSecret | string | `""` | If this is set, chart will not generate a secret but will use what is defined here |
-| enterpriseFeatures | object | `{"agentImageTagOverride":"1.24-58","applyVaultEnvVars":true,"createQueues":false,"enabled":false,"maxPods":10,"monitoredResources":{"maxResources":0,"maxResourcesFieldName":"resources|limits|nvidia.com/gpu","minResourcesFieldName":"resources|limits|nvidia.com/gpu"},"queues":null,"serviceAccountClusterAccess":false,"useOwnerToken":true}` | Enterprise features (work only with an Enterprise license) |
-| enterpriseFeatures.agentImageTagOverride | string | `"1.24-58"` | Image tag override for enterprise version |
-| enterpriseFeatures.applyVaultEnvVars | bool | `true` | push env vars from Clear.ML Vault to task pods |
-| enterpriseFeatures.createQueues | bool | `false` | Create queues if they don't exist |
-| enterpriseFeatures.enabled | bool | `false` | Enable/Disable Enterprise features |
-| enterpriseFeatures.maxPods | int | `10` | maximum concurrent consume ClearML Task pod |
-| enterpriseFeatures.monitoredResources | object | `{"maxResources":0,"maxResourcesFieldName":"resources|limits|nvidia.com/gpu","minResourcesFieldName":"resources|limits|nvidia.com/gpu"}` | GPU resource general counters |
-| enterpriseFeatures.monitoredResources.maxResources | int | `0` | Maximum resources counter |
-| enterpriseFeatures.monitoredResources.maxResourcesFieldName | string | `"resources|limits|nvidia.com/gpu"` | Field name used by Agent to count maximum resources |
-| enterpriseFeatures.monitoredResources.minResourcesFieldName | string | `"resources|limits|nvidia.com/gpu"` | Field name used by Agent to count minimum resources |
-| enterpriseFeatures.queues | string | `nil` | ClearML queues and related template OVERRIDES used this agent will consume |
-| enterpriseFeatures.serviceAccountClusterAccess | bool | `false` | service account access every namespace flag |
-| enterpriseFeatures.useOwnerToken | bool | `true` | Agent must use owner Token |
 | global | object | `{"imageRegistry":"docker.io"}` | Global parameters section |
 | global.imageRegistry | string | `"docker.io"` | Images registry |
 | imageCredentials | object | `{"email":"someone@host.com","enabled":false,"existingSecret":"","password":"pwd","registry":"docker.io","username":"someone"}` | Private image registry configuration |
@@ -139,12 +121,10 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | imageCredentials.password | string | `"pwd"` | Registry password |
 | imageCredentials.registry | string | `"docker.io"` | Registry name |
 | imageCredentials.username | string | `"someone"` | Registry username |
-| sessions | object | `{"dynamicSvcs":false,"externalIP":"0.0.0.0","maxServices":20,"portModeEnabled":false,"setInteractiveQueuesTag":true,"startingPort":30000,"svcAnnotations":{},"svcType":"NodePort"}` | Sessions internal service configuration |
-| sessions.dynamicSvcs | bool | `false` | Enable/Disable dynamic svc for sessions pods |
+| sessions | object | `{"externalIP":"0.0.0.0","maxServices":20,"portModeEnabled":false,"startingPort":30000,"svcAnnotations":{},"svcType":"NodePort"}` | Sessions internal service configuration |
 | sessions.externalIP | string | `"0.0.0.0"` | External IP sessions clients can connect to |
 | sessions.maxServices | int | `20` | maximum number of NodePorts exposed |
 | sessions.portModeEnabled | bool | `false` | Enable/Disable sessions portmode WARNING: only one Agent deployment can have this set to true |
-| sessions.setInteractiveQueuesTag | bool | `true` | set interactive queue tags |
 | sessions.startingPort | int | `30000` | starting range of exposed NodePorts |
 | sessions.svcAnnotations | object | `{}` | specific annotations for session services |
 | sessions.svcType | string | `"NodePort"` | service type ("NodePort" or "ClusterIP" or "LoadBalancer") |
--- a/charts/clearml-agent/README.md.gotmpl
+++ b/charts/clearml-agent/README.md.gotmpl
@@ -11,9 +11,17 @@

 ## Introduction

-The **clearml-agent** is the Kubernetes agent for for [ClearML](https://github.com/allegroai/clearml).
+The **clearml-agent** is the Kubernetes agent for for [ClearML](https://github.com/clearml/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 clearml https://clearml.github.io/clearml-helm-charts
+```
+
 # Upgrading Chart

 ## Upgrades/ Values upgrades
@@ -22,35 +30,21 @@ Updating to latest version of this chart can be done in two steps:

 ```
 helm repo update
-helm upgrade clearml-agent allegroai/clearml-agent
+helm upgrade clearml-agent clearml/clearml-agent
 ```

 Changing values on existing installation can be done with:

 ```
-helm upgrade clearml-agent allegroai/clearml-agent --version <CURRENT CHART VERSION> -f custom_values.yaml
+helm upgrade clearml-agent clearml/clearml-agent --version <CURRENT CHART VERSION> -f custom_values.yaml
 ```

-### Major upgrade from 5.* to 6.*
+### Major upgrade from 3.* to 4.*

 Before issuing helm upgrade:

 * if using securityContexts check for new value form in values.yaml (podSecurityContext and containerSecurityContext)

-## ENTERPRISE Version
-
-There are some specific Enterprise version features that can be enabled only with specific Enterprise licensed images. 
-Enabling this features on OSS version can cause the entire installation to break.
-
-### Non root/privileged environments
-
-*This feature is available for Enterprise version only*
-
-In environments like Openshift or Tanzu it can be required to run non-root/non-privileged pods/containers.
-In this case it's recommended to use `values-enterprise-non-root-privileged.yaml` as base for override file.
-
-Keep in mind it's not possible to install packages on non-root containers so images used for Tasks must already have python, pip and git installed.
-
 {{ template "chart.sourcesSection" . }}

 {{ template "chart.requirementsSection" . }}
--- a/charts/clearml-agent/templates/_helpers.tpl
+++ b/charts/clearml-agent/templates/_helpers.tpl
@@ -45,6 +45,21 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 {{- end }}

+{{/*
+Common labels (agentk8sglue)
+*/}}
+{{- define "agentk8sglue.labels" -}}
+helm.sh/chart: {{ include "clearmlAgent.chart" . }}
+{{ include "agentk8sglue.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if $.Values.agentk8sglue.labels }}
+{{ toYaml $.Values.agentk8sglue.labels }}
+{{- end }}
+{{- end }}
+
 {{/*
 Common annotations
 */}}
@@ -105,160 +120,3 @@ Create secret to access docker registry
 {{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" .registry .username .password .email (printf "%s:%s" .username .password | b64enc) | b64enc }}
 {{- end }}
 {{- end }}
-
-{{/*
-Create a queues parameter
-*/}}
-{{- define "agentk8sglue.createQueues" -}}
-{{- if .Values.enterpriseFeatures.createQueues }}
-{{- printf "%d" 1}}
-{{- else }}
-{{- printf "%d" 0 }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create a string composed by queue names
-*/}}
-{{- define "agentk8sglue.queues" -}}
-{{- $list := list }}
-{{- range $key, $value := .Values.enterpriseFeatures.queues }}
-{{- $list = append $list (printf "%s" $key) }}
-{{- end }}
-{{- join " " $list }}
-{{- end }}
-
-{{/*
-Create a task container template
-*/}}
-{{- define "taskContainer.containerTemplate" -}}
-{{- if .main.Values.imageCredentials.enabled }}
-imagePullSecrets:
-  - name: {{ .main.Values.imageCredentials.existingSecret | default (printf "%s-ark" (include "clearmlAgent.fullname" .main )) }}
-{{- end }}
-schedulerName: {{ .value.templateOverrides.schedulerName | default (.main.Values.agentk8sglue.basePodTemplate.schedulerName) }}
-restartPolicy: Never
-securityContext:
-  {{- .value.templateOverrides.podSecurityContext | default .main.Values.agentk8sglue.basePodTemplate.podSecurityContext | toYaml | nindent 2 }}
-hostAliases:
-  {{- .value.templateOverrides.hostAliases | default .main.Values.agentk8sglue.basePodTemplate.hostAliases | toYaml | nindent 2 }}
-volumes:
-  {{ $computedvolumes := (.value.templateOverrides.volumes | default .main.Values.agentk8sglue.basePodTemplate.volumes) }}
-  {{- if $computedvolumes }}{{- $computedvolumes | toYaml | nindent 2 }}{{- end }}
-  {{- if .value.templateOverrides.fileMounts }}
-  - name: filemounts
-    secret:
-      secretName: {{ include "clearmlAgent.fullname" .main }}-{{ .key }}-fm
-  {{- else if .main.Values.agentk8sglue.basePodTemplate.fileMounts }}
-  - name: filemounts
-    secret:
-      secretName: {{ include "clearmlAgent.fullname" .main }}-fm
-  {{- end }}
-{{- if not .main.Values.enterpriseFeatures.serviceAccountClusterAccess }}
-serviceAccountName: {{ include "clearmlAgent.serviceAccountName" .main }}
-{{- end }}
-initContainers:
-  {{- .value.templateOverrides.initContainers | default .main.Values.agentk8sglue.basePodTemplate.initContainers | toYaml | nindent 2 }}
-priorityClassName: {{ .value.templateOverrides.priorityClassName | default .main.Values.agentk8sglue.basePodTemplate.priorityClassName }}
-containers:
- resources:
-    {{- .value.templateOverrides.resources | default .main.Values.agentk8sglue.basePodTemplate.resources | toYaml | nindent 4 }}
-  securityContext:
-    {{- .value.templateOverrides.containerSecurityContext | default .main.Values.agentk8sglue.basePodTemplate.containerSecurityContext | toYaml | nindent 4 }}
-  ports:
-    - containerPort: 10022
-  volumeMounts:
-    {{ $computedvolumemounts := (.value.templateOverrides.volumeMounts | default .main.Values.agentk8sglue.basePodTemplate.volumeMounts) }}
-    {{- if $computedvolumemounts }}{{- $computedvolumemounts | toYaml | nindent 4 }}{{- end }}
-    {{- if .value.templateOverrides.fileMounts }}
-    {{- range .value.templateOverrides.fileMounts }}
-    - name: filemounts
-      mountPath: "{{ .folderPath }}/{{ .name }}"
-      subPath: "{{ .name }}"
-      readOnly: true
-    {{- end }}
-    {{- else if .main.Values.agentk8sglue.basePodTemplate.fileMounts }}
-    {{- range .main.Values.agentk8sglue.basePodTemplate.fileMounts }}
-    - name: filemounts
-      mountPath: "{{ .folderPath }}/{{ .name }}"
-      subPath: "{{ .name }}"
-      readOnly: true
-    {{- end }}
-    {{- end }}
-  env:
-    - name: CLEARML_API_HOST
-      value: {{ .main.Values.agentk8sglue.apiServerUrlReference }}
-    - name: CLEARML_WEB_HOST
-      value: {{ .main.Values.agentk8sglue.webServerUrlReference }}
-    - name: CLEARML_FILES_HOST
-      value: {{ .main.Values.agentk8sglue.fileServerUrlReference }}
-    {{- if not .main.Values.enterpriseFeatures.useOwnerToken }}
-    - name: CLEARML_API_ACCESS_KEY
-      valueFrom:
-        secretKeyRef:
-          name: {{ .main.Values.clearml.existingAgentk8sglueSecret | default (printf "%s-ac" (include "clearmlAgent.fullname" .main )) }}
-          key: agentk8sglue_key
-    - name: CLEARML_API_SECRET_KEY
-      valueFrom:
-        secretKeyRef:
-          name: {{ .main.Values.clearml.existingAgentk8sglueSecret | default (printf "%s-ac" (include "clearmlAgent.fullname" .main )) }}
-          key: agentk8sglue_secret
-    {{- end }}
-    - name: PYTHONUNBUFFERED
-      value: "x"
-    {{- if not .main.Values.agentk8sglue.clearmlcheckCertificate }}
-    - name: CLEARML_API_HOST_VERIFY_CERT
-      value: "false"
-    {{- end }}
-    {{- $computedenvs := (.value.templateOverrides.env | default .main.Values.agentk8sglue.basePodTemplate.env) -}}
-    {{- if $computedenvs }}{{- $computedenvs | toYaml | nindent 4 }}{{- end }}
-nodeSelector:
-  {{ .value.templateOverrides.nodeSelector | default .main.Values.agentk8sglue.basePodTemplate.nodeSelector | toYaml | nindent 2 }}
-tolerations:
-  {{ .value.templateOverrides.tolerations | default .main.Values.agentk8sglue.basePodTemplate.tolerations | toYaml | nindent 2 }}
-affinity:
-  {{ .value.templateOverrides.affinity | default .main.Values.agentk8sglue.basePodTemplate.affinity | toYaml | nindent 2 }}
-{{- end }}
-
-{{/*
-Create a task container template
-*/}}
-{{- define "taskContainer.podTemplate" -}}
-{{- range $key, $value := $.Values.enterpriseFeatures.queues }}
-{{ $key }}:
-  apiVersion: v1
-  kind: Pod
-  metadata:
-    namespace: {{ $.Release.Namespace }}
-    labels:
-      {{ $value.templateOverrides.labels | default $.Values.agentk8sglue.basePodTemplate.labels | toYaml }}
-    annotations:
-      {{ $value.templateOverrides.annotations | default $.Values.agentk8sglue.basePodTemplate.annotations | toYaml }}
-  spec:
-    {{- $data := dict "main" $ "key" $key "value" $value -}}
-    {{- include "taskContainer.containerTemplate" $data | nindent 4}}
-{{- end }}
-{{- end }}
-
-{{/*
-Create a task container template
-*/}}
-{{- define "taskContainer.jobTemplate" -}}
-{{- range $key, $value := $.Values.enterpriseFeatures.queues }}
-{{ $key }}:
-  apiVersion: batch/v1
-  kind: Job
-  metadata:
-    namespace: {{ $.Release.Namespace }}
-    labels:
-      {{ $value.templateOverrides.labels | default $.Values.agentk8sglue.basePodTemplate.labels | toYaml }}
-    annotations:
-      {{ $value.templateOverrides.annotations | default $.Values.agentk8sglue.basePodTemplate.annotations | toYaml }}
-  spec:
-    template:
-      spec:
-        {{- $data := dict "main" $ "key" $key "value" $value -}}
-        {{- include "taskContainer.containerTemplate" $data | nindent 8 }}
-    backoffLimit: 0
-{{- end }}
-{{- end }}
--- a/charts/clearml-agent/templates/agentk8sglue-configmap.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-configmap.yaml
@@ -3,23 +3,6 @@ kind: ConfigMap
 metadata:
  name: {{ include "clearmlAgent.fullname" . }}-pt
 data:
-{{- if .Values.enterpriseFeatures.enabled }}
-  template.yaml: |
-    {{- if .Values.agentk8sglue.taskAsJob }}
-    {{ include "taskContainer.jobTemplate" . | nindent 4}}
-    {{- else }}
-    {{ include "taskContainer.podTemplate" . | nindent 4}}
-    {{- end }}
-  secrets.yaml: |
-    {{- range $key, $value := $.Values.enterpriseFeatures.queues }}
-    {{ $key }}:
-      {{- if $value.templateOverrides.fileMounts }}
-        - {{ include "clearmlAgent.fullname" $ }}-{{ $key }}-fm
-      {{- else if $.Values.agentk8sglue.basePodTemplate.fileMounts }}
-        - {{ include "clearmlAgent.fullname" $ }}-fm
-      {{- end }}
-    {{- end }}
-{{- else }}
  template.yaml: |
    apiVersion: v1
    metadata:
@@ -34,7 +17,7 @@ data:
      {{- if .Values.imageCredentials.existingSecret }}
      - name: {{ .Values.imageCredentials.existingSecret }}
      {{- else }}
-      - name: name: {{ include "clearmlAgent.fullname" $ }}-ark
+      - name: {{ include "clearmlAgent.fullname" $ }}-ark
      {{- end }}
      {{- end }}
      {{- with .Values.agentk8sglue.basePodTemplate.volumes }}
@@ -45,6 +28,8 @@ data:
      securityContext:
        {{ toYaml .Values.agentk8sglue.basePodTemplate.podSecurityContext | nindent 8 }}
      priorityClassName: {{ .Values.agentk8sglue.basePodTemplate.priorityClassName }}
+      initContainers:
+        {{- toYaml .Values.agentk8sglue.basePodTemplate.initContainers | nindent 8 }}
      containers:
      - resources:
          {{- toYaml .Values.agentk8sglue.basePodTemplate.resources | nindent 10 }}
@@ -96,7 +81,6 @@ data:
      affinity:
          {{- toYaml . | nindent 8 }}
        {{- end }}
-{{- end }}
 {{- if .Values.sessions.portModeEnabled }}
 {{- range untilStep 1 ( ( add .Values.sessions.maxServices 1 ) | int ) 1 }}
  services-{{ . }}.yaml: |
--- a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
  name: {{ include "clearmlAgent.fullname" . }}
  labels:
-    {{- include "clearmlAgent.labels" . | nindent 4 }}
+    {{- include "agentk8sglue.labels" . | nindent 4 }}
  annotations:
    {{- include "clearmlAgent.annotations" . | nindent 4 }}
 spec:
@@ -17,7 +17,7 @@ spec:
        checksum/config: {{ printf "%s" .Values | sha256sum }}
        {{- include "clearmlAgent.annotations" . | nindent 8 }}
      labels:
-        {{- include "clearmlAgent.labels" . | nindent 8 }}
+        {{- include "agentk8sglue.labels" . | nindent 8 }}
    spec:
      {{- if .Values.imageCredentials.enabled }}
      imagePullSecrets:
@@ -32,11 +32,7 @@ spec:
        {{ toYaml .Values.agentk8sglue.podSecurityContext | nindent 8 }}
      initContainers:
        - name: init-k8s-glue
-          {{- if .Values.enterpriseFeatures.enabled }}
-          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.agentk8sglue.image.registry) }}{{ .Values.agentk8sglue.image.repository }}:{{ .Values.enterpriseFeatures.agentImageTagOverride }}"
-          {{- else }}
          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.agentk8sglue.image.registry) }}{{ .Values.agentk8sglue.image.repository }}:{{ .Values.agentk8sglue.image.tag }}"
-          {{- end }}
          command:
            - /bin/sh
            - -c
@@ -56,13 +52,11 @@ spec:
              done
          securityContext:
            {{ toYaml .Values.agentk8sglue.containerSecurityContext | nindent 12 }}
+          resources:
+            {{- toYaml .Values.agentk8sglue.initContainers.resources | nindent 12 }}
      containers:
        - name: k8s-glue
-          {{- if .Values.enterpriseFeatures.enabled }}
-          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.agentk8sglue.image.registry) }}{{ .Values.agentk8sglue.image.repository }}:{{ .Values.enterpriseFeatures.agentImageTagOverride }}"
-          {{- else }}
          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.agentk8sglue.image.registry) }}{{ .Values.agentk8sglue.image.repository }}:{{ .Values.agentk8sglue.image.tag }}"
-          {{- end }}
          imagePullPolicy: IfNotPresent
          command:
            - /bin/bash
@@ -73,14 +67,14 @@ spec:
          volumeMounts:
            - name: {{ include "clearmlAgent.fullname" . }}-pt
              mountPath: /root/template
-            {{ if .Values.clearml.clearmlConfig }}
+            {{ if or (.Values.clearml.clearmlConfig) (.Values.clearml.existingClearmlConfigSecret) }}
            - name: k8sagent-clearml-conf-volume
              mountPath: /root/clearml.conf
              subPath: clearml.conf
              readOnly: true
            {{- end }}
            {{- if .Values.agentk8sglue.volumeMounts }}
-            {{- toYaml .Values.agentk8sglue.volumeMounts | nindent 10 }}
+            {{- toYaml .Values.agentk8sglue.volumeMounts | nindent 12 }}
            {{- end }}
            {{- range .Values.agentk8sglue.fileMounts }}
            - name: filemounts
@@ -104,37 +98,38 @@ spec:
              value: "--namespace {{ .Release.Namespace }} --template-yaml /root/template/template.yaml \
                      --ports-mode --num-of-services {{ .Values.sessions.maxServices }} \
                      --base-port {{ .Values.sessions.startingPort }} \
-                      --gateway-address {{ .Values.sessions.externalIP }}{{ if .Values.enterpriseFeatures.enabled }}{{ if .Values.enterpriseFeatures.useOwnerToken }} --use-owner-token{{ end }}{{ end }}"
-            {{- if .Values.sessions.dynamicSvcs }}
-            - name: CLEARML_K8S_GLUE_POD_POST_APPLY_CMD
-              value: "kubectl -n {namespace} apply -f ~/template/services-{pod_number}.yaml ; kubectl -n {namespace} label svc clearml-session-{pod_number} service-for={pod_name}"
-            - name: CLEARML_K8S_GLUE_POD_POST_DELETE_CMD
-              value: "kubectl -n {namespace} delete svc -l service-for={pod_name}"
-            {{- end }}
+                      --gateway-address {{ .Values.sessions.externalIP }} \
+                      {{- if .Values.agentk8sglue.createQueueIfNotExists }} --create-queue{{- end }}
+                     "
            {{- else}}
            - name: K8S_GLUE_EXTRA_ARGS
              value: "--namespace {{ .Release.Namespace }} --template-yaml /root/template/template.yaml \
-                      --max-pods {{.Values.enterpriseFeatures.maxPods}}{{ if .Values.enterpriseFeatures.enabled }}{{ if .Values.enterpriseFeatures.useOwnerToken }} --use-owner-token{{ end }}{{ end }}"
+                      {{- if .Values.agentk8sglue.createQueueIfNotExists }} --create-queue{{- end }}
+                     "
            {{- end }}
-            {{- if .Values.clearml.clearmlConfig }}
+            {{ if or (.Values.clearml.clearmlConfig) (.Values.clearml.existingClearmlConfigSecret) }}
            - name: CLEARML_CONFIG_FILE
              value: /root/clearml.conf
            {{- end }}
-            - name: CLEARML_K8S_GLUE_LIMIT_POD_LABEL
-              value: "ai.allegro.agent.serial=pod-{pod_number}"
-            - name: CLEARML_K8S_SECRETS_LIST_FILE
-              value: /root/template/secrets.yaml
            - name: K8S_DEFAULT_NAMESPACE
              value: "{{ .Release.Namespace }}"
            - name: CLEARML_API_ACCESS_KEY
              valueFrom:
                secretKeyRef:
+                  {{- if .Values.clearml.existingAgentk8sglueSecret }}
+                  name: {{ .Values.clearml.existingAgentk8sglueSecret }}
+                  {{- else }}
                  name: {{ include "clearmlAgent.fullname" . }}-ac
+                  {{- end }}
                  key: agentk8sglue_key
            - name: CLEARML_API_SECRET_KEY
              valueFrom:
                secretKeyRef:
+                  {{- if .Values.clearml.existingAgentk8sglueSecret }}
+                  name: {{ .Values.clearml.existingAgentk8sglueSecret }}
+                  {{- else }}
                  name: {{ include "clearmlAgent.fullname" . }}-ac
+                  {{- end }}
                  key: agentk8sglue_secret
            - name: CLEARML_WORKER_ID
              value: {{ include "clearmlAgent.fullname" . }}
@@ -144,70 +139,39 @@ spec:
              value: "" 
            - name: CLEARML_DOCKER_IMAGE
              value: "{{.Values.agentk8sglue.defaultContainerImage}}"
-            {{- if .Values.agentk8sglue.customBashScript }}
-            - name: CLEARML_K8S_GLUE_EXTRA_BASH_SCRIPT
-              value: "{{.Values.agentk8sglue.customBashScript}}"
-            {{- end }}
-            {{- if .Values.agentk8sglue.containerCustomBashScript }}
-            - name: CLEARML_K8S_GLUE_POD_BASH_SCRIPT
-              value: "{{.Values.agentk8sglue.containerCustomBashScript}}"
-            {{- end }}
-            {{- if .Values.agentk8sglue.debugMode }}
-            - name: "CLEARML_K8S_GLUE_DEBUG"
-              value: "1"
-            {{- end }}
-            {{- if  .Values.sessions.portModeEnabled }}
-            {{- if  .Values.sessions.setInteractiveQueuesTag }}
-            - name: "CLEARML_K8S_GLUE_SET_QUEUE_SYSTEM_TAGS"
-              value: "interactive"
-            {{- end }}
-            {{- end }}
-            {{- if .Values.agentk8sglue.taskAsJob }}
-            - name: "CLEARML_K8S_GLUE_KIND"
-              value: "job"
-            {{- else }}
-            - name: "CLEARML_K8S_GLUE_KIND"
-              value: "pod"
-            {{- end }}
-            {{- if .Values.enterpriseFeatures.enabled }}
-            - name: K8S_GLUE_QUEUE
-              value: {{ include "agentk8sglue.queues" . | quote }}
-            - name: CLEARML_K8S_GLUE_CREATE_QUEUE
-              value: {{ include "agentk8sglue.createQueues" . | quote }}
-            - name: CLEARML_K8S_GLUE_APPLY_VAULT_ENV_VARS
-              value: {{ .Values.enterpriseFeatures.applyVaultEnvVars | quote }}
-            - name: "CLEARML_K8S_GLUE_POD_MIN_RES_FIELD"
-              value: {{ .Values.enterpriseFeatures.monitoredResources.minResourcesFieldName }}
-            - name: "CLEARML_K8S_GLUE_MAX_RESOURCES"
-              value: "{{.Values.enterpriseFeatures.monitoredResources.maxResources}}"
-            - name: "CLEARML_K8S_GLUE_POD_MAX_RES_FIELD"
-              value: {{ .Values.enterpriseFeatures.monitoredResources.maxResourcesFieldName }}
-            {{- else }}
            - name: K8S_GLUE_QUEUE
              value: {{ .Values.agentk8sglue.queue }}
-            {{- end }}
            {{- if .Values.agentk8sglue.extraEnvs }}
            {{ toYaml .Values.agentk8sglue.extraEnvs | nindent 12 }}
            {{- end }}
-          {{- with .Values.agentk8sglue.nodeSelector}}
-          nodeSelector:
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-          {{- with .Values.agentk8sglue.affinity }}
-          affinity:
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
-          {{- with .Values.agentk8sglue.tolerations }}
-          tolerations:
-            {{- toYaml . | nindent 8 }}
-          {{- end }}
          securityContext:
            {{ toYaml .Values.agentk8sglue.containerSecurityContext | nindent 12 }}
+          resources:
+            {{- toYaml .Values.agentk8sglue.resources | nindent 12 }}
+      {{- with .Values.agentk8sglue.nodeSelector}}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.agentk8sglue.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.agentk8sglue.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      volumes:
        - name: {{ include "clearmlAgent.fullname" . }}-pt
          configMap:
            name: {{ include "clearmlAgent.fullname" . }}-pt
-        {{ if .Values.clearml.clearmlConfig }}
+        {{ if .Values.clearml.existingClearmlConfigSecret }}
+        - name: k8sagent-clearml-conf-volume
+          secret:
+            secretName: {{ .Values.clearml.existingClearmlConfigSecret }}
+            items:
+            - key: clearml.conf
+              path: clearml.conf
+        {{ else if .Values.clearml.clearmlConfig }}
        - name: k8sagent-clearml-conf-volume
          secret:
            secretName: {{ include "clearmlAgent.fullname" . }}-ac
--- a/charts/clearml-agent/templates/agentk8sglue-rbac.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-rbac.yaml
@@ -4,48 +4,11 @@ kind: ServiceAccount
 metadata:
  name: {{ include "clearmlAgent.serviceAccountName" . }}
  namespace: {{ .Release.Namespace }}
+  {{- if .Values.agentk8sglue.serviceAccountAnnotations }}
+  annotations:
+    {{- toYaml .Values.agentk8sglue.serviceAccountAnnotations | nindent 4 }}
+  {{- end }}
 {{- end }}
-{{- if .Values.enterpriseFeatures.serviceAccountClusterAccess }}
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: {{ include "clearmlAgent.fullname" . }}-kpa
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - secrets
-      - services
-    verbs: ["get", "list", "watch", "create", "patch", "delete"]
-  - apiGroups:
-      - ""
-    resources:
-      - namespaces
-    verbs: ["list"]
-  {{- if .Values.agentk8sglue.taskAsJob }}
-  - apiGroups:
-      - batch
-      - extensions
-    resources:
-      - jobs
-    verbs: ["get", "list", "watch", "create", "patch", "delete"]
-  {{- end }} 
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "clearmlAgent.fullname" . }}-kpa
-subjects:
-  - kind: ServiceAccount
-    name: {{ include "clearmlAgent.serviceAccountName" . }}
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ include "clearmlAgent.fullname" . }}-kpa
-{{- else }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -58,6 +21,7 @@ rules:
      - pods
      - secrets
      - services
+      - events
    verbs: ["get", "list", "watch", "create", "patch", "delete"]
  - apiGroups:
      - ""
@@ -85,7 +49,6 @@ roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
  name: {{ include "clearmlAgent.fullname" . }}-kpa
-{{- end }}
 {{- range .Values.agentk8sglue.additionalClusterRoleBindings }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
--- a/charts/clearml-agent/templates/clearml-secrets.yaml
+++ b/charts/clearml-agent/templates/clearml-secrets.yaml
@@ -1,3 +1,4 @@
+{{- if or (not .Values.clearml.existingAgentk8sglueSecret) (not .Values.clearml.existingClearmlConfigSecret) }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -6,6 +7,7 @@ data:
  agentk8sglue_key: {{ .Values.clearml.agentk8sglueKey | b64enc }}
  agentk8sglue_secret: {{ .Values.clearml.agentk8sglueSecret | b64enc }}
  clearml.conf: {{ .Values.clearml.clearmlConfig | b64enc }}
+{{- end }}
 ---
 {{- if .Values.imageCredentials.enabled }}
 {{- if not .Values.imageCredentials.existingSecret }}
--- a/charts/clearml-agent/templates/service-secret.yaml
+++ b/charts/clearml-agent/templates/service-secret.yaml
@@ -8,30 +8,3 @@ data:
  {{ .name }}: {{ .fileContent | b64enc }}
  {{- end }}
 {{ end }}
---
-{{- if .Values.enterpriseFeatures.enabled }}
-{{ if .Values.agentk8sglue.basePodTemplate.fileMounts }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "clearmlAgent.fullname" . }}-fm
-data:
-  {{- range .Values.agentk8sglue.basePodTemplate.fileMounts }}
-  {{ .name }}: {{ .fileContent | b64enc }}
-  {{- end }}
-{{ end }}
---
-{{- range $key, $value := $.Values.agentk8sglue.queues }}
-{{ if .templateOverrides.fileMounts }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "clearmlAgent.fullname" $ }}-{{ $key }}-fm
-data:
-  {{- range .templateOverrides.fileMounts }}
-  {{ .name }}: {{ .fileContent | b64enc }}
-  {{- end }}
-{{ end }}
---
-{{- end }}
-{{- end }}
--- a/charts/clearml-agent/templates/service-sessions.yaml
+++ b/charts/clearml-agent/templates/service-sessions.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.sessions.portModeEnabled }}
-{{- if not .Values.sessions.dynamicSvcs }}
 {{- range untilStep 1 ( ( add .Values.sessions.maxServices 1 ) | int ) 1 }}
 ---
 apiVersion: v1
@@ -29,4 +28,3 @@ spec:
    ai.allegro.agent.serial: pod-{{ . }}
 {{- end }}
 {{- end }}
-{{- end }}
--- a/charts/clearml-agent/values-enterprise-non-root-privileged.yaml
+++ b/charts/clearml-agent/values-enterprise-non-root-privileged.yaml
@@ -1,38 +0,0 @@
-# These values are for ENTERPRISE version only and they need to be adapted to specific infrastructure needs
-# containerSecurityContext is highly related to Kubernetes distribution used/configuration and will probably
-# need to be customized accordingly
-
-agentk8sglue:
-  defaultContainerImage: "python:3.9"
-  containerSecurityContext:
-    runAsUser: 1000
-    runAsNonRoot: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    seccompProfile:
-      type: RuntimeDefault
-  containerCustomBashScript: |
-    export HOME=/tmp ;
-    export LOCAL_PYTHON=python3 ; 
-    $LOCAL_PYTHON -m pip install clearml-agent{agent_install_args} ; 
-    $LOCAL_PYTHON -m clearml_agent execute {default_execution_agent_args} --id {task_id}
-  extraEnvs:
-    - name: CLEARML_K8S_GLUE_START_AGENT_SCRIPT_PATH
-      value: /tmp/__start_agent__.sh
-
-  basePodTemplate:
-    env:
-      - name: HOME
-        value: /tmp
-    containerSecurityContext:
-      runAsUser: 1000
-      runAsNonRoot: true
-      allowPrivilegeEscalation: false
-      capabilities:
-        drop: ["ALL"]
-      seccompProfile:
-        type: RuntimeDefault
-
-enterpriseFeatures:
-  enabled: true
--- a/charts/clearml-agent/values.yaml
+++ b/charts/clearml-agent/values.yaml
@@ -29,6 +29,16 @@ clearml:

  # -- If this is set, chart will not generate a secret but will use what is defined here
  existingClearmlConfigSecret: ""
+  # The secret should be defined as the following example
+  #
+  # apiVersion: v1
+  # kind: Secret
+  # metadata:
+  #   name: secret-name
+  # stringData:
+  #   clearml.conf: |-
+  #     sdk {
+  #     }
  # -- ClearML configuration file
  clearmlConfig: |-
    sdk {
@@ -36,7 +46,7 @@ clearml:

 # -- 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
+# https://github.com/clearml/clearml-agent/tree/master/docker/k8s-glue
 agentk8sglue:
  # -- Glue Agent image configuration
  image:
@@ -47,15 +57,22 @@ agentk8sglue:
  # -- Glue Agent number of pods
  replicaCount: 1

-  # -- if set, don't create a serviceAccountName but use defined existing one
+  # -- Glue Agent pod resources
+  resources: {}
+
+  # -- Glue Agent pod initContainers configs
+  initContainers:
+    # -- Glue Agent initcontainers pod resources
+    resources: {}
+
+  # -- 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.
  clearmlcheckCertificate: true

-  # -- Enable Debugging logs for Agent pod
-  debugMode: false
-
  # -- Reference to Api server url
  apiServerUrlReference: "https://api.clear.ml"
  # -- Reference to File server url
@@ -65,21 +82,16 @@ agentk8sglue:

  # -- default container image for ClearML Task pod
  defaultContainerImage: ubuntu:18.04
-  # -- ClearML queue this agent will consume
+  # -- ClearML queue this agent will consume. Multiple queues can be specified with the following format: queue1,queue2,queue3
  queue: default
-  # -- ClearML spawn tasks as jobs instead of pods
-  taskAsJob: false
-  # -- Custom Bash script for the Glue Agent
+  # -- if ClearML queue does not exist, it will be create it if the value is set to true
+  createQueueIfNotExists: false
  # -- labels setup for Agent pod (example in values.yaml comments)
  labels: {}
    # schedulerName: scheduler
  # -- annotations setup for Agent pod (example in values.yaml comments)
  annotations: {}
    # key1: value1
-  # -- Custom Bash script for the Agent pod ran by Glue Agent
-  customBashScript: ""
-  # -- Custom Bash script for the Task Pods ran by Glue Agent
-  containerCustomBashScript: ""
  # -- Extra Environment variables for Glue Agent
  extraEnvs: []
    # - name: PYTHONPATH
@@ -216,8 +228,6 @@ agentk8sglue:
 sessions:
  # -- Enable/Disable sessions portmode WARNING: only one Agent deployment can have this set to true
  portModeEnabled: false
-  # -- Enable/Disable dynamic svc for sessions pods
-  dynamicSvcs: false
  # -- specific annotations for session services
  svcAnnotations: {}
  # -- service type ("NodePort" or "ClusterIP" or "LoadBalancer")
@@ -228,44 +238,3 @@ sessions:
  startingPort: 30000
  # -- maximum number of NodePorts exposed
  maxServices: 20
-  # -- set interactive queue tags
-  setInteractiveQueuesTag: true
-
-# -- Enterprise features (work only with an Enterprise license)
-enterpriseFeatures:
-  # -- Enable/Disable Enterprise features
-  enabled: false
-  # -- Image tag override for enterprise version
-  agentImageTagOverride: "1.24-58"
-  # -- service account access every namespace flag
-  serviceAccountClusterAccess: false
-  # -- push env vars from Clear.ML Vault to task pods
-  applyVaultEnvVars: true
-  # -- GPU resource general counters
-  monitoredResources:
-    # -- Field name used by Agent to count minimum resources
-    minResourcesFieldName: "resources|limits|nvidia.com/gpu"
-    # -- Maximum resources counter
-    maxResources: 0
-    # -- Field name used by Agent to count maximum resources
-    maxResourcesFieldName: "resources|limits|nvidia.com/gpu"
-  # -- maximum concurrent consume ClearML Task pod
-  maxPods: 10
-  # -- Agent must use owner Token
-  useOwnerToken: true
-  # -- Create queues if they don't exist
-  createQueues: false
-  # -- ClearML queues and related template OVERRIDES used this agent will consume
-  queues:
-    # -- name of the queue will be used for this template
-    # default:
-      # -- overrides of the base template for this queue (must be declared even if empty!)
-      # templateOverrides: {}
-    ## -- name of the queue will be used for this template
-    # default-gpu:
-    #  # -- overrides of the base template for this queue
-    #  templateOverrides:
-    #     # -- resources declaration for pods spawned to consume ClearML Task
-    #    resources:
-    #      limits:
-    #        nvidia.com/gpu: 1
--- 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.0.0"
-appVersion: "1.2.0"
-kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
+version: "1.5.10"
+appVersion: "1.3.0"
+kubeVersion: ">= 1.21.0-0 < 1.33.0-0"
 home: https://clear.ml
-icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
+icon: https://raw.githubusercontent.com/clearml/clearml/master/docs/clearml-logo.svg
 sources:
-  - https://github.com/allegroai/clearml-helm-charts
-  - https://github.com/allegroai/clearml
+  - https://github.com/clearml/clearml-helm-charts
+  - https://github.com/clearml/clearml
 maintainers:
-  - name: valeriano-manassero
-    url: https://github.com/valeriano-manassero
+  - name: filippo-clearml
+    url: https://github.com/filippo-clearml
 keywords:
  - clearml
  - "machine learning"
@@ -34,4 +34,4 @@ dependencies:
 annotations:
  artifacthub.io/changes: |
    - kind: changed
-      description: refactoring
+      description: Support kubernetes 1.32
--- a/charts/clearml-serving/README.md
+++ b/charts/clearml-serving/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Serving

-![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.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)
+![Version: 1.5.10](https://img.shields.io/badge/Version-1.5.10-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,12 +10,20 @@ 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 mopdels on a Kubernetes cluster.
+The **clearml-serving** is the Kubernetes serving for for [ClearML](https://github.com/clearml/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 clearml https://clearml.github.io/clearml-helm-charts
+```

 # Upgrading Chart

@@ -25,23 +33,23 @@ Updating to latest version of this chart can be done in two steps:

 ```
 helm repo update
-helm upgrade clearml-serving allegroai/clearml-serving
+helm upgrade clearml-serving clearml/clearml-serving
 ```

 Changing values on existing installation can be done with:

 ```
-helm upgrade clearml-serving allegroai/clearml-serving --version <CURRENT CHART VERSION> -f custom_values.yaml
+helm upgrade clearml-serving clearml/clearml-serving --version <CURRENT CHART VERSION> -f custom_values.yaml
 ```

 ## Source Code

-* <https://github.com/allegroai/clearml-helm-charts>
-* <https://github.com/allegroai/clearml>
+* <https://github.com/clearml/clearml-helm-charts>
+* <https://github.com/clearml/clearml>

 ## Requirements

-Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.33.0-0`

 | Repository | Name | Version |
 |------------|------|---------|
@@ -53,12 +61,16 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| 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","ingressClassName":"","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving inference configurations |
+| 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","kafkaServeUrl":"","servingTaskId":"ClearML Serving Task ID","webHost":"http://clearml-server-webserver:80"}` | ClearMl generic configurations |
+| clearml_serving_inference | object | `{"additionalConfigs":{},"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"existingAdditionalConfigsConfigMap":"","existingAdditionalConfigsSecret":"","extraEnvironment":[],"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-inference","tag":"1.3.0"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving inference configurations |
+| clearml_serving_inference.additionalConfigs | object | `{}` | files declared in this parameter will be mounted on internal folder /opt/clearml/config and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsSecret |
 | 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.existingAdditionalConfigsConfigMap | string | `""` | reference for files declared in existing ConfigMap will be mounted and read by pod (examples in values.yaml) |
+| clearml_serving_inference.existingAdditionalConfigsSecret | string | `""` | reference for files declared in existing Secret will be mounted and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsConfigMap |
+| clearml_serving_inference.extraEnvironment | list | `[]` | Extra environment variables |
 | clearml_serving_inference.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
-| clearml_serving_inference.image | object | `{"repository":"allegroai/clearml-serving-inference","tag":"1.2.0"}` | Container Image |
+| clearml_serving_inference.image | object | `{"repository":"allegroai/clearml-serving-inference","tag":"1.3.0"}` | Container Image |
 | clearml_serving_inference.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
 | clearml_serving_inference.ingress.annotations | object | `{}` | Ingress annotations |
 | clearml_serving_inference.ingress.enabled | bool | `false` | Enable/Disable ingress |
@@ -69,19 +81,27 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | 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 | object | `{"additionalConfigs":{},"affinity":{},"enabled":true,"existingAdditionalConfigsConfigMap":"","existingAdditionalConfigsSecret":"","extraEnvironment":[],"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-statistics","tag":"1.3.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving statistics configurations |
+| clearml_serving_statistics.additionalConfigs | object | `{}` | files declared in this parameter will be mounted on internal folder /opt/clearml/config and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsSecret |
 | clearml_serving_statistics.affinity | object | `{}` | Affinity configuration |
+| clearml_serving_statistics.enabled | bool | `true` | Enable ClearML Serving Statistics |
+| clearml_serving_statistics.existingAdditionalConfigsConfigMap | string | `""` | reference for files declared in existing ConfigMap will be mounted and read by pod (examples in values.yaml) |
+| clearml_serving_statistics.existingAdditionalConfigsSecret | string | `""` | reference for files declared in existing Secret will be mounted and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsConfigMap |
 | clearml_serving_statistics.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
-| clearml_serving_statistics.image | object | `{"repository":"allegroai/clearml-serving-statistics","tag":"1.2.0"}` | Container Image |
+| clearml_serving_statistics.image | object | `{"repository":"allegroai/clearml-serving-statistics","tag":"1.3.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","ingressClassName":"","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving Triton configurations |
+| clearml_serving_triton | object | `{"additionalConfigs":{},"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"enabled":true,"existingAdditionalConfigsConfigMap":"","existingAdditionalConfigsSecret":"","extraEnvironment":[],"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-triton","tag":"1.3.0"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving-grpc.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving Triton configurations |
+| clearml_serving_triton.additionalConfigs | object | `{}` | files declared in this parameter will be mounted on internal folder /opt/clearml/config and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsSecret |
 | 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.existingAdditionalConfigsConfigMap | string | `""` | reference for files declared in existing ConfigMap will be mounted and read by pod (examples in values.yaml) |
+| clearml_serving_triton.existingAdditionalConfigsSecret | string | `""` | reference for files declared in existing Secret will be mounted and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsConfigMap |
+| clearml_serving_triton.extraEnvironment | list | `[]` | Extra environment variables |
 | clearml_serving_triton.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
-| clearml_serving_triton.image | object | `{"repository":"allegroai/clearml-serving-triton","tag":"1.2.0-22.07"}` | Container Image |
+| clearml_serving_triton.image | object | `{"repository":"allegroai/clearml-serving-triton","tag":"1.3.0"}` | Container Image |
 | clearml_serving_triton.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving-grpc.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
 | clearml_serving_triton.ingress.annotations | object | `{}` | Ingress annotations |
 | clearml_serving_triton.ingress.enabled | bool | `false` | Enable/Disable ingress |
@@ -93,5 +113,12 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | 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://{{ .Release.Name }}-prometheus-server"}]}},"enabled":true}` | Configuration from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml |
+| imageCredentials | object | `{"email":"someone@host.com","enabled":false,"existingSecret":"","password":"pwd","registry":"docker.io","username":"someone"}` | Private image registry configuration |
+| imageCredentials.email | string | `"someone@host.com"` | Email |
+| imageCredentials.enabled | bool | `false` | Use private authentication mode |
+| imageCredentials.existingSecret | string | `""` | If this is set, chart will not generate a secret but will use what is defined here |
+| imageCredentials.password | string | `"pwd"` | Registry password |
+| imageCredentials.registry | string | `"docker.io"` | Registry name |
+| imageCredentials.username | string | `"someone"` | Registry username |
 | kafka | object | `{"enabled":true}` | Configuration from https://github.com/bitnami/charts/blob/main/bitnami/kafka/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},"serverFiles":{"prometheus.yml":{"scrape_configs":[{"job_name":"prometheus","static_configs":[{"targets":["localhost:9090"]}]}]}}}` | Configuration from https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus/values.yaml |
--- a/charts/clearml-serving/README.md.gotmpl
+++ b/charts/clearml-serving/README.md.gotmpl
@@ -11,8 +11,16 @@

 ## Introduction

-The **clearml-serving** is the Kubernetes serving for for [ClearML](https://github.com/allegroai/clearml-serving).
-It allows you to serve mopdels on a Kubernetes cluster.
+The **clearml-serving** is the Kubernetes serving for for [ClearML](https://github.com/clearml/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 clearml https://clearml.github.io/clearml-helm-charts
+```

 # Upgrading Chart

@@ -22,13 +30,13 @@ Updating to latest version of this chart can be done in two steps:

 ```
 helm repo update
-helm upgrade clearml-serving allegroai/clearml-serving
+helm upgrade clearml-serving clearml/clearml-serving
 ```

 Changing values on existing installation can be done with:

 ```
-helm upgrade clearml-serving allegroai/clearml-serving --version <CURRENT CHART VERSION> -f custom_values.yaml
+helm upgrade clearml-serving clearml/clearml-serving --version <CURRENT CHART VERSION> -f custom_values.yaml
 ```

 {{ template "chart.sourcesSection" . }}
--- a/charts/clearml-serving/templates/_helpers.tpl
+++ b/charts/clearml-serving/templates/_helpers.tpl
@@ -61,6 +61,15 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}

+{{/*
+Create secret to access docker registry
+*/}}
+{{- define "imagePullSecret" }}
+{{- with .Values.imageCredentials }}
+{{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" .registry .username .password .email (printf "%s:%s" .username .password | b64enc) | b64enc }}
+{{- end }}
+{{- end }}
+
 {{/*
 Return the target Kubernetes version
 */}}
--- a/charts/clearml-serving/templates/clearml-secrets.yaml
+++ b/charts/clearml-serving/templates/clearml-secrets.yaml
@@ -0,0 +1,11 @@
+{{- if .Values.imageCredentials.enabled }}
+{{- if not .Values.imageCredentials.existingSecret }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "clearmlServing.fullname" . }}-ark
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{- end }}
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-backend-networkpolicy.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-backend-networkpolicy.yaml
@@ -1,13 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: {{ include "clearmlServing.fullname" . }}-backend
-spec:
-  ingress:
-    - from:
-        - podSelector:
-            matchLabels:
-              clearml.serving.network/clearml-serving-backend: "true"
-  podSelector:
-    matchLabels:
-      clearml.serving.network/clearml-serving-backend: "true"
--- a/charts/clearml-serving/templates/clearml-serving-inference-cm.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-cm.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.clearml_serving_inference.additionalConfigs }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ include "clearmlServing.fullname" . }}-inference-configmap"
+  labels:
+    {{- include "clearmlServing.labels" . | nindent 4 }}
+data:
+  {{- range $key, $val := .Values.clearml_serving_inference.additionalConfigs }}
+  {{ $key }}: |
+    {{- $val | nindent 4 }}
+  {{- end }}
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
@@ -18,6 +18,32 @@ spec:
        clearml.serving.network/clearml-serving-backend: "true"
        clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
    spec:
+      {{- if .Values.imageCredentials.enabled }}
+      imagePullSecrets:
+      {{- if .Values.imageCredentials.existingSecret }}
+      - name: {{ .Values.imageCredentials.existingSecret }}
+      {{- else }}
+      - name: clearml-registry-key
+      {{- end }}
+      {{- end }}
+      {{- if or .Values.clearml_serving_inference.additionalConfigs .Values.clearml_serving_inference.existingAdditionalConfigsConfigMap  .Values.clearml_serving_inference.existingAdditionalConfigsSecret }}
+      volumes:
+        - name: additional-config
+          {{- if or .Values.clearml_serving_inference.existingAdditionalConfigsConfigMap }}
+          configMap:
+            name: {{ .Values.clearml_serving_inference.existingAdditionalConfigsConfigMap }}
+          {{- else if or .Values.clearml_serving_inference.existingAdditionalConfigsSecret }}
+          secret:
+            secretName: {{ .Values.clearml_serving_inference.existingAdditionalConfigsSecret }}
+          {{- else if or .Values.clearml_serving_inference.additionalConfigs }}
+          configMap:
+            name: "{{ include "clearmlServing.fullname" . }}-inference-configmap"
+          {{- end }}
+      {{- end }}
+      {{- with .Values.clearml_serving_inference.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      containers:
        - env:
            - name: CLEARML_API_ACCESS_KEY
@@ -30,8 +56,14 @@ spec:
              value: "{{ .Values.clearml.filesHost }}"
            - name: CLEARML_WEB_HOST
              value: "{{ .Values.clearml.webHost }}"
+            {{- if .Values.clearml_serving_statistics.enabled }}
            - name: CLEARML_DEFAULT_KAFKA_SERVE_URL
+              {{- if .Values.clearml.kafkaServeUrl }}
+              value: {{ .Values.clearml.kafkaServeUrl }}
+              {{- else }}
              value: {{ include "clearmlServing.fullname" . }}-kafka:9092
+              {{- end }}
+            {{- end }}
            - name: CLEARML_SERVING_POLL_FREQ
              value: "1.0"
            - name: CLEARML_DEFAULT_BASE_SERVE_URL
@@ -51,12 +83,29 @@ spec:
            - name: CLEARML_USE_GUNICORN
              value: "true"
            {{- if .Values.clearml_serving_inference.extraPythonPackages }}
-            - name: EXTRA_PYTHON_PACKAGES
+            - name: CLEARML_EXTRA_PYTHON_PACKAGES
              value: '{{ join " " .Values.clearml_serving_inference.extraPythonPackages }}'
            {{- end }}
+            {{- with .Values.clearml_serving_inference.extraEnvironment }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
          image: "{{ .Values.clearml_serving_inference.image.repository }}:{{ .Values.clearml_serving_inference.image.tag }}"
          name: {{ include "clearmlServing.fullname" . }}-inference
          ports:
            - containerPort: 8080
-          resources: {}
+          {{- if or .Values.clearml_serving_inference.additionalConfigs .Values.clearml_serving_inference.existingAdditionalConfigsConfigMap  .Values.clearml_serving_inference.existingAdditionalConfigsSecret }}
+          volumeMounts:  
+            - name: additional-config
+              mountPath: /opt/clearml/config
+          {{- end }}
+          {{- with .Values.clearml_serving_inference.nodeSelector }}
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.clearml_serving_inference.tolerations }}
+          tolerations:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.clearml_serving_inference.resources | nindent 12 }}
      restartPolicy: Always
--- a/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
@@ -14,6 +14,9 @@ metadata:
  annotations:
    {{- toYaml .Values.clearml_serving_inference.ingress.annotations | nindent 4 }}
 spec:
+  {{- if .Values.clearml_serving_inference.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.clearml_serving_inference.ingress.ingressClassName }}
+  {{- end }}
  {{- if .Values.clearml_serving_inference.ingress.tlsSecretName }}
  tls:
    - hosts:
--- a/charts/clearml-serving/templates/clearml-serving-statistics-cm.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-cm.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.clearml_serving_statistics.enabled }}
+{{- if .Values.clearml_serving_statistics.additionalConfigs }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ include "clearmlServing.fullname" . }}-statistics-configmap"
+  labels:
+    {{- include "clearmlServing.labels" . | nindent 4 }}
+data:
+  {{- range $key, $val := .Values.clearml_serving_statistics.additionalConfigs }}
+  {{ $key }}: |
+    {{- $val | nindent 4 }}
+  {{- end }}
+{{- end }}
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.clearml_serving_statistics.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -18,6 +19,32 @@ spec:
        clearml.serving.network/clearml-serving-backend: "true"
        clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
    spec:
+      {{- if .Values.imageCredentials.enabled }}
+      imagePullSecrets:
+      {{- if .Values.imageCredentials.existingSecret }}
+      - name: {{ .Values.imageCredentials.existingSecret }}
+      {{- else }}
+      - name: clearml-registry-key
+      {{- end }}
+      {{- end }}
+      {{- if or .Values.clearml_serving_statistics.additionalConfigs .Values.clearml_serving_statistics.existingAdditionalConfigsConfigMap  .Values.clearml_serving_statistics.existingAdditionalConfigsSecret }}
+      volumes:
+        - name: additional-config
+          {{- if or .Values.clearml_serving_statistics.existingAdditionalConfigsConfigMap }}
+          configMap:
+            name: {{ .Values.clearml_serving_statistics.existingAdditionalConfigsConfigMap }}
+          {{- else if or .Values.clearml_serving_statistics.existingAdditionalConfigsSecret }}
+          secret:
+            secretName: {{ .Values.clearml_serving_statistics.existingAdditionalConfigsSecret }}
+          {{- else if or .Values.clearml_serving_statistics.additionalConfigs }}
+          configMap:
+            name: "{{ include "clearmlServing.fullname" . }}-statistics-configmap"
+          {{- end }}
+      {{- end }}
+      {{- with .Values.clearml_serving_statistics.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      containers:
        - env:
            - name: CLEARML_API_ACCESS_KEY
@@ -31,18 +58,40 @@ spec:
            - name: CLEARML_WEB_HOST
              value: "{{ .Values.clearml.webHost }}"
            - name: CLEARML_DEFAULT_KAFKA_SERVE_URL
+              {{- if .Values.clearml.kafkaServeUrl }}
+              value: {{ .Values.clearml.kafkaServeUrl }}
+              {{- else }}
              value: {{ include "clearmlServing.fullname" . }}-kafka:9092
+              {{- end }}
            - name: CLEARML_SERVING_POLL_FREQ
              value: "1.0"
            - name: CLEARML_SERVING_TASK_ID
              value: "{{ .Values.clearml.servingTaskId }}"
            {{- if .Values.clearml_serving_statistics.extraPythonPackages }}
-            - name: EXTRA_PYTHON_PACKAGES
+            - name: CLEARML_EXTRA_PYTHON_PACKAGES
              value: '{{ join " " .Values.clearml_serving_statistics.extraPythonPackages }}'
            {{- end }}
+            {{- with .Values.clearml_serving_statistics.extraEnvironment }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
          image: "{{ .Values.clearml_serving_statistics.image.repository }}:{{ .Values.clearml_serving_statistics.image.tag }}"
          name: {{ include "clearmlServing.fullname" . }}-statistics
          ports:
            - containerPort: 9999
-          resources: {}
+          {{- if or .Values.clearml_serving_statistics.additionalConfigs .Values.clearml_serving_statistics.existingAdditionalConfigsConfigMap  .Values.clearml_serving_statistics.existingAdditionalConfigsSecret }}
+          volumeMounts:  
+            - name: additional-config
+              mountPath: /opt/clearml/config
+          {{- end }}
+          {{- with .Values.clearml_serving_statistics.nodeSelector }}
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.clearml_serving_statistics.tolerations }}
+          tolerations:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          resources:
+            {{- toYaml .Values.clearml_serving_statistics.resources | nindent 12 }}
      restartPolicy: Always
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.clearml_serving_statistics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -12,3 +13,4 @@ spec:
      targetPort: 9999
  selector:
    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-triton-cm.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-cm.yaml
@@ -0,0 +1,15 @@
+{{- if .Values.clearml_serving_triton.enabled }}
+{{- if .Values.clearml_serving_triton.additionalConfigs }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ include "clearmlServing.fullname" . }}-triton-configmap"
+  labels:
+    {{- include "clearmlServing.labels" . | nindent 4 }}
+data:
+  {{- range $key, $val := .Values.clearml_serving_triton.additionalConfigs }}
+  {{ $key }}: |
+    {{- $val | nindent 4 }}
+  {{- end }}
+{{- end }}
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
@@ -19,6 +19,39 @@ spec:
        clearml.serving.network/clearml-serving-backend: "true"
        clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
    spec:
+      {{- if .Values.imageCredentials.enabled }}
+      imagePullSecrets:
+      {{- if .Values.imageCredentials.existingSecret }}
+      - name: {{ .Values.imageCredentials.existingSecret }}
+      {{- else }}
+      - name: clearml-registry-key
+      {{- end }}
+      {{- end }}
+      {{ if .Values.clearml_serving_triton.runtimeClassName}}
+      runtimeClassName: {{ .Values.clearml_serving_triton.runtimeClassName }}
+      {{- end}}
+      {{- if or .Values.clearml_serving_triton.additionalConfigs .Values.clearml_serving_triton.existingAdditionalConfigsConfigMap  .Values.clearml_serving_triton.existingAdditionalConfigsSecret }}
+      volumes:
+        - name: additional-config
+          {{- if or .Values.clearml_serving_triton.existingAdditionalConfigsConfigMap }}
+          configMap:
+            name: {{ .Values.clearml_serving_triton.existingAdditionalConfigsConfigMap }}
+          {{- else if or .Values.clearml_serving_triton.existingAdditionalConfigsSecret }}
+          secret:
+            secretName: {{ .Values.clearml_serving_triton.existingAdditionalConfigsSecret }}
+          {{- else if or .Values.clearml_serving_triton.additionalConfigs }}
+          configMap:
+            name: "{{ include "clearmlServing.fullname" . }}-triton-configmap"
+          {{- end }}
+      {{- end }}
+      {{- with .Values.clearml_serving_triton.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.clearml_serving_triton.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      containers:
        - env:
            - name: CLEARML_API_ACCESS_KEY
@@ -38,14 +71,27 @@ spec:
            - name: CLEARML_TRITON_METRIC_FREQ
              value: "1.0"
            {{- if .Values.clearml_serving_triton.extraPythonPackages }}
-            - name: EXTRA_PYTHON_PACKAGES
+            - name: CLEARML_EXTRA_PYTHON_PACKAGES
              value: '{{ join " " .Values.clearml_serving_triton.extraPythonPackages }}'
            {{- end }}
+            {{- with .Values.clearml_serving_triton.extraEnvironment }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
          image: "{{ .Values.clearml_serving_triton.image.repository }}:{{ .Values.clearml_serving_triton.image.tag }}"
          name: {{ include "clearmlServing.fullname" . }}-triton
          ports:
            - containerPort: 8001
-          resources: {}
+          {{- if or .Values.clearml_serving_triton.additionalConfigs .Values.clearml_serving_triton.existingAdditionalConfigsConfigMap  .Values.clearml_serving_triton.existingAdditionalConfigsSecret }}
+          volumeMounts:  
+            - name: additional-config
+              mountPath: /opt/clearml/config
+          {{- end }}
+          resources:
+            {{- toYaml .Values.clearml_serving_triton.resources | nindent 12 }}
      restartPolicy: Always
+      {{- with .Values.clearml_serving_triton.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{ end }}

--- a/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.clearml_serving_triton.enabled }}
 {{- if .Values.clearml_serving_triton.autoscaling.enabled }}
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
@@ -40,3 +41,4 @@ spec:
        {{- end }}
    {{- end }}
 {{- end }}
+{{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-triton-ingress.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-ingress.yaml
@@ -15,6 +15,9 @@ metadata:
  annotations:
    {{- toYaml .Values.clearml_serving_triton.ingress.annotations | nindent 4 }}
 spec:
+  {{- if .Values.clearml_serving_triton.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.clearml_serving_triton.ingress.ingressClassName }}
+  {{- end }}
  {{- if .Values.clearml_serving_triton.ingress.tlsSecretName }}
  tls:
    - hosts:
--- a/charts/clearml-serving/values.yaml
+++ b/charts/clearml-serving/values.yaml
@@ -1,3 +1,18 @@
+# -- Private image registry configuration
+imageCredentials:
+  # -- Use private authentication mode
+  enabled: false
+  # -- If this is set, chart will not generate a secret but will use what is defined here
+  existingSecret: ""
+  # -- Registry name
+  registry: docker.io
+  # -- Registry username
+  username: someone
+  # -- Registry password
+  password: pwd
+  # -- Email
+  email: someone@host.com
+
 # -- ClearMl generic configurations
 clearml:
  apiAccessKey: "ClearML API Access Key"
@@ -7,13 +22,16 @@ clearml:
  webHost: http://clearml-server-webserver:80
  defaultBaseServeUrl: http://127.0.0.1:8080/serve
  servingTaskId: "ClearML Serving Task ID"
+  kafkaServeUrl: ""

 # -- ClearML serving statistics configurations
 clearml_serving_statistics:
+  # -- Enable ClearML Serving Statistics
+  enabled: true
  # -- Container Image
  image:
    repository: "allegroai/clearml-serving-statistics"
-    tag: "1.2.0"
+    tag: "1.3.0"
  # -- Node Selector configuration
  nodeSelector: {}
  # -- Tolerations configuration
@@ -22,17 +40,26 @@ clearml_serving_statistics:
  affinity: {}
  # -- Pod resources definition
  resources: {}
+  extraEnvironment: []
  # -- Extra Python Packages to be installed in running pods
  extraPythonPackages: []
  #  - numpy==1.22.4
  #  - pandas==1.4.2
+  # -- reference for files declared in existing ConfigMap will be mounted and read by pod (examples in values.yaml)
+  existingAdditionalConfigsConfigMap: ""
+  # -- reference for files declared in existing Secret will be mounted and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsConfigMap
+  existingAdditionalConfigsSecret: ""
+  # -- files declared in this parameter will be mounted on internal folder /opt/clearml/config and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsSecret
+  additionalConfigs: {}
+  #   additionalFile.conf: |
+  #     <filecontent>

 # -- ClearML serving inference configurations
 clearml_serving_inference:
  # -- Container Image
  image:
    repository: "allegroai/clearml-serving-inference"
-    tag: "1.2.0"
+    tag: "1.3.0"
  # -- Node Selector configuration
  nodeSelector: {}
  # -- Tolerations configuration
@@ -41,10 +68,20 @@ clearml_serving_inference:
  affinity: {}
  # -- Pod resources definition
  resources: {}
+  # -- Extra environment variables
+  extraEnvironment: []
  # -- Extra Python Packages to be installed in running pods
  extraPythonPackages: []
  #  - numpy==1.22.4
  #  - pandas==1.4.2
+  # -- reference for files declared in existing ConfigMap will be mounted and read by pod (examples in values.yaml)
+  existingAdditionalConfigsConfigMap: ""
+  # -- reference for files declared in existing Secret will be mounted and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsConfigMap
+  existingAdditionalConfigsSecret: ""
+  # -- files declared in this parameter will be mounted on internal folder /opt/clearml/config and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsSecret
+  additionalConfigs: {}
+  #   additionalFile.conf: |
+  #     <filecontent>
  # -- Autoscaling configuration
  autoscaling:
    enabled: false
@@ -74,7 +111,10 @@ clearml_serving_triton:
  # -- Container Image
  image:
    repository: "allegroai/clearml-serving-triton"
-    tag: "1.2.0-22.07"
+    tag: "1.3.0"
+  # -- Runtime Class configuration
+  # uncomment to use custom runtime class, eg. nvidia when using GPU operator
+  # runtimeClassName: "nvidia"
  # -- Node Selector configuration
  nodeSelector: {}
  # -- Tolerations configuration
@@ -83,10 +123,20 @@ clearml_serving_triton:
  affinity: {}
  # -- Pod resources definition
  resources: {}
+  # -- Extra environment variables
+  extraEnvironment: []
  # -- Extra Python Packages to be installed in running pods
  extraPythonPackages: []
  #  - numpy==1.22.4
  #  - pandas==1.4.2
+  # -- reference for files declared in existing ConfigMap will be mounted and read by pod (examples in values.yaml)
+  existingAdditionalConfigsConfigMap: ""
+  # -- reference for files declared in existing Secret will be mounted and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsConfigMap
+  existingAdditionalConfigsSecret: ""
+  # -- files declared in this parameter will be mounted on internal folder /opt/clearml/config and read by pod (examples in values.yaml) if not overridden by existingAdditionalConfigsSecret
+  additionalConfigs: {}
+  #   additionalFile.conf: |
+  #     <filecontent>
  # -- Autoscaling configuration
  autoscaling:
    enabled: false
--- a/charts/clearml/Chart.lock
+++ b/charts/clearml/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
  version: 17.8.3
 - name: mongodb
  repository: https://charts.bitnami.com/bitnami
-  version: 12.1.31
+  version: 13.18.5
 - name: elasticsearch
  repository: https://helm.elastic.co
  version: 7.17.3
-digest: sha256:e92c4ac212dfd90a527af0260fa71a5fcc33f485a21c1cca3daa2ced667858b2
-generated: "2023-03-10T14:59:49.01676+01:00"
+digest: sha256:d5864444fa8c5cb66a83ec02cdbe4b0776f9f6538dfe67132be7eeb2781b50e4
+generated: "2025-01-07T15:18:46.845769+01:00"
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,17 +2,17 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "6.0.2"
-appVersion: "1.9.2"
-kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
+version: "7.14.4"
+appVersion: "2.0"
+kubeVersion: ">= 1.21.0-0 < 1.33.0-0"
 home: https://clear.ml
-icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
+icon: https://raw.githubusercontent.com/clearml/clearml/master/docs/clearml-logo.svg
 sources:
-  - https://github.com/allegroai/clearml-helm-charts
-  - https://github.com/allegroai/clearml
+  - https://github.com/clearml/clearml-helm-charts
+  - https://github.com/clearml/clearml
 maintainers:
-  - name: valeriano-manassero
-    url: https://github.com/valeriano-manassero
+  - name: filippo-clearml
+    url: https://github.com/filippo-clearml
 keywords:
  - clearml
  - "machine learning"
@@ -23,7 +23,7 @@ dependencies:
    repository: "https://charts.bitnami.com/bitnami"
    condition: redis.enabled
  - name: mongodb
-    version: "12.1.31"
+    version: "13.18.5"
    repository: "https://charts.bitnami.com/bitnami"
    condition: mongodb.enabled
  - name: elasticsearch
@@ -33,4 +33,4 @@ dependencies:
 annotations:
  artifacthub.io/changes: |
    - kind: fixed
-      description: fullname usage
+      description: "casted port to string before concatenation"
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes

-![Version: 6.0.2](https://img.shields.io/badge/Version-6.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.2](https://img.shields.io/badge/AppVersion-1.9.2-informational?style=flat-square)
+![Version: 7.14.4](https://img.shields.io/badge/Version-7.14.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0](https://img.shields.io/badge/AppVersion-2.0-informational?style=flat-square)

 MLOps platform

@@ -10,11 +10,11 @@ MLOps platform

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

 ## Introduction

-The **clearml-server** is the backend service infrastructure for [ClearML](https://github.com/allegroai/clearml).
+The **clearml-server** is the backend service infrastructure for [ClearML](https://github.com/clearml/clearml).
 It allows multiple users to collaborate and manage their experiments.

 **clearml-server** contains the following components:
@@ -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 clearml https://clearml.github.io/clearml-helm-charts
+```
+
 ## Local environment

 For development/evaluation it's possible to use [kind](https://kind.sigs.k8s.io).
@@ -60,7 +68,7 @@ nodes:
    containerPath: /var/local-path-provisioner
 EOF

-helm install clearml allegroai/clearml
+helm install clearml clearml/clearml
 ```

 After deployment, the services will be exposed on localhost on the following ports:
@@ -88,7 +96,7 @@ Just pointing the domain records to the IP where ingress controller is respondin
 A production ready cluster should also have some different configuration like the one proposed in `values-production.yaml` that can be applied with:

 ```
-helm install clearml allegroai/clearml -f values-production.yaml
+helm install clearml clearml/clearml -f values-production.yaml
 ```

 ## Upgrades/ Values upgrades
@@ -97,13 +105,13 @@ Updating to latest version of this chart can be done in two steps:

 ```
 helm repo update
-helm upgrade clearml allegroai/clearml
+helm upgrade clearml clearml/clearml
 ```

 Changing values on existing installation can be done with:

 ```
-helm upgrade clearml allegroai/clearml --version <CURRENT CHART VERSION> -f custom_values.yaml
+helm upgrade clearml clearml/clearml --version <CURRENT CHART VERSION> -f custom_values.yaml
 ```

 Please note: updating values only should always be done setting explicit chart version to avoid a possible chart update.
@@ -117,18 +125,6 @@ Before issuing helm upgrade:
 * scale MongoDB deployment(s) replicas to 0
 * if using securityContexts check for new value form in values.yaml (podSecurityContext and containerSecurityContext)

-## ENTERPRISE Version
-
-There are some specific Enterprise version features that can be enabled only with specific Enterprise licensed images.
-Enabling this features on OSS version can cause the entire installation to break.
-
-### Non root/privileged environments
-
-*This feature is available for Enterprise version only*
-
-In environments like Openshift or Tanzu it can be required to run non-root/non-privileged pods/containers.
-In this case it's recommended to use `values-enterprise-non-root-privileged.yaml` as base for override file.
-
 ## Additional Configuration for ClearML Server

 You can also configure the **clearml-server** for:
@@ -136,20 +132,20 @@ You can also configure the **clearml-server** for:
 * fixed users (users with credentials)
 * non-responsive experiment watchdog settings

-For detailed instructions, see the [Optional Configuration](https://github.com/allegroai/clearml-server#optional-configuration) section in the **clearml-server** repository README file.
+For detailed instructions, see the [Optional Configuration](https://github.com/clearml/clearml-server#optional-configuration) section in the **clearml-server** repository README file.

 ## Source Code

-* <https://github.com/allegroai/clearml-helm-charts>
-* <https://github.com/allegroai/clearml>
+* <https://github.com/clearml/clearml-helm-charts>
+* <https://github.com/clearml/clearml>

 ## Requirements

-Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.33.0-0`

 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.bitnami.com/bitnami | mongodb | 12.1.31 |
+| https://charts.bitnami.com/bitnami | mongodb | 13.18.5 |
 | https://charts.bitnami.com/bitnami | redis | 17.8.3 |
 | https://helm.elastic.co | elasticsearch | 7.17.3 |

@@ -157,17 +153,18 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| apiserver | object | `{"additionalConfigs":{},"affinity":{},"containerSecurityContext":{},"enabled":true,"existingAdditionalConfigsConfigMap":"","existingAdditionalConfigsSecret":"","extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.9.2-317"},"indexReplicas":0,"indexShards":1,"ingress":{"annotations":{},"enabled":false,"hostName":"api.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"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"},"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":"2.0.0-613"},"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. |
 | apiserver.affinity | object | `{}` | Api Server affinity setup |
 | apiserver.containerSecurityContext | object | `{}` | Api Server containers security context |
+| apiserver.deploymentAnnotations | string | `nil` | Add the provided map to the annotations for the Deployment resource created by this chart. |
 | apiserver.enabled | bool | `true` | Enable/Disable component deployment |
 | 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.9.2-317"}` | Api Server image configuration |
-| apiserver.indexReplicas | int | `0` | Number of additional replicas in Elasticsearch indexes |
-| apiserver.indexShards | int | `1` | Number of shards in Elasticsearch indexes |
+| apiserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"2.0.0-613"}` | 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 |
@@ -175,6 +172,7 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | apiserver.ingress.ingressClassName | string | `""` | ClassName (must be defined if no default ingressClassName is available) |
 | apiserver.ingress.path | string | `"/"` | Ingress root path url |
 | apiserver.ingress.tlsSecretName | string | `""` | Reference to secret containing TLS certificate. If set, it enables HTTPS on ingress rule. |
+| apiserver.initContainers | object | `{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}}` | Api Server resources per initContainers pod |
 | apiserver.nodeSelector | object | `{}` | Api Server nodeselector |
 | apiserver.podAnnotations | object | `{}` | specific annotation for Api Server pods |
 | apiserver.podSecurityContext | object | `{}` | Api Server pod security context |
@@ -189,8 +187,10 @@ Kubernetes: `>= 1.21.0-0 < 1.27.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","fileserverKey":"XXCRJ123CEE2KSQ068WO","fileserverSecret":"YIy8EVAC7QCT4FtgitxAQGyW7xRHDZ4jpYlTE7HKiscpORl1hG","readinessprobeKey":"GK4PRTVT3706T25K6BA1","readinessprobeSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","secureAuthTokenSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","testUserKey":"ENP39EQM4SLACGD5FXB7","testUserSecret":"lPcm0imbcBZ8mwgO7tpadutiS3gnJD05x9j7afwXPS35IKbpiQ"}` | ClearMl generic configurations |
+| 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 |
 | clearml.apiserverKey | string | `"GGS9F4M6XB2DXJ5AFT9F"` | Api Server basic auth key |
 | clearml.apiserverSecret | string | `"2oGujVFhPfaozhpuz2GzQfA5OyxmMsR3WVJpsCR5hrgHFs20PO"` | Api Server basic auth secret |
 | clearml.clientConfigurationApiUrl | string | `""` | Override the API Urls displayed when showing an example of the SDK's clearml.conf configuration |
@@ -198,6 +198,7 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | clearml.cookieDomain | string | `""` | Cookie domain to be left empty if not exposed with an ingress |
 | clearml.cookieName | string | `"clearml-token-k8s"` | Name fo the UI cookie |
 | clearml.defaultCompany | string | `"d1bd92a3b039400cbafc60a7a5b1e52b"` | Company name |
+| clearml.existingSecret | string | `""` | Pass Clearml secrets using an existing secret must contain the keys: apiserver_key, apiserver_secret, secure_auth_token_secret, test_user_key, test_user_secret |
 | clearml.fileserverKey | string | `"XXCRJ123CEE2KSQ068WO"` | File Server basic auth key |
 | clearml.fileserverSecret | string | `"YIy8EVAC7QCT4FtgitxAQGyW7xRHDZ4jpYlTE7HKiscpORl1hG"` | File Server basic auth secret |
 | clearml.readinessprobeKey | string | `"GK4PRTVT3706T25K6BA1"` | Readiness probe basic auth key |
@@ -205,53 +206,22 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | clearml.secureAuthTokenSecret | string | `"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2"` | Secure Auth secret |
 | clearml.testUserKey | string | `"ENP39EQM4SLACGD5FXB7"` | Test Server basic auth key |
 | clearml.testUserSecret | string | `"lPcm0imbcBZ8mwgO7tpadutiS3gnJD05x9j7afwXPS35IKbpiQ"` | Test File Server basic auth secret |
-| elasticsearch | object | `{"clusterHealthCheckParams":"wait_for_status=yellow&timeout=1s","clusterName":"clearml-elastic","enabled":true,"esConfig":{"elasticsearch.yml":"xpack.security.enabled: false\n"},"esJavaOpts":"-Xmx2g -Xms2g","extraEnvs":[{"name":"bootstrap.memory_lock","value":"false"},{"name":"cluster.routing.allocation.node_initial_primaries_recoveries","value":"500"},{"name":"cluster.routing.allocation.disk.watermark.low","value":"500mb"},{"name":"cluster.routing.allocation.disk.watermark.high","value":"500mb"},{"name":"cluster.routing.allocation.disk.watermark.flood_stage","value":"500mb"},{"name":"http.compression_level","value":"7"},{"name":"reindex.remote.whitelist","value":"*.*"},{"name":"xpack.monitoring.enabled","value":"false"},{"name":"xpack.security.enabled","value":"false"}],"httpPort":9200,"minimumMasterNodes":1,"persistence":{"enabled":true},"replicas":1,"resources":{"limits":{"cpu":"2000m","memory":"4Gi"},"requests":{"cpu":"100m","memory":"2Gi"}},"roles":{"data":"true","ingest":"true","master":"true","remote_cluster_client":"true"},"volumeClaimTemplate":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"50Gi"}},"storageClassName":null}}` | Configuration from https://github.com/elastic/helm-charts/blob/7.16/elasticsearch/values.yaml |
-| enterpriseFeatures | object | `{"airGappedDocumentation":{"enabled":false,"image":{"registry":"","repository":"","tag":"4"}},"apiserverImageTagOverride":"3.16.0-959","clearmlApplications":{"additionalClusterRoleBindings":[],"additionalRoleBindings":[],"affinity":{},"agentKey":"GK4PRTVT3706T25K6BA1","agentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","basePodImage":{"repository":"","tag":"app-1.1.1-47"},"containerCustomBashScript":"","containerSecurityContext":{},"customBashScript":"","enabled":true,"extraEnvs":[],"fileMounts":[],"gitAgentPass":"git_password","gitAgentUser":"git_user","image":{"pullPolicy":"IfNotPresent","repository":"","tag":"1.24-58"},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]},"defaultCompanyGuid":"d1bd92a3b039400cbafc60a7a5b1e52b","enabled":false,"extraIndexUrl":"","fileserverImageTagOverride":"3.16.0-959","overrideReferenceApiUrl":"","overrideReferenceFileUrl":"","webserverImageTagOverride":"3.16-922"}` | Enterprise features (work only with an Enterprise license) |
-| enterpriseFeatures.airGappedDocumentation | object | `{"enabled":false,"image":{"registry":"","repository":"","tag":"4"}}` | Air gapped documentation  configurations |
-| enterpriseFeatures.airGappedDocumentation.enabled | bool | `false` | Enable/Disable air gapped documentation deployment |
-| enterpriseFeatures.airGappedDocumentation.image | object | `{"registry":"","repository":"","tag":"4"}` | Air gapped documentation image configuration |
-| enterpriseFeatures.apiserverImageTagOverride | string | `"3.16.0-959"` | Image tag override for apiserver enterprise version |
-| enterpriseFeatures.clearmlApplications | object | `{"additionalClusterRoleBindings":[],"additionalRoleBindings":[],"affinity":{},"agentKey":"GK4PRTVT3706T25K6BA1","agentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","basePodImage":{"repository":"","tag":"app-1.1.1-47"},"containerCustomBashScript":"","containerSecurityContext":{},"customBashScript":"","enabled":true,"extraEnvs":[],"fileMounts":[],"gitAgentPass":"git_password","gitAgentUser":"git_user","image":{"pullPolicy":"IfNotPresent","repository":"","tag":"1.24-58"},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]}` | APPS configurations |
-| enterpriseFeatures.clearmlApplications.additionalClusterRoleBindings | list | `[]` | additional existing ClusterRoleBindings |
-| enterpriseFeatures.clearmlApplications.additionalRoleBindings | list | `[]` | additional existing RoleBindings |
-| enterpriseFeatures.clearmlApplications.affinity | object | `{}` | APPS affinity setup |
-| enterpriseFeatures.clearmlApplications.agentKey | string | `"GK4PRTVT3706T25K6BA1"` | Apps Server basic auth key |
-| enterpriseFeatures.clearmlApplications.agentSecret | string | `"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2"` | Apps Server basic auth secret |
-| enterpriseFeatures.clearmlApplications.basePodImage | object | `{"repository":"","tag":"app-1.1.1-47"}` | APPS base spawning pods image |
-| enterpriseFeatures.clearmlApplications.containerCustomBashScript | string | `""` | Custom Bash script for the APPS Task Pods ran by Glue Agent |
-| enterpriseFeatures.clearmlApplications.containerSecurityContext | object | `{}` | APPS containers security context |
-| enterpriseFeatures.clearmlApplications.customBashScript | string | `""` | Custom Bash script for the APPS Agent pod ran by Glue Agent |
-| enterpriseFeatures.clearmlApplications.enabled | bool | `true` | Enable/Disable component deployment |
-| enterpriseFeatures.clearmlApplications.extraEnvs | list | `[]` | APPS extra envrinoment variables |
-| enterpriseFeatures.clearmlApplications.fileMounts | list | `[]` | file definition |
-| enterpriseFeatures.clearmlApplications.gitAgentPass | string | `"git_password"` | Apps Server Git password |
-| enterpriseFeatures.clearmlApplications.gitAgentUser | string | `"git_user"` | Apps Server Git user |
-| enterpriseFeatures.clearmlApplications.image | object | `{"pullPolicy":"IfNotPresent","repository":"","tag":"1.24-58"}` | APPS image configuration |
-| enterpriseFeatures.clearmlApplications.nodeSelector | object | `{}` | APPS nodeselector |
-| enterpriseFeatures.clearmlApplications.podAnnotations | object | `{}` | specific annotation for APPS pods |
-| enterpriseFeatures.clearmlApplications.podSecurityContext | object | `{}` | APPS pod security context |
-| enterpriseFeatures.clearmlApplications.replicaCount | int | `1` | APPS number of pods |
-| enterpriseFeatures.clearmlApplications.resources | object | `{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}}` | APPS resources per pod; these are minimal requirements, it's suggested to increase these values in production environments |
-| enterpriseFeatures.clearmlApplications.tolerations | list | `[]` | APPS tolerations setup |
-| enterpriseFeatures.defaultCompanyGuid | string | `"d1bd92a3b039400cbafc60a7a5b1e52b"` | Company ID |
-| enterpriseFeatures.enabled | bool | `false` | Enable/Disable Enterprise features |
-| enterpriseFeatures.extraIndexUrl | string | `""` | extra index URL for Enterprise packages |
-| enterpriseFeatures.fileserverImageTagOverride | string | `"3.16.0-959"` | Image tag override for fileserver enterprise version |
-| enterpriseFeatures.overrideReferenceApiUrl | string | `""` | set this value AND overrideReferenceFileUrl if external endpoint exposure is in place (like a LoadBalancer) example: "https://api.clearml.local" |
-| enterpriseFeatures.overrideReferenceFileUrl | string | `""` | set this value AND overrideReferenceAPIUrl if external endpoint exposure is in place (like a LoadBalancer) example: "https://files.clearml.local" |
-| enterpriseFeatures.webserverImageTagOverride | string | `"3.16-922"` | Image tag override for webserver enterprise version |
-| externalServices | object | `{"elasticsearchConnectionString":"","mongodbConnectionStringAuth":"","mongodbConnectionStringBackend":"","redisHost":"","redisPort":6379}` | Definition of external services to use if not enabled as dependency charts here |
-| externalServices.elasticsearchConnectionString | string | `""` | Existing ElasticSearch connectionstring if elasticsearch.enabled is false (example in values.yaml) |
-| externalServices.mongodbConnectionStringAuth | string | `""` | Existing MongoDB connection string for BACKEND to use if mongodb.enabled is false |
-| externalServices.mongodbConnectionStringBackend | string | `""` | Existing MongoDB connection string for AUTH to use if mongodb.enabled is false |
-| externalServices.redisHost | string | `""` | Existing Redis Hostname to use if redis.enabled is false |
+| elasticsearch | object | `{"clusterHealthCheckParams":"wait_for_status=yellow&timeout=1s","clusterName":"clearml-elastic","enabled":true,"esConfig":{"elasticsearch.yml":"xpack.security.enabled: false\n"},"esJavaOpts":"-Xmx2g -Xms2g","extraEnvs":[{"name":"bootstrap.memory_lock","value":"false"},{"name":"cluster.routing.allocation.node_initial_primaries_recoveries","value":"500"},{"name":"cluster.routing.allocation.disk.watermark.low","value":"500mb"},{"name":"cluster.routing.allocation.disk.watermark.high","value":"500mb"},{"name":"cluster.routing.allocation.disk.watermark.flood_stage","value":"500mb"},{"name":"http.compression_level","value":"7"},{"name":"reindex.remote.whitelist","value":"*.*"},{"name":"xpack.monitoring.enabled","value":"false"},{"name":"xpack.security.enabled","value":"false"}],"httpPort":9200,"minimumMasterNodes":1,"persistence":{"enabled":true},"rbac":{"create":true},"replicas":1,"resources":{"limits":{"cpu":"2000m","memory":"4Gi"},"requests":{"cpu":"100m","memory":"2Gi"}},"roles":{"data":"true","ingest":"true","master":"true","remote_cluster_client":"true"},"volumeClaimTemplate":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"50Gi"}},"storageClassName":null}}` | Configuration from https://github.com/elastic/helm-charts/blob/7.16/elasticsearch/values.yaml |
+| externalServices | object | `{"elasticsearchConnectionString":"[{\"host\":\"es_hostname1\",\"port\":9200},{\"host\":\"es_hostname2\",\"port\":9200},{\"host\":\"es_hostname3\",\"port\":9200}]","mongodbConnectionStringAuth":"mongodb://mongodb_hostname:27017/auth","mongodbConnectionStringBackend":"mongodb://mongodb_hostnamehostname:27017/backend","redisHost":"redis_hostname","redisPort":6379}` | Definition of external services to use if not enabled as dependency charts here |
+| externalServices.elasticsearchConnectionString | string | `"[{\"host\":\"es_hostname1\",\"port\":9200},{\"host\":\"es_hostname2\",\"port\":9200},{\"host\":\"es_hostname3\",\"port\":9200}]"` | Existing ElasticSearch connectionstring if elasticsearch.enabled is false (example in values.yaml) |
+| externalServices.mongodbConnectionStringAuth | string | `"mongodb://mongodb_hostname:27017/auth"` | Existing MongoDB connection string for BACKEND to use if mongodb.enabled is false (example in values.yaml) |
+| 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 | `{"affinity":{},"containerSecurityContext":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.9.2-317"},"ingress":{"annotations":{},"enabled":false,"hostName":"files.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30081,"port":8081,"type":"NodePort"},"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":"2.0.0-613"},"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 |
 | fileserver.containerSecurityContext | object | `{}` | File Server containers security context |
+| 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.9.2-317"}` | File Server image configuration |
+| fileserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"2.0.0-613"}` | 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 |
@@ -259,6 +229,7 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | fileserver.ingress.ingressClassName | string | `""` | ClassName (must be defined if no default ingressClassName is available) |
 | fileserver.ingress.path | string | `"/"` | Ingress root path url |
 | fileserver.ingress.tlsSecretName | string | `""` | Reference to secret containing TLS certificate. If set, it enables HTTPS on ingress rule. |
+| fileserver.initContainers | object | `{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}}` | File Server resources per initContainers pod |
 | fileserver.nodeSelector | object | `{}` | File Server nodeselector |
 | fileserver.podAnnotations | object | `{}` | specific annotation for File Server pods |
 | fileserver.podSecurityContext | object | `{}` | File Server pod security context |
@@ -267,6 +238,8 @@ Kubernetes: `>= 1.21.0-0 < 1.27.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) |
 | fileserver.storage.data.class | string | `""` | Storage class (use default if empty) |
@@ -282,15 +255,18 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | imageCredentials.password | string | `"pwd"` | Registry password |
 | imageCredentials.registry | string | `"docker.io"` | Registry name |
 | 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 |
+| mongodb | object | `{"architecture":"standalone","auth":{"enabled":false},"enabled":true,"persistence":{"accessModes":["ReadWriteOnce"],"enabled":true,"size":"50Gi","storageClass":null},"replicaCount":1,"updateStrategy":{"rollingUpdate":{"maxSurge":0,"maxUnavailable":1},"type":"RollingUpdate"}}` | 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":{},"affinity":{},"containerSecurityContext":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.9.2-317"},"ingress":{"annotations":{},"enabled":false,"hostName":"app.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30080,"port":8080,"type":"NodePort"},"tolerations":[]}` | Web Server configurations |
+| webserver | object | `{"additionalConfigs":{},"additionalVolumeMounts":{},"additionalVolumes":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"2.0.0-613"},"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. |
 | webserver.affinity | object | `{}` | Web Server affinity setup |
 | webserver.containerSecurityContext | object | `{}` | Web Server containers security context |
+| 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.9.2-317"}` | Web Server image configuration |
+| webserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"2.0.0-613"}` | 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 |
@@ -298,6 +274,7 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | webserver.ingress.ingressClassName | string | `""` | ClassName (must be defined if no default ingressClassName is available) |
 | webserver.ingress.path | string | `"/"` | Ingress root path url |
 | webserver.ingress.tlsSecretName | string | `""` | Reference to secret containing TLS certificate. If set, it enables HTTPS on ingress rule. |
+| webserver.initContainers | object | `{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}}` | Web Server resources per initContainers pod |
 | webserver.nodeSelector | object | `{}` | Web Server nodeselector |
 | webserver.podAnnotations | object | `{}` | specific annotation for Web Server pods |
 | webserver.podSecurityContext | object | `{}` | Web Server pod security context |
@@ -306,4 +283,6 @@ Kubernetes: `>= 1.21.0-0 < 1.27.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
@@ -11,7 +11,7 @@

 ## Introduction

-The **clearml-server** is the backend service infrastructure for [ClearML](https://github.com/allegroai/clearml).
+The **clearml-server** is the backend service infrastructure for [ClearML](https://github.com/clearml/clearml).
 It allows multiple users to collaborate and manage their experiments.

 **clearml-server** contains the following components:
@@ -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 clearml https://clearml.github.io/clearml-helm-charts
+```
+
 ## Local environment

 For development/evaluation it's possible to use [kind](https://kind.sigs.k8s.io).
@@ -57,7 +65,7 @@ nodes:
    containerPath: /var/local-path-provisioner
 EOF

-helm install clearml allegroai/clearml
+helm install clearml clearml/clearml
 ```

 After deployment, the services will be exposed on localhost on the following ports:
@@ -85,7 +93,7 @@ Just pointing the domain records to the IP where ingress controller is respondin
 A production ready cluster should also have some different configuration like the one proposed in `values-production.yaml` that can be applied with:

 ```
-helm install clearml allegroai/clearml -f values-production.yaml
+helm install clearml clearml/clearml -f values-production.yaml
 ```

 ## Upgrades/ Values upgrades
@@ -94,13 +102,13 @@ Updating to latest version of this chart can be done in two steps:

 ```
 helm repo update
-helm upgrade clearml allegroai/clearml
+helm upgrade clearml clearml/clearml
 ```

 Changing values on existing installation can be done with:

 ```
-helm upgrade clearml allegroai/clearml --version <CURRENT CHART VERSION> -f custom_values.yaml
+helm upgrade clearml clearml/clearml --version <CURRENT CHART VERSION> -f custom_values.yaml
 ```

 Please note: updating values only should always be done setting explicit chart version to avoid a possible chart update. 
@@ -114,18 +122,6 @@ Before issuing helm upgrade:
 * scale MongoDB deployment(s) replicas to 0
 * if using securityContexts check for new value form in values.yaml (podSecurityContext and containerSecurityContext)

-## ENTERPRISE Version
-
-There are some specific Enterprise version features that can be enabled only with specific Enterprise licensed images. 
-Enabling this features on OSS version can cause the entire installation to break.
-
-### Non root/privileged environments
-
-*This feature is available for Enterprise version only*
-
-In environments like Openshift or Tanzu it can be required to run non-root/non-privileged pods/containers.
-In this case it's recommended to use `values-enterprise-non-root-privileged.yaml` as base for override file.
-
 ## Additional Configuration for ClearML Server

 You can also configure the **clearml-server** for:
@@ -133,7 +129,7 @@ You can also configure the **clearml-server** for:
 * fixed users (users with credentials)
 * non-responsive experiment watchdog settings
 
-For detailed instructions, see the [Optional Configuration](https://github.com/allegroai/clearml-server#optional-configuration) section in the **clearml-server** repository README file.
+For detailed instructions, see the [Optional Configuration](https://github.com/clearml/clearml-server#optional-configuration) section in the **clearml-server** repository README file.

 {{ template "chart.sourcesSection" . }}

--- a/charts/clearml/charts/mongodb-12.1.31.tgz
+++ b/charts/clearml/charts/mongodb-12.1.31.tgz
--- a/charts/clearml/charts/mongodb-13.18.5.tgz
+++ b/charts/clearml/charts/mongodb-13.18.5.tgz
--- a/charts/clearml/templates/_helpers.tpl
+++ b/charts/clearml/templates/_helpers.tpl
@@ -153,6 +153,30 @@ Create readiness probe auth token
 {{- printf "%s:%s" .Values.clearml.readinessprobeKey .Values.clearml.readinessprobeSecret | b64enc }}
 {{- end }}

+{{/*
+Create configuration secret name
+*/}}
+{{- define "clearml.confSecretName" }}
+{{- if .Values.clearml.existingSecret -}} {{ default "clearml-conf" .Values.clearml.existingSecret | quote }} {{- else -}} "clearml-conf" {{- end }}
+{{- end }}
+
+{{/*
+compose file url
+*/}}
+{{- define "clearml.fileUrl" -}}
+{{- if .Values.clearml.clientConfigurationFilesUrl }}
+{{- .Values.clearml.clientConfigurationFilesUrl }}
+{{- else if .Values.fileserver.ingress.enabled }}
+{{- $protocol := "http" }}
+{{- if .Values.fileserver.ingress.tlsSecretName }}
+{{- $protocol = "https" }}
+{{- end }}
+{{- printf "%s%s%s" $protocol "://" .Values.fileserver.ingress.hostName }}
+{{- else }}
+{{- printf "%s%s%s%s" "http://" (include "fileserver.referenceName" .) ":" ( .Values.fileserver.service.port | toString ) }}
+{{- end }}
+{{- end }}
+
 {{/*
 Elasticsearch Service name
 */}}
@@ -167,12 +191,19 @@ Elasticsearch Service port
 {{- .Values.elasticsearch.httpPort }}
 {{- end }}

+{{/*
+Elasticsearch Service schema
+*/}}
+{{- define "elasticsearch.servicescheme" -}}
+{{- .Values.elasticsearch.httpScheme }}
+{{- end }}
+
 {{/*
 Elasticsearch Comnnection string
 */}}
 {{- define "elasticsearch.connectionstring" -}}
 {{- if .Values.elasticsearch.enabled }}
-{{- printf "[{\"host\":\"%s\",\"port\":%s}]" (include "elasticsearch.servicename" .) (include "elasticsearch.serviceport" .) | quote }}
+{{- printf "[{\"host\":\"%s\",\"port\":%s,\"scheme\":\"%s\"}]" (include "elasticsearch.servicename" .) (include "elasticsearch.serviceport" .) (include "elasticsearch.servicescheme" .) | quote }}
 {{- else }}
 {{- .Values.externalServices.elasticsearchConnectionString | quote }}
 {{- end }}
@@ -194,7 +225,7 @@ MongoDB Comnnection string
 {{- end }}

 {{/*
-MongoDB hotname
+MongoDB hostname
 */}}
 {{- define "mongodb.hostname" -}}
 {{- if eq .Values.mongodb.architecture "standalone" }}
--- a/charts/clearml/templates/apiserver-asyncdelete-deployment.yaml
+++ b/charts/clearml/templates/apiserver-asyncdelete-deployment.yaml
@@ -0,0 +1,146 @@
+{{- if .Values.apiserver.enabled }}
+{{- if (include "clearml.fileUrl" .) }}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "apiserver.referenceName" . }}-asyncdelete
+  labels:
+    {{- include "clearml.labels" . | nindent 4 }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      {{- include "clearml.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.apiserver.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "clearml.selectorLabels" . | nindent 8 }}
+    spec:
+      serviceAccountName: {{ .Values.apiserver.serviceAccountName }}-apiserver
+      {{- if .Values.imageCredentials.enabled }}
+      imagePullSecrets:
+      {{- if .Values.imageCredentials.existingSecret }}
+      - name: {{ .Values.imageCredentials.existingSecret }}
+      {{- else }}
+      - name: clearml-registry-key
+      {{- end }}
+      {{- end }}
+      {{- if or .Values.apiserver.additionalConfigs .Values.apiserver.existingAdditionalConfigsConfigMap  .Values.apiserver.existingAdditionalConfigsSecret }}
+      volumes:
+        - name: apiserver-config
+          {{- if or .Values.apiserver.existingAdditionalConfigsConfigMap }}
+          configMap:
+            name: {{ .Values.apiserver.existingAdditionalConfigsConfigMap }}
+          {{- else if or .Values.apiserver.existingAdditionalConfigsSecret }}
+          secret:
+            secretName: {{ .Values.apiserver.existingAdditionalConfigsSecret }}
+          {{- else if or .Values.apiserver.additionalConfigs }}
+          configMap:
+            name: "{{ include "apiserver.referenceName" . }}-configmap"
+          {{- end }}
+      {{- end }}
+      securityContext:
+        {{ toYaml .Values.apiserver.podSecurityContext | nindent 8 }}
+      initContainers:
+        - name: init-apiserver
+          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.apiserver.image.registry) }}{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag }}"
+          command:
+            - /bin/sh
+            - -c
+            - >
+              set -x;
+              {{- if .Values.elasticsearch.enabled }}
+              while [ $(curl -sw '%{http_code}' "http://{{ include "elasticsearch.servicename" . }}:{{ include "elasticsearch.serviceport" . }}/_cluster/health" -o /dev/null) -ne 200 ] ; do
+                echo "waiting for elasticsearch" ;
+                sleep 5 ;
+              done ;
+              {{- end }}
+              {{- if .Values.mongodb.enabled }}
+              while [ $(curl --telnet-option BOGUS --connect-timeout 2 -s "telnet://{{ .Release.Name }}-{{ include "mongodb.hostname" . }}:27017" -o /dev/null; echo $?) -ne 49 ] ; do
+                echo "waiting for mongodb" ;
+                sleep 5 ;
+              done ;
+              {{- end }}
+              {{- if .Values.redis.enabled }}
+              while [ $(curl --telnet-option BOGUS --connect-timeout 2 -s "telnet://{{ include "redis.servicename" . }}:{{ include "redis.serviceport" . }}" -o /dev/null; echo $?) -ne 49 ] ; do
+                echo "waiting for redis" ;
+                sleep 5 ;
+              done ;
+              {{- end }}
+          securityContext:
+            {{ toYaml .Values.apiserver.containerSecurityContext | nindent 12 }}
+          resources:
+            {{- toYaml .Values.apiserver.initContainers.resources | nindent 12 }}
+      containers:
+        - name: clearml-apiserver
+          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.apiserver.image.registry) }}{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag }}"
+          imagePullPolicy: {{ .Values.apiserver.image.pullPolicy }}
+          command:
+            - /bin/sh
+            - -c
+            - >
+              python3 -m jobs.async_urls_delete --fileserver-host http://{{ include "fileserver.referenceName" . }}:{{ .Values.fileserver.service.port }}
+          env:
+          - name: CLEARML_REDIS_SERVICE_HOST
+            value: {{ include "redis.servicename" . }}
+          - name: CLEARML_REDIS_SERVICE_PORT
+            value: "{{ include "redis.serviceport" . }}"
+          {{- if .Values.mongodb.enabled }}
+          - name: CLEARML_MONGODB_SERVICE_CONNECTION_STRING
+            value: {{ include "mongodb.connectionstring" . | quote }}
+          {{- else }}
+          - name: CLEARML__HOSTS__MONGO__BACKEND__HOST
+            value: {{ .Values.externalServices.mongodbConnectionStringBackend | quote }}
+          - name: CLEARML__HOSTS__MONGO__AUTH__HOST
+            value: {{ .Values.externalServices.mongodbConnectionStringAuth | quote }}
+          {{- end }}
+          - name: CLEARML__HOSTS__ELASTIC__WORKERS__HOSTS
+            value: {{ include "elasticsearch.connectionstring" . }}
+          - name: CLEARML__HOSTS__ELASTIC__EVENTS__HOSTS
+            value: {{ include "elasticsearch.connectionstring" . }}
+          - name: CLEARML__HOSTS__ELASTIC__DATASETS__HOSTS
+            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
+            value: /opt/clearml/apiserver
+          - name: CLEARML__apiserver__default_company
+            value: "{{ .Values.clearml.defaultCompanyGuid }}"
+          - name: CLEARML__services__async_urls_delete__fileserver__url_prefixes
+            value: "[\"{{ include "clearml.fileUrl" . }}\"]"
+          {{- if or .Values.apiserver.additionalConfigs .Values.apiserver.existingAdditionalConfigsConfigMap  .Values.apiserver.existingAdditionalConfigsSecret }}
+          volumeMounts:  
+            - name: apiserver-config
+              mountPath: /opt/clearml/config
+          {{- end }}
+          resources:
+            {{- toYaml .Values.apiserver.resources | nindent 12 }}
+          securityContext:
+            {{ toYaml .Values.apiserver.containerSecurityContext | nindent 12 }}
+      {{- with .Values.apiserver.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.apiserver.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.apiserver.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}
+{{- end }}
--- a/charts/clearml/templates/apiserver-deployment.yaml
+++ b/charts/clearml/templates/apiserver-deployment.yaml
@@ -5,6 +5,10 @@ metadata:
  name: {{ include "apiserver.referenceName" . }}
  labels:
    {{- include "clearml.labels" . | nindent 4 }}
+{{- with .Values.apiserver.deploymentAnnotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
  replicas: {{ .Values.apiserver.replicaCount }}
  selector:
@@ -19,6 +23,7 @@ spec:
      labels:
        {{- include "apiserver.selectorLabels" . | nindent 8 }}
    spec:
+      serviceAccountName: {{ .Values.apiserver.serviceAccountName }}-apiserver
      {{- if .Values.imageCredentials.enabled }}
      imagePullSecrets:
      {{- if .Values.imageCredentials.existingSecret }}
@@ -27,29 +32,30 @@ spec:
      - name: clearml-registry-key
      {{- end }}
      {{- end }}
-      {{- if or .Values.apiserver.additionalConfigs .Values.apiserver.existingAdditionalConfigsConfigMap  .Values.apiserver.existingAdditionalConfigsSecret }}
+      {{- if or .Values.apiserver.additionalConfigs .Values.apiserver.existingAdditionalConfigsConfigMap .Values.apiserver.existingAdditionalConfigsSecret .Values.apiserver.additionalVolumes }}
      volumes:
+        {{- if .Values.apiserver.existingAdditionalConfigsConfigMap }}
        - name: apiserver-config
-          {{- if or .Values.apiserver.existingAdditionalConfigsConfigMap }}
          configMap:
            name: {{ .Values.apiserver.existingAdditionalConfigsConfigMap }}
-          {{- else if or .Values.apiserver.existingAdditionalConfigsSecret }}
+        {{- else if .Values.apiserver.existingAdditionalConfigsSecret }}
+        - name: apiserver-config
          secret:
            secretName: {{ .Values.apiserver.existingAdditionalConfigsSecret }}
-          {{- else if or .Values.apiserver.additionalConfigs }}
+        {{- else if .Values.apiserver.additionalConfigs }}
+        - name: apiserver-config
          configMap:
            name: "{{ include "apiserver.referenceName" . }}-configmap"
-          {{- end }}
+        {{- end }}
+        {{- if .Values.apiserver.additionalVolumes }}
+        {{- toYaml .Values.apiserver.additionalVolumes | nindent 8 }}
+        {{- end }}
      {{- end }}
      securityContext:
        {{ toYaml .Values.apiserver.podSecurityContext | nindent 8 }}
      initContainers:
        - name: init-apiserver
-          {{- if .Values.enterpriseFeatures.enabled }}
-          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.apiserver.image.registry) }}{{ .Values.apiserver.image.repository }}:{{ .Values.enterpriseFeatures.apiserverImageTagOverride }}"
-          {{- else }}
          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.apiserver.image.registry) }}{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag }}"
-          {{- end }}
          command:
            - /bin/sh
            - -c
@@ -75,13 +81,11 @@ spec:
              {{- end }}
          securityContext:
            {{ toYaml .Values.apiserver.containerSecurityContext | nindent 12 }}
+          resources:
+            {{- toYaml .Values.apiserver.initContainers.resources | nindent 12 }}
      containers:
        - name: clearml-apiserver
-          {{- if .Values.enterpriseFeatures.enabled }}
-          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.apiserver.image.registry) }}{{ .Values.apiserver.image.repository }}:{{ .Values.enterpriseFeatures.apiserverImageTagOverride }}"
-          {{- else }}
          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.apiserver.image.registry) }}{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag }}"
-          {{- end }}
          imagePullPolicy: {{ .Values.apiserver.image.pullPolicy }}
          ports:
            - name: http
@@ -122,17 +126,17 @@ spec:
          - name: CLEARML__secure__credentials__apiserver__user_key
            valueFrom:
              secretKeyRef:
-                name: clearml-conf
+                name: {{ include "clearml.confSecretName" .}}
                key: apiserver_key
          - name: CLEARML__secure__credentials__apiserver__user_secret
            valueFrom:
              secretKeyRef:
-                name: clearml-conf
+                name: {{ include "clearml.confSecretName" .}}
                key: apiserver_secret
          - name: CLEARML__secure__auth__token_secret
            valueFrom:
              secretKeyRef:
-                name: clearml-conf
+                name: {{ include "clearml.confSecretName" .}}
                key: secure_auth_token_secret
          {{- if .Values.apiserver.prepopulateEnabled }}
          - name: CLEARML__APISERVER__PRE_POPULATE__ENABLED
@@ -140,90 +144,23 @@ spec:
          - name: CLEARML__APISERVER__PRE_POPULATE__ZIP_FILES
            value: "/opt/clearml/db-pre-populate"
          {{- end }}
-          {{- if .Values.enterpriseFeatures.enabled }}
-          - name: CLEARML__apiserver__default_company
-            value: "{{ .Values.enterpriseFeatures.defaultCompanyGuid }}"
-          - name: APPLY_ES_MAPPINGS
-            value: "false"
-          - name: NUMBER_OF_GUNICORN_WORKERS
-            value: "{{ .Values.apiserver.processes.count }}"
-          - name: GUNICORN_TIMEOUT
-            value: "{{ .Values.apiserver.processes.timeout }}"
-          - name: GUNICORN_MAX_REQUESTS
-            value: "{{ .Values.apiserver.processes.maxRequests }}"
-          - name: GUNICORN_MAX_REQUESTS_JITTER
-            value: "{{ .Values.apiserver.processes.maxRequestsJitter }}"
-          - name: CLEARML_CONFIG_VERBOSE
-            value: "0"
-          - name: CLEARML__SERVICES__APPLICATIONS__TEMPLATES__FOLDER
-            value: "/opt/allegro/config/applications"
-          - name: CLEARML__apiserver__apilog__prefix
-            value: "fluentd."
-          - name: CLEARML__apiserver__apilog__index_name_prefix__default
-            value: "allegro.apiserver.api-logs."
-          - name: CLEARML__apiserver__apilog__adapter
-            value: "logging"
-          - name: CLEARML__apiserver__apilog__rotation__index_size
-            value: "225000"
-          - name: CLEARML__services__tasks__non_responsive_tasks_watchdog__enabled
-            value: "false"
-          - name: CLEARML__APISERVER__AUTH__COOKIES__MAX_AGE
-            value: "2678400"
-          - name: CLEARML__services__frames__scroll_state_expiration_hours
-            value: "6"
-          - name: CLEARML__services__organization__features__applications
-            value: "true"
-          - name: CLEARML__services__organization__features__app_management
-            value: "true"
-          - name: CLEARML__SERVICES___ELASTIC__MAPPINGS__EVENTS__NUMBER_OF_REPLICAS
-            value: {{ .Values.apiserver.indexReplicas | quote }}
-          - name: CLEARML__SERVICES___ELASTIC__MAPPINGS__EVENTS__NUMBER_OF_SHARDS
-            value: {{ .Values.apiserver.indexShards | quote }}
-          - name: CLEARML__APISERVER__LOG_CALLS
-            value: "false"
-          - name: ALLEGRO_ENV
-            value: "onprem_k8s"
-          - name: CLEARML__secure__credentials__fileserver__user_key
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: fileserver_key
-          - name: CLEARML__secure__credentials__fileserver__user_secret
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: fileserver_secret
-          - name: CLEARML__secure__applications__agents_credentials__apps_agent__user_key
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: apps_agent_key
-          - name: CLEARML__secure__applications__agents_credentials__apps_agent__user_secret
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: apps_agent_secret
-          {{- else }}
          - name: CLEARML__SECURE__CREDENTIALS__TESTS__USER_KEY
            valueFrom:
              secretKeyRef:
-                name: "clearml-conf"
+                name: {{ include "clearml.confSecretName" .}}
                key: test_user_key
          - name: CLEARML__SECURE__CREDENTIALS__TESTS__USER_SECRET
            valueFrom:
              secretKeyRef:
-                name: "clearml-conf"
+                name: {{ include "clearml.confSecretName" .}}
                key: test_user_secret
          - name: CLEARML_ENV
            value: "helm-cloud"
-          {{- end }}
          {{- if .Values.apiserver.extraEnvs }}
          {{ toYaml .Values.apiserver.extraEnvs | nindent 10 }}
          {{- end }}
-          {{- if not .Values.enterpriseFeatures.enabled }}
          args:
            - apiserver
-          {{- end }}
          livenessProbe:
            initialDelaySeconds: 60
            httpGet:
@@ -233,23 +170,20 @@ spec:
            initialDelaySeconds: 60
            failureThreshold: 8
            httpGet:
-              {{- if .Values.enterpriseFeatures.enabled }}
-              path: /server.health_check
-              {{- else }}
              path: /debug.ping
-              {{- end }}
              port: 8008
              httpHeaders:
                - name: Authorization
                  value: Basic {{ include "readinessProbeAuth" . }}
-          {{- if or .Values.apiserver.additionalConfigs .Values.apiserver.existingAdditionalConfigsConfigMap  .Values.apiserver.existingAdditionalConfigsSecret }}
+          {{- if or .Values.apiserver.additionalConfigs .Values.apiserver.existingAdditionalConfigsConfigMap  .Values.apiserver.existingAdditionalConfigsSecret .Values.apiserver.additionalVolumeMounts }}
          volumeMounts:  
+            {{- if or .Values.apiserver.additionalConfigs .Values.apiserver.existingAdditionalConfigsConfigMap  .Values.apiserver.existingAdditionalConfigsSecret }}
            - name: apiserver-config
-              {{- if .Values.enterpriseFeatures.enabled }}
-              mountPath: /opt/clearml/config/default
-              {{- else }}
              mountPath: /opt/clearml/config
-              {{- end }}
+            {{- end }}
+            {{- if .Values.apiserver.additionalVolumeMounts }}
+            {{- toYaml .Values.apiserver.additionalVolumeMounts | nindent 12 }}
+            {{- end }}
          {{- end }}
          resources:
            {{- toYaml .Values.apiserver.resources | nindent 12 }}
--- a/charts/clearml/templates/apps-configmap.yaml
+++ b/charts/clearml/templates/apps-configmap.yaml
@@ -1,51 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "clearml.fullname" . }}-apps-pt
-data:
-  template.yaml: |
-    apps_queue:
-      apiVersion: v1
-      metadata:
-        namespace: {{ $.Release.Namespace }}
-      spec:
-        {{- if $.Values.imageCredentials.enabled }}
-        imagePullSecrets:
-        {{- if $.Values.imageCredentials.existingSecret }}
-          - name: {{ $.Values.imageCredentials.existingSecret }}
-        {{- else }}
-          - name: clearml-registry-key
-        {{- end }}
-        {{- end }}
-        serviceAccountName: "clearml-apps-sa"
-        securityContext:
-          {{ toYaml .Values.enterpriseFeatures.clearmlApplications.podSecurityContext | nindent 10 }}
-        volumes:
-          {{- if .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
-          - name: filemounts
-            secret:
-              secretName: {{ include "clearml.fullname" . }}-apps-fm
-          {{- end }}
-        containers:
-        - resources:
-          ports:
-            - containerPort: 10022
-          volumeMounts:
-            {{- range .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
-            - name: filemounts
-              mountPath: "{{ .folderPath }}/{{ .name }}"
-              subPath: "{{ .name }}"
-              readOnly: true
-            {{- end }}
-          env:
-          - name: CLEARML_API_HOST
-            value: "http://{{ include "apiserver.referenceName" . }}:{{ .Values.apiserver.service.port }}"
-          - name: CLEARML_FILES_HOST
-            value: "http://{{ include "fileserver.referenceName" . }}:{{ .Values.fileserver.service.port }}"
-          - name: CLEARML_WEB_HOST
-            value: "http://{{ include "webserver.referenceName" . }}:{{ .Values.webserver.service.port }}"
-          {{- if .Values.enterpriseFeatures.clearmlApplications.extraEnvs }}
-          {{ toYaml .Values.enterpriseFeatures.clearmlApplications.extraEnvs | nindent 10 }}
-          {{- end }}
-          securityContext:
-            {{ toYaml .Values.enterpriseFeatures.clearmlApplications.containerSecurityContext | nindent 12 }}
--- a/charts/clearml/templates/apps-deployment.yaml
+++ b/charts/clearml/templates/apps-deployment.yaml
@@ -1,149 +0,0 @@
-{{- if .Values.enterpriseFeatures.enabled }}
-{{- if .Values.enterpriseFeatures.clearmlApplications.enabled }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "clearmlApplications.referenceName" . }}
-  labels:
-    {{- include "clearml.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.enterpriseFeatures.clearmlApplications.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "clearmlApplications.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      {{- with .Values.enterpriseFeatures.clearmlApplications.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      labels:
-        {{- include "clearmlApplications.selectorLabels" . | nindent 8 }}
-    spec:
-      {{- if .Values.imageCredentials.enabled }}
-      imagePullSecrets:
-      {{- if .Values.imageCredentials.existingSecret }}
-      - name: {{ .Values.imageCredentials.existingSecret }}
-      {{- else }}
-      - name: clearml-registry-key
-      {{- end }}
-      {{- end }}
-      volumes:
-        - name: {{ include "clearml.fullname" . }}-apps-pt
-          configMap:
-            name: {{ include "clearml.fullname" . }}-apps-pt
-      {{- if .Values.enterpriseFeatures.clearmlApplications.additionalConfigs }}
-        - name: apps-config
-          configMap:
-            name: "{{ include "clearmlApplications.referenceName" . }}-configmap"
-      {{- end }}
-      {{- if .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
-        - name: filemounts
-          secret:
-            secretName: {{ include "clearml.fullname" . }}-apps-fm
-      {{- end }}
-      serviceAccountName: "clearml-apps-sa"
-      securityContext:
-        {{ toYaml .Values.enterpriseFeatures.clearmlApplications.podSecurityContext | nindent 8 }}
-      initContainers:
-        - name: init-apps
-          image: "{{ .Values.enterpriseFeatures.clearmlApplications.image.repository }}:{{ .Values.enterpriseFeatures.clearmlApplications.image.tag | default .Chart.AppVersion }}"
-          command:
-            - /bin/sh
-            - -c
-            - >
-              set -x;
-              while [ $(curl -sw '%{http_code}' "http://{{ include "apiserver.referenceName" . }}:{{ .Values.apiserver.service.port }}/debug.ping" -o /dev/null) -ne 200 ] ; do
-                echo "waiting for apiserver" ;
-                sleep 5 ;
-              done
-          securityContext:
-            {{ toYaml .Values.enterpriseFeatures.clearmlApplications.containerSecurityContext | nindent 12 }}
-      containers:
-        - name: clearml-apps
-          image: "{{ .Values.enterpriseFeatures.clearmlApplications.image.repository }}:{{ .Values.enterpriseFeatures.clearmlApplications.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.enterpriseFeatures.clearmlApplications.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 8008
-              protocol: TCP
-          env:
-          - name: CLEARML_API_HOST
-            value: "http://{{ include "apiserver.referenceName" . }}:{{ .Values.apiserver.service.port }}"
-          - name: CLEARML_FILES_HOST
-            value: "http://{{ include "fileserver.referenceName" . }}:{{ .Values.fileserver.service.port }}"
-          - name: CLEARML_WEB_HOST
-            value: "http://{{ include "webserver.referenceName" . }}:{{ .Values.webserver.service.port }}"
-          - name: CLEARML_DOCKER_IMAGE
-            value: "{{ .Values.enterpriseFeatures.clearmlApplications.basePodImage.repository }}:{{ .Values.enterpriseFeatures.clearmlApplications.basePodImage.tag }}"
-          - name: CLEARML_WORKER_ID
-            value: "apps-agent-1"
-          - name: CLEARML_NO_DEFAULT_SERVER
-            value: "true"
-          - name: K8S_GLUE_EXTRA_ARGS
-            value: "--namespace {{ .Release.Namespace }} --template-yaml /root/template/template.yaml \
-                    --child-report-tags application --max-pods 5 --use-owner-token"
-          - name: K8S_GLUE_QUEUE
-            value: "apps_queue"
-          - name: CLEARML_AGENT_DISABLE_SSH_MOUNT
-            value: "1"
-          - name: K8S_GLUE_POD_AGENT_INSTALL_ARGS
-            value: " -U"
-          {{ if .Values.enterpriseFeatures.clearmlApplications.containerCustomBashScript }}
-          - name: CLEARML_K8S_GLUE_POD_BASH_SCRIPT
-            value: "{{ .Values.enterpriseFeatures.clearmlApplications.containerCustomBashScript }}"
-          {{- end }}
-          - name: CLEARML_API_ACCESS_KEY
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: apps_agent_key
-          - name: CLEARML_API_SECRET_KEY
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: apps_agent_secret
-          - name: CLEARML_AGENT_GIT_USER
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: apps_git_agent_user
-          - name: CLEARML_AGENT_GIT_PASS
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: apps_git_agent_pass
-          {{- if .Values.enterpriseFeatures.clearmlApplications.extraEnvs }}
-          {{ toYaml .Values.enterpriseFeatures.clearmlApplications.extraEnvs | nindent 10 }}
-          {{- end }}
-          volumeMounts:
-          - name: {{ include "clearml.fullname" . }}-apps-pt
-            mountPath: /root/template
-          {{- if .Values.enterpriseFeatures.clearmlApplications.additionalConfigs }}
-            - name: apps-config
-              mountPath: /opt/clearml/config/default
-          {{- end }}
-          {{- range .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
-          - name: filemounts
-            mountPath: "{{ .folderPath }}/{{ .name }}"
-            subPath: "{{ .name }}"
-            readOnly: true
-          {{- end }}
-          securityContext:
-            {{ toYaml .Values.enterpriseFeatures.clearmlApplications.containerSecurityContext | nindent 12 }}
-          resources:
-            {{- toYaml .Values.enterpriseFeatures.clearmlApplications.resources | nindent 12 }}
-      {{- with .Values.enterpriseFeatures.clearmlApplications.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.enterpriseFeatures.clearmlApplications.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.enterpriseFeatures.clearmlApplications.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}
-{{- end }}
--- a/charts/clearml/templates/apps-rbac.yaml
+++ b/charts/clearml/templates/apps-rbac.yaml
@@ -1,63 +0,0 @@
-{{- if .Values.enterpriseFeatures.enabled }}
-{{- if .Values.enterpriseFeatures.clearmlApplications.enabled }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: "clearml-apps-sa"
-  namespace: {{ .Release.Namespace }}
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: {{ include "clearmlApplications.referenceName" . }}-kpa
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-    verbs: ["get", "list", "watch", "create", "patch", "delete"]
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "clearmlApplications.referenceName" . }}-kpa
-subjects:
-  - kind: ServiceAccount
-    name: "clearml-apps-sa"
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ include "clearmlApplications.referenceName" . }}-kpa
-{{- end }}
-{{- end }}
-{{- range .Values.enterpriseFeatures.clearmlApplications.additionalClusterRoleBindings }}
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ include "clearmlApplications.referenceName" $ }}-kpa-{{ . }}
-subjects:
-  - kind: ServiceAccount
-    name: "clearml-apps-sa"
-    namespace: {{ $.Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: {{ . }}
-{{- end }}
-{{- range .Values.enterpriseFeatures.clearmlApplications.additionalRoleBindings }}
---
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ include "clearmlApplications.referenceName" $ }}-kpa-{{ . }}
-subjects:
-  - kind: ServiceAccount
-    name: "clearml-apps-sa"
-    namespace: {{ $.Release.Namespace }}
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: {{ . }}
-{{- end }}
--- a/charts/clearml/templates/apps-secrets.yaml
+++ b/charts/clearml/templates/apps-secrets.yaml
@@ -1,10 +0,0 @@
-{{ if .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "clearml.fullname" . }}-apps-fm
-data:
-  {{- range .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
-  {{ .name }}: {{ .fileContent | b64enc }}
-  {{- end }}
-{{ end }}
--- a/charts/clearml/templates/clearml-secrets.yaml
+++ b/charts/clearml/templates/clearml-secrets.yaml
@@ -7,11 +7,7 @@ data:
  apiserver_secret: {{ .Values.clearml.apiserverSecret | b64enc }}
  fileserver_key: {{ .Values.clearml.fileserverKey | b64enc }}
  fileserver_secret: {{ .Values.clearml.fileserverSecret | b64enc }}
-  apps_agent_key: {{ .Values.enterpriseFeatures.clearmlApplications.agentKey | b64enc }}
-  apps_agent_secret: {{ .Values.enterpriseFeatures.clearmlApplications.agentSecret | b64enc }}
  secure_auth_token_secret: {{ .Values.clearml.secureAuthTokenSecret | b64enc }}
-  apps_git_agent_user: {{ .Values.enterpriseFeatures.clearmlApplications.gitAgentUser | b64enc }}
-  apps_git_agent_pass: {{ .Values.enterpriseFeatures.clearmlApplications.gitAgentPass | b64enc }}
  test_user_key: {{ .Values.clearml.testUserKey | b64enc }}
  test_user_secret: {{ .Values.clearml.testUserSecret | b64enc }}
 ---
--- a/charts/clearml/templates/fileserver-deployment.yaml
+++ b/charts/clearml/templates/fileserver-deployment.yaml
@@ -5,6 +5,10 @@ metadata:
  name: {{ include "fileserver.referenceName" . }}
  labels:
    {{- include "clearml.labels" . | nindent 4 }}
+{{- with .Values.fileserver.deploymentAnnotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
  replicas: {{ .Values.fileserver.replicaCount }}
  selector:
@@ -19,6 +23,7 @@ spec:
      labels:
        {{- include "fileserver.selectorLabels" . | nindent 8 }}
    spec:
+      serviceAccountName: {{ .Values.fileserver.serviceAccountName }}-fileserver
      {{- if .Values.imageCredentials.enabled }}
      imagePullSecrets:
      {{- if .Values.imageCredentials.existingSecret }}
@@ -42,15 +47,14 @@ spec:
        - name: fileserver-data
          emptyDir: {}
        {{- end }}
+        {{- if .Values.fileserver.additionalVolumes }}
+        {{- toYaml .Values.fileserver.additionalVolumes | nindent 8 }}
+        {{- end }}
      securityContext:
        {{ toYaml .Values.fileserver.podSecurityContext | nindent 8 }}
      initContainers:
        - name: init-fileserver
-          {{- if .Values.enterpriseFeatures.enabled }}
-          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.fileserver.image.registry) }}{{ .Values.fileserver.image.repository }}:{{ .Values.enterpriseFeatures.fileserverImageTagOverride }}"
-          {{- else }}
          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.fileserver.image.registry) }}{{ .Values.fileserver.image.repository }}:{{ .Values.fileserver.image.tag }}"
-          {{- end }}
          command:
            - /bin/sh
            - -c
@@ -62,13 +66,11 @@ spec:
              done
          securityContext:
            {{ toYaml .Values.fileserver.containerSecurityContext | nindent 12 }}
+          resources:
+            {{- toYaml .Values.fileserver.initContainers.resources | nindent 12 }}
      containers:
        - name: clearml-fileserver
-          {{- if .Values.enterpriseFeatures.enabled }}
-          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.fileserver.image.registry) }}{{ .Values.fileserver.image.repository }}:{{ .Values.enterpriseFeatures.fileserverImageTagOverride }}"
-          {{- else }}
          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.fileserver.image.registry) }}{{ .Values.fileserver.image.repository }}:{{ .Values.fileserver.image.tag }}"
-          {{- end }}
          imagePullPolicy: {{ .Values.fileserver.image.pullPolicy }}
          ports:
            - name: http
@@ -88,20 +90,18 @@ spec:
          - name: USER_KEY
            valueFrom:
              secretKeyRef:
-                name: clearml-conf
+                name: {{ include "clearml.confSecretName" .}}
                key: fileserver_key
          - name: USER_SECRET
            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
+              secretKeyRef: 
+                name: {{ include "clearml.confSecretName" .}}
                key: fileserver_secret
          {{- if .Values.fileserver.extraEnvs }}
          {{ toYaml .Values.fileserver.extraEnvs | nindent 10 }}
          {{- end }}
-          {{- if not .Values.enterpriseFeatures.enabled }}
          args:
            - fileserver
-          {{- end }}
          livenessProbe:
            exec:
              command:
@@ -117,6 +117,9 @@ spec:
          volumeMounts:
            - name: fileserver-data
              mountPath: /mnt/fileserver
+            {{- if .Values.fileserver.additionalVolumeMounts }}
+            {{- toYaml .Values.fileserver.additionalVolumeMounts | nindent 12 }}
+            {{- end }}
          resources:
            {{- toYaml .Values.fileserver.resources | nindent 12 }}
          securityContext:
--- a/charts/clearml/templates/serviceAccount.yaml
+++ b/charts/clearml/templates/serviceAccount.yaml
@@ -0,0 +1,26 @@
+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/templates/webserver-configmap.yaml
+++ b/charts/clearml/templates/webserver-configmap.yaml
@@ -6,24 +6,6 @@ metadata:
  labels:
    {{- include "clearml.labels" . | nindent 4 }}
 data:
-  {{- if .Values.enterpriseFeatures.enabled }}
-  configuration.json: |
-    {
-      "gettingStartedContext": {
-        "install":"pip install -U --extra-index-url {{ .Values.enterpriseFeatures.extraIndexUrl }} allegroai",
-        "configure": "allegroai-init",
-        "packageName": "allegroai",
-        "agentName": "allegroai"
-      },
-      "docsLink": "https://clear.ml/docs/",
-      "applicationsBackground": "ui-assets/apps-message.svg"
-      {{- if and .Values.enterpriseFeatures.overrideReferenceApiUrl .Values.enterpriseFeatures.overrideReferenceFileUrl }}
-      ,
-      "fileBaseUrl": "{{ .Values.enterpriseFeatures.overrideReferenceFileUrl }}",
-      "apiBaseUrl": "{{ .Values.enterpriseFeatures.overrideReferenceApiUrl }}"
-      {{- end }}
-    }
-  {{- end }}
  {{- range $key, $val := .Values.webserver.additionalConfigs }}
  {{ $key }}: |
    {{- $val | nindent 4 }}
--- a/charts/clearml/templates/webserver-deployment.yaml
+++ b/charts/clearml/templates/webserver-deployment.yaml
@@ -5,6 +5,10 @@ metadata:
  name: {{ include "webserver.referenceName" . }}
  labels:
    {{- include "clearml.labels" . | nindent 4 }}
+{{- with .Values.webserver.deploymentAnnotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
  replicas: {{ .Values.webserver.replicaCount }}
  selector:
@@ -19,6 +23,7 @@ spec:
      labels:
        {{- include "webserver.selectorLabels" . | nindent 8 }}
    spec:
+      serviceAccountName: {{ .Values.webserver.serviceAccountName }}-webserver
      {{- if .Values.imageCredentials.enabled }}
      imagePullSecrets:
      {{- if .Values.imageCredentials.existingSecret }}
@@ -31,36 +36,14 @@ spec:
        - name: webserver-config
          configMap:
            name: "{{ include "webserver.referenceName" . }}-configmap"
-        {{- if .Values.enterpriseFeatures.airGappedDocumentation.enabled }}
-        - name: documentation
-          emptyDir: {}
+        {{- if .Values.webserver.additionalVolumes }}
+        {{- toYaml .Values.webserver.additionalVolumes | nindent 8 }}
        {{- end }}
      securityContext:
        {{ toYaml .Values.webserver.podSecurityContext | nindent 8 }}
      initContainers:
-        {{- if .Values.enterpriseFeatures.airGappedDocumentation.enabled }}
-        - name: init-airgap-docs
-          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.enterpriseFeatures.airGappedDocumentation.image.registry) }}{{ .Values.enterpriseFeatures.airGappedDocumentation.image.repository }}:{{ .Values.enterpriseFeatures.airGappedDocumentation.image.tag | default .Chart.AppVersion }}"
-          command:
-            - /bin/sh
-            - -c
-            - cp -a /docs_site/* /usr/share/nginx/html/clearml
-          volumeMounts:
-            - name: webserver-config
-              mountPath: /mnt/external_files/configs
-            {{- if .Values.enterpriseFeatures.airGappedDocumentation.enabled }}
-            - mountPath: /usr/share/nginx/html/clearml
-              name: documentation
-            {{- end }}
-          securityContext:
-            {{ toYaml .Values.webserver.containerSecurityContext | nindent 12 }}
-        {{- end }}
        - name: init-webserver
-          {{- if .Values.enterpriseFeatures.enabled }}
-          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.webserver.image.registry) }}{{ .Values.webserver.image.repository }}:{{ .Values.enterpriseFeatures.webserverImageTagOverride }}"
-          {{- else }}
          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.webserver.image.registry) }}{{ .Values.webserver.image.repository }}:{{ .Values.webserver.image.tag }}"
-          {{- end }}
          command:
            - /bin/sh
            - -c
@@ -72,69 +55,33 @@ spec:
              done
          securityContext:
            {{ toYaml .Values.webserver.containerSecurityContext | nindent 12 }}
+          resources:
+            {{- toYaml .Values.webserver.initContainers.resources | nindent 12 }}
      containers:
        - name: clearml-webserver
-          {{- if .Values.enterpriseFeatures.enabled }}
-          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.webserver.image.registry) }}{{ .Values.webserver.image.repository }}:{{ .Values.enterpriseFeatures.webserverImageTagOverride }}"
-          {{- else }}
          image: "{{ include "registryNamePrefix" (dict "globalValues" .Values.global "imageRegistryValue" .Values.webserver.image.registry) }}{{ .Values.webserver.image.repository }}:{{ .Values.webserver.image.tag }}"
-          {{- end }}
          imagePullPolicy: {{ .Values.webserver.image.pullPolicy }}
          ports:
            - name: http
-              {{- if .Values.enterpriseFeatures.enabled }}
-              containerPort: 8080
-              {{- else }}
              containerPort: 80
-              {{- end }}
              protocol: TCP
          livenessProbe:
            exec:
              command:
                - curl
                - -X OPTIONS
-                {{- if .Values.enterpriseFeatures.enabled }}
-                - http://localhost:8080/
-                {{- else }}
                - http://localhost:80/
-                {{- end }}
          readinessProbe:
            exec:
              command:
                - curl
                - -X OPTIONS
-                {{- if .Values.enterpriseFeatures.enabled }}
-                - http://localhost:8080/
-                {{- else }}
                - http://localhost:80/
-                {{- end }}
          env:
          - name: NGINX_APISERVER_ADDRESS
            value: "http://{{ include "apiserver.referenceName" . }}:{{ .Values.apiserver.service.port }}"
          - name: NGINX_FILESERVER_ADDRESS
            value: "http://{{ include "fileserver.referenceName" . }}:{{ .Values.fileserver.service.port }}"
-          {{- if .Values.enterpriseFeatures.enabled }}
-          {{- if .Values.enterpriseFeatures.airGappedDocumentation.enabled }}
-          - name: WEBSERVER__docsLink
-            value: "\"clearml/docs/\""
-          {{- end }}
-          - name: COMPANY_ID
-            value: "{{ .Values.clearml.defaultCompany }}"
-          - name: WEBSERVER__appsYouTubeIntroLink
-            value: "\"https://www.youtube.com/embed/HACL60h1Z54\""
-          - name: WEBSERVER__appsYouTubeIntroVideoId
-            value: "\"HACL60h1Z54\""
-          - name: USER_KEY
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: apiserver_key
-          - name: USER_SECRET
-            valueFrom:
-              secretKeyRef:
-                name: clearml-conf
-                key: apiserver_secret
-          {{- end }}
          {{- if include "clearml.clientConfiguration" . }}
          - name: WEBSERVER__displayedServerUrls
            value: {{ include "clearml.clientConfiguration" . | quote }} 
@@ -142,16 +89,13 @@ spec:
          {{- if .Values.webserver.extraEnvs }}
          {{ toYaml .Values.webserver.extraEnvs | nindent 10 }}
          {{- end }}
-          {{- if not .Values.enterpriseFeatures.enabled }}
          args:
            - webserver
-          {{- end }}
          volumeMounts:
            - name: webserver-config
              mountPath: /mnt/external_files/configs
-            {{- if .Values.enterpriseFeatures.airGappedDocumentation.enabled }}
-            - mountPath: /usr/share/nginx/html/clearml
-              name: documentation
+            {{- if .Values.webserver.additionalVolumeMounts }}
+            {{- toYaml .Values.webserver.additionalVolumeMounts | nindent 12 }}
            {{- end }}
          resources:
            {{- toYaml .Values.webserver.resources | nindent 12 }}
--- a/charts/clearml/templates/webserver-service.yaml
+++ b/charts/clearml/templates/webserver-service.yaml
@@ -13,11 +13,7 @@ spec:
  type: {{ .Values.webserver.service.type }}
  ports:
    - port: {{ .Values.webserver.service.port }}
-      {{- if .Values.enterpriseFeatures.enabled }}
-      targetPort: 8080
-      {{- else }}
      targetPort: 80
-      {{- end }}
      {{- if eq .Values.webserver.service.type "NodePort" }}
      nodePort: {{ .Values.webserver.service.nodePort }}
      {{- end }}
--- a/charts/clearml/values-enterprise-non-root-privileged.yaml
+++ b/charts/clearml/values-enterprise-non-root-privileged.yaml
@@ -1,84 +0,0 @@
-# These values are for ENTERPRISE version only and they need to be adapted to specific infrastructure needs
-# containerSecurityContext is highly related to Kubernetes distribution used/configuration and will probably
-# need to be customized accordingly
-
-apiserver:
-  containerSecurityContext:
-    runAsUser: 1000
-    runAsNonRoot: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    seccompProfile:
-      type: RuntimeDefault
-
-fileserver:
-  containerSecurityContext:
-    runAsUser: 1000
-    runAsNonRoot: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    seccompProfile:
-      type: RuntimeDefault
-
-webserver:
-  containerSecurityContext:
-    runAsUser: 1000
-    runAsNonRoot: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    seccompProfile:
-      type: RuntimeDefault
-
-enterpriseFeatures:
-  enabled: true
-  clearmlApplications:
-    containerSecurityContext:
-      runAsUser: 1000
-      runAsNonRoot: true
-      allowPrivilegeEscalation: false
-      capabilities:
-        drop: ["ALL"]
-      seccompProfile:
-        type: RuntimeDefault
-    containerCustomBashScript: |
-      export HOME=/tmp ;
-      export LOCAL_PYTHON=python3 ; 
-      $LOCAL_PYTHON -m pip install clearml-agent{agent_install_args} ; 
-      $LOCAL_PYTHON -m clearml_agent execute {default_execution_agent_args} --id {task_id}
-    extraEnvs:
-      - name: CLEARML_K8S_GLUE_START_AGENT_SCRIPT_PATH
-        value: /tmp/__start_agent__.sh
-      - name: HOME
-        value: /tmp
-
-redis:
-  master:
-    containerSecurityContext:
-      runAsNonRoot: true
-      allowPrivilegeEscalation: false
-      capabilities:
-        drop: ["ALL"]
-      seccompProfile:
-        type: RuntimeDefault
-mongodb:
-  containerSecurityContext:
-    enabled: true
-    runAsNonRoot: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    seccompProfile:
-      type: RuntimeDefault
-elasticsearch:
-  sysctlInitContainer:
-    enabled: false
-  securityContext:
-    runAsNonRoot: true
-    allowPrivilegeEscalation: false
-    capabilities:
-      drop: ["ALL"]
-    seccompProfile:
-      type: RuntimeDefault
--- a/charts/clearml/values-production.yaml
+++ b/charts/clearml/values-production.yaml
@@ -17,16 +17,8 @@ webserver:
    enabled: true
    hostName: "app.clearml.127-0-0-1.nip.io"
 redis:
+  architecture: replication
  master:
-    name: "{{ .Release.Name }}-redis"
-    persistence:
-      enabled: true
-      accessModes:
-        - ReadWriteOnce
-      size: 5Gi
-      ## If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner
-      storageClass: null
-  slave:
    persistence:
      enabled: true
      accessModes:
@@ -34,10 +26,12 @@ redis:
      size: 5Gi
      ## If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner
      storageClass: null
+  replica:
+    replicaCount: 2
 mongodb:
  enabled: true
  architecture: replicaset
-  replicaCount: 3
+  replicaCount: 2
  arbiter:
    enabled: false
  pdb:
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -48,19 +48,28 @@ clearml:
  clientConfigurationApiUrl: ""
  # -- Override the Files Urls displayed when showing an example of the SDK's clearml.conf configuration
  clientConfigurationFilesUrl: ""
+  # -- Pass Clearml secrets using an existing secret
+  # must contain the keys: apiserver_key, apiserver_secret, secure_auth_token_secret, test_user_key, test_user_secret
+  existingSecret: ""

 # -- Api Server configurations
 apiserver:
  # -- Enable/Disable component deployment
  enabled: true
+  # -- Add the provided map to the annotations for the Deployment resource created by this chart.
+  deploymentAnnotations:
  # -- Enable/Disable example data load
  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.9.2-317"
+    tag: "2.0.0-613"
  # -- Api Server internal service configuration
  service:
    # -- specific annotation for Api Server service
@@ -72,6 +81,15 @@ apiserver:
    nodePort: 30008
  # -- Api Server number of pods
  replicaCount: 1
+  # -- Api Server resources per initContainers pod
+  initContainers:
+    resources:
+      requests:
+        cpu: 10m
+        memory: 64Mi
+      limits:
+        cpu: 10m
+        memory: 64Mi
  # -- Ingress configuration for Api Server component
  ingress:
    # -- Enable/Disable ingress
@@ -98,10 +116,6 @@ apiserver:
    maxRequestsJitter: 300
  # -- Api Server extra envrinoment variables
  extraEnvs: []
-  # -- Number of additional replicas in Elasticsearch indexes
-  indexReplicas: 0
-    # -- Number of shards in Elasticsearch indexes
-  indexShards: 1
  # -- specific annotation for Api Server pods
  podAnnotations: {}
  # -- Api Server resources per pod; these are minimal requirements, it's suggested to increase
@@ -159,17 +173,33 @@ apiserver:
  #         ]
  #       }
  #     }
+  # -- # Defines extra Kubernetes volumes to be attached to the pod.
+  additionalVolumes: {}
+  #  - name: ramdisk
+  #    emptyDir:
+  #      medium: Memory
+  #      sizeLimit: 32Gi
+  # -- Specifies where and how the volumes defined in additionalVolumes.
+  additionalVolumeMounts: {}
+  #  - mountPath: /dev/shm
+  #    name: ramdisk

 # -- File Server configurations
 fileserver:
  # -- Enable/Disable component deployment
  enabled: true
+  # -- Add the provided map to the annotations for the Deployment resource created by this chart.
+  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.9.2-317"
+    tag: "2.0.0-613"
  # -- File Server internal service configuration
  service:
    # -- specific annotation for File Server service
@@ -181,6 +211,15 @@ fileserver:
    nodePort: 30081
  # -- File Server number of pods
  replicaCount: 1
+  # -- File Server resources per initContainers pod
+  initContainers:
+    resources:
+      requests:
+        cpu: 10m
+        memory: 64Mi
+      limits:
+        cpu: 10m
+        memory: 64Mi
  # -- Ingress configuration for File Server component
  ingress:
    # -- Enable/Disable ingress
@@ -232,17 +271,33 @@ fileserver:
      # -- Access mode (must be ReadWriteMany if fileserver replica > 1)
      accessMode: ReadWriteOnce
      size: 50Gi
+  # -- # Defines extra Kubernetes volumes to be attached to the pod.
+  additionalVolumes: {}
+  #  - name: ramdisk
+  #    emptyDir:
+  #      medium: Memory
+  #      sizeLimit: 32Gi
+  # -- Specifies where and how the volumes defined in additionalVolumes.
+  additionalVolumeMounts: {}
+  #  - mountPath: /dev/shm
+  #    name: ramdisk

 # -- Web Server configurations
 webserver:
  # -- Enable/Disable component deployment
  enabled: true
+  # -- Add the provided map to the annotations for the Deployment resource created by this chart.
+  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.9.2-317"
+    tag: "2.0.0-613"
  # -- Web Server internal service configuration
  service:
    # -- specific annotation for Web Server service
@@ -254,6 +309,15 @@ webserver:
    nodePort: 30080
  # -- Web Server number of pods
  replicaCount: 1
+  # -- Web Server resources per initContainers pod
+  initContainers:
+    resources:
+      requests:
+        cpu: 10m
+        memory: 64Mi
+      limits:
+        cpu: 10m
+        memory: 64Mi
  # -- Ingress configuration for Web Server component
  ingress:
    # -- Enable/Disable ingress
@@ -295,18 +359,27 @@ webserver:
  #   fsGroup: 1001
  # -- Additional specific webserver configurations
  additionalConfigs: {}
+  # -- # Defines extra Kubernetes volumes to be attached to the pod.
+  additionalVolumes: {}
+  #  - name: ramdisk
+  #    emptyDir:
+  #      medium: Memory
+  #      sizeLimit: 32Gi
+  # -- Specifies where and how the volumes defined in additionalVolumes.
+  additionalVolumeMounts: {}
+  #  - mountPath: /dev/shm
+  #    name: ramdisk

 # -- Definition of external services to use if not enabled as dependency charts here
 externalServices:
  # -- Existing ElasticSearch connectionstring if elasticsearch.enabled is false (example in values.yaml)
-  elasticsearchConnectionString: ""
-  #    [{"host":"hostname1","port":9200},{"host":"hostname2","port":9200},{"host":"hostname3","port":9200}]
-  # -- Existing MongoDB connection string for BACKEND to use if mongodb.enabled is false
-  mongodbConnectionStringAuth: ""
-  # -- Existing MongoDB connection string for AUTH to use if mongodb.enabled is false
-  mongodbConnectionStringBackend: ""
-  # -- Existing Redis Hostname to use if redis.enabled is false
-  redisHost: ""
+  elasticsearchConnectionString: "[{\"host\":\"es_hostname1\",\"port\":9200},{\"host\":\"es_hostname2\",\"port\":9200},{\"host\":\"es_hostname3\",\"port\":9200}]"
+  # -- Existing MongoDB connection string for BACKEND to use if mongodb.enabled is false (example in values.yaml)
+  mongodbConnectionStringAuth: "mongodb://mongodb_hostname:27017/auth"
+  # -- Existing MongoDB connection string for AUTH to use if mongodb.enabled is false (example in values.yaml)
+  mongodbConnectionStringBackend: "mongodb://mongodb_hostnamehostname:27017/backend"
+  # -- Existing Redis Hostname to use if redis.enabled is false (example in values.yaml)
+  redisHost: "redis_hostname"
  # -- Existing Redis Port to use if redis.enabled is false
  redisPort: 6379

@@ -331,6 +404,11 @@ redis:
 # -- Configuration from https://github.com/bitnami/charts/blob/master/bitnami/mongodb/values.yaml
 mongodb:
  enabled: true
+  updateStrategy:
+    rollingUpdate:
+      maxSurge: 0
+      maxUnavailable: 1
+    type: RollingUpdate
  architecture: standalone
  auth:
    enabled: false
@@ -355,7 +433,8 @@ elasticsearch:
  replicas: 1
  # Readiness probe hack for a single-node cluster (where status will never be green). Should be removed if using replicas > 1
  clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
-
+  rbac:
+    create: true
  minimumMasterNodes: 1
  clusterName: clearml-elastic
  esJavaOpts: "-Xmx2g -Xms2g"
@@ -397,91 +476,3 @@ elasticsearch:
  esConfig:
    elasticsearch.yml: |
      xpack.security.enabled: false
-
-# -- Enterprise features (work only with an Enterprise license)
-enterpriseFeatures:
-  # -- Enable/Disable Enterprise features
-  enabled: false
-  # -- Company ID
-  defaultCompanyGuid: "d1bd92a3b039400cbafc60a7a5b1e52b"
-  # -- Image tag override for apiserver enterprise version
-  apiserverImageTagOverride: "3.16.0-959"
-  # -- Image tag override for fileserver enterprise version
-  fileserverImageTagOverride: "3.16.0-959"
-  # -- Image tag override for webserver enterprise version
-  webserverImageTagOverride: "3.16-922"
-  # -- Air gapped documentation  configurations
-  airGappedDocumentation:
-    # -- Enable/Disable air gapped documentation deployment
-    enabled: false
-    # -- Air gapped documentation image configuration
-    image:
-      registry: ""
-      repository: ""
-      tag: "4"
-  # -- set this value AND overrideReferenceFileUrl if external endpoint exposure is in place (like a LoadBalancer)
-  # example: "https://api.clearml.local"
-  overrideReferenceApiUrl: ""
-  # -- set this value AND overrideReferenceAPIUrl if external endpoint exposure is in place (like a LoadBalancer)
-  # example: "https://files.clearml.local"
-  overrideReferenceFileUrl: ""
-  # -- extra index URL for Enterprise packages
-  extraIndexUrl: ""
-  # -- APPS configurations
-  clearmlApplications:
-    # -- Apps Server basic auth key
-    agentKey: GK4PRTVT3706T25K6BA1
-    # -- Apps Server basic auth secret
-    agentSecret: ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2
-    # -- Apps Server Git user
-    gitAgentUser: "git_user"
-    # -- Apps Server Git password
-    gitAgentPass: "git_password"
-    # -- Enable/Disable component deployment
-    enabled: true
-    # -- APPS image configuration
-    image:
-      repository: ""
-      pullPolicy: IfNotPresent
-      tag: "1.24-58"
-    # -- APPS base spawning pods image
-    basePodImage:
-      repository: ""
-      tag: "app-1.1.1-47"
-    # -- APPS number of pods
-    replicaCount: 1
-    # -- APPS extra envrinoment variables
-    extraEnvs: []
-    # -- additional existing ClusterRoleBindings
-    additionalClusterRoleBindings: []
-    # - privileged
-    # -- additional existing RoleBindings
-    additionalRoleBindings: []
-    # - privileged
-    # -- Custom Bash script for the APPS Agent pod ran by Glue Agent
-    customBashScript: ""
-    # -- Custom Bash script for the APPS Task Pods ran by Glue Agent
-    containerCustomBashScript: ""
-    # -- APPS pod security context
-    podSecurityContext: {}
-    # -- APPS containers security context
-    containerSecurityContext: {}
-    # -- file definition
-    fileMounts: []
-    # -- specific annotation for APPS pods
-    podAnnotations: {}
-    # -- APPS resources per pod; these are minimal requirements, it's suggested to increase
-    # these values in production environments
-    resources:
-      requests:
-        cpu: 100m
-        memory: 256Mi
-      limits:
-        cpu: 2000m
-        memory: 1Gi
-    # -- APPS nodeselector
-    nodeSelector: {}
-    # -- APPS tolerations setup
-    tolerations: []
-    # -- APPS affinity setup
-    affinity: {}
Author	SHA1	Message	Date
riccardocaselli-clearml	747c018adb	Issue 343: [clearml] apiserver-asyncdelete cannot start (-> CrashLoopBackOff in kubernetes) (#353 ) Some checks failed Release Charts / release (push) Has been cancelled Details Close inactive issues / close-issues (push) Has been cancelled Details Fixed: casted port to string before concatenation Co-authored-by: Casell <supercasell@gmail.com>	2025-03-12 10:27:22 +01:00
Filippo Brintazzoli	299cc2adb4	Changed: Support kubernetes 1.32 (#351 ) Some checks failed Release Charts / release (push) Has been cancelled Details Close inactive issues / close-issues (push) Has been cancelled Details Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-02-25 11:47:55 +01:00
Filippo Brintazzoli	1479cf9ed2	[Serving] Changed: Support kubernetes 1.32 (#350 ) * Changed: Support kubernetes 1.32 * Changed: increase version --------- Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-02-25 11:31:22 +01:00
Filippo Brintazzoli	2a4d9569f3	[Agent] Changed: Support kubernetes 1.32 (#349 ) * Changed: Support kubernetes 1.32 * Changed: increase version --------- Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-02-25 11:28:07 +01:00
Filippo Brintazzoli	6c212f5b82	Changed: ClearML GH Organization Rename (#347 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-01-21 17:29:57 +01:00
Filippo Brintazzoli	4885e01750	Fixed: ClearML org rename (#346 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-01-21 17:04:32 +01:00
Filippo Brintazzoli	311f6ea9e0	Fixed: ClearML org rename (#345 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-01-21 17:03:57 +01:00
Filippo Brintazzoli	966a0e69ab	Fixed: ClearML org rename (#344 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-01-21 17:03:00 +01:00
Filippo Brintazzoli	4cd31fa843	Fixed: release because of previous artifacthub fix (#341 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-01-09 11:05:31 +01:00
Filippo Brintazzoli	6b2954ab9f	Fixed: artifacthub annotation (#340 ) Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-01-09 10:50:00 +01:00
Filippo Brintazzoli	fc518f9389	Changed: App v2.0 and MongoDB v6 (#339 ) * Changed: App v2.0 and MongoDB v6 * Fixed: helm-docs --------- Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-01-09 10:05:12 +01:00
Filippo Brintazzoli	389159aa0c	[clearml] Updated app version to 1.17.1 and MongoDB v5 (#338 ) * Changed: Updated app version 1.17.1 * Changed: updated to Mongo 5 --------- Co-authored-by: fbrintazzoli <filippo.brintazzoli@clear.ml>	2025-01-03 09:58:48 +01:00
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
Valeriano Manassero	ad3bdf2372	CreateQueue disabled by default (#294 ) * Fixed: create queue disable by default * Changed: bump up * Fixed: command composition	2024-06-06 09:51:21 +02:00
Daglar Berk Erdem	6cd821742b	fix volumeMount indentation (#298 ) * fix volumeMount indentation * version bump	2024-06-06 09:31:52 +02:00
Daglar Berk Erdem	ac96346607	feature: ability to add volume and volumeMounts to deployments (#296 )	2024-06-04 11:34:41 +02:00
Daglar Berk Erdem	312813cc34	Added: deploymentAnnotations (#292 ) * added deploymentAnnotations * version minor bump * fixed version in README * removed precommit file --------- Co-authored-by: Dağlar Berk Erdem <daglar@codeway.co>	2024-05-28 08:40:54 +02:00
Uzmar Gomez	255cabfd7f	Feature/multiplequeues (#286 ) * copy changes * add workflow when push * update readme * update readme * delete test workflow * bump chart version to 5.2.0 * test ci * delete test ci * bump kubeversion * update readme * Update Chart.yaml --------- Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2024-05-15 16:19:40 +02:00
Valeriano Manassero	204e2ac350	Fixed: 1.5.6 release (#289 )	2024-05-15 09:32:02 +02:00
Valeriano Manassero	56d246fcea	Added: k8s 1.30 support (#288 )	2024-05-15 09:26:44 +02:00
Valeriano Manassero	0e4a809d46	Added: 1.30 support (#287 )	2024-05-15 08:59:34 +02:00
Uzmar Gomez	cfe62484af	Use existingClearmlConfigSecret (#283 ) * use config as secret * update chart and readme * avoid creating secret if not needed * move string on values.yaml	2024-05-14 11:05:03 +02:00
Valeriano Manassero	5ded87ec92	Update 1.15.1 (#284 ) * Changed: 1.15.1 update * Changed: bump up version	2024-05-14 08:24:24 +02:00
stephanbertl	65393cd4bf	affinity for serving deployments was incorrectly put under containers… (#280 ) * affinity for serving deployments was incorrectly put under containers. It needs to be put at pod spec level. * Fixed: helm docs generation * Fixed: helm-docs generation --------- Co-authored-by: = <s.bertl@iaea.org> Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2024-05-07 14:03:29 +02:00
savitha-qs	4845bd3f4f	Issue-275: Honor existingAgentk8sglueSecret in deployment template (#276 ) * Issue-275: Honor existingAgentk8sglueSecret in deployment template * Issue-275: rev the patch version of the chart * Issue-275: update README for clearml-agent chart * Issue-275: update annotation in Chart.yaml * Issue-275: remove item not relevant to Issue 275 from Chart annotations * Issue-275: add new line to end of file to get lint to pass * Update Chart.yaml --------- Co-authored-by: Savitha Ganapathi <sganapathi@quantumscape.com> Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2024-04-02 08:47:14 +02:00
Valeriano Manassero	4cb8db5baf	277 apiserver and asyncdelete apiserver having the same selector (#278 ) * Fixed: asyncdelete wrong selector * Changed: bump up	2024-03-28 14:12:55 +01:00
Valeriano Manassero	4242e518ae	273 clearml chart service async delete not deleting files (#274 ) * Fixed: missing asyncdelete config mount * Changed: bump up version	2024-03-26 14:33:26 +01:00
Valeriano Manassero	4ca4bc82c4	Release 1.15.0 (#272 ) * Changed: upgrade app to 1.15 * Fixed: missing scheme * Added: async delete	2024-03-21 14:58:07 +01:00
Valeriano Manassero	75d9086bb9	Changed: bump up version (#271 )	2024-03-21 14:47:57 +01:00
Valeriano Manassero	546c2b6d2e	Changed: bump up to support k8s 1.29 (#270 ) * Changed: bump up to support k8s 1.29 * Changed: k8s versions * Changed: exclude serving * Fixed: changes	2024-02-20 10:57:17 +01:00
Valeriano Manassero	0a2bc7c2a8	Update 1.14.1 (#269 ) * Changed: bump version to 1.14.1 * Changed: bump up version	2024-02-13 16:17:00 +01:00
Valeriano Manassero	25de2dfaeb	262 clearml agent wrong nindent for agentk8sglue deployment template (#267 ) * Fixed: wrong indentation * Changed: bump up	2024-01-10 09:23:52 +01:00
Valeriano Manassero	28d9fe82f6	Fix label typo (#266 ) * Fixed: clearml labels function reference name * Changed: bump up version	2024-01-09 17:18:58 +01:00
Valeriano Manassero	e680990d10	App 1.14 (#264 ) * Changed: app version to 1.14 * Changed: bump chart version	2024-01-05 08:06:23 +01:00
stephanbertl	fdbbe5b90d	fixed #256 . added runtimeClassName and fixed incorrect placement of nodeSelector (#259 ) * fixed #256. nodeSelector was incorrectly placed under the container. moved it to pod spec added runtimeClassName to the pod spec to select specific GPU nodes. * increment version number * added artifacthub.io/changes * update readme.md * try to fix helm docs generation issue * update readme.md * Update README.md * Update README.md * Update README.md * Update README.md --------- Co-authored-by: IAEA_SG\BERTLS <s.bertl@iaea.org> Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2023-11-20 14:37:01 +01:00
Valeriano Manassero	eff09794bd	Upgrade app 1.13 (#260 ) * Changed: app version upgrade * Changed: bump up chart * Changed: helm-docs update * Changed: ci update * Fixed: depth	2023-11-16 07:40:10 +01:00
Valeriano Manassero	d13ad20e34	Fix serving extraenvs (#258 ) * Fixed: missing extraEnvs * Changed: bump version	2023-10-27 07:41:19 +02:00
Valeriano Manassero	5ed9673ea1	254 clearml server helper function wrong readiness probes fail because wrong redis service is referenced (#257 ) * Fixed: redis name generation * Changed: bump up version	2023-10-25 16:15:15 +02:00
Valeriano Manassero	0892882cf7	Mount files additionalconfigs (#255 ) * Added: mount file for additional configs in pod * Changed: bump up version * Fixed: missing parameters for deployment * Fixed naming typo * Changed: changelog fixes added	2023-10-25 15:20:46 +02:00
Erik Jacobs	a1673ae8e4	adds a default clearml-core service account for the core components (#253 ) * adds a default clearml-core service account for the core components * Changed: use many sa * Fixed: sa name * Fixed: sa name * Fixed: sa name * Fixed: naming * Update README.md --------- Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2023-09-27 09:19:55 +02:00
Valeriano Manassero	503ab437ad	246 allegroaiclearml elastic statefulset does not use a dedicated serviceaccount (#252 ) * Fixed: missing serviceAccount for elasticsearch * Changed: bump up version	2023-08-22 08:12:12 +02:00
Valeriano Manassero	a36519536b	250 clearml serving issue title (#251 ) * Fixed: name reference * Changed: bump up version	2023-08-18 10:30:21 +02:00
Valeriano Manassero	b42a93e361	248 any chart test on kubernetes 128 (#249 ) * Changed: updated k8s versions * Added: support for 1.28 * Fixed: typo in annotation	2023-08-16 08:47:10 +02:00
Valeriano Manassero	d170d0f606	Changed: released version (#245 )	2023-08-02 09:18:20 +02:00
Valeriano Manassero	43495f4a59	Upgrade app 1.12 (#244 ) * Changed: upgrade app to 1.12 * Changed: helm-docs update	2023-08-02 09:16:20 +02:00
Robin	5ef3727154	add imagecredentials to triton docker image (#242 ) * add imagecredentials to triton docker image * bump version * add secrets to all serving charts * add changelog entry * Fixed: removed one chart annotations --------- Co-authored-by: Robin <robinvandijk@klippa.com> Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2023-07-19 11:53:25 +02:00
Valeriano Manassero	3f7d1a1c1e	240 fix init container waits forever pinging a redis in production config (#241 ) * Fixed: unused leftover * Fixed: init container fail * Changed: bump up version	2023-07-19 11:28:26 +02:00
Jan Wytze Zuidema	c8aaf91f52	Add the ability to disable Serving Statistics and to configure the Kafka url (#239 ) Co-authored-by: Jan Wytze Zuidema <janwytze@klippa.com>	2023-06-30 09:58:07 +02:00
Valeriano Manassero	65671a35b2	225 clear ml serving ingress doesnt work (#235 ) * Changed: removed deprecated network policy * Changed: bump up * Changed: bump up * Fixed: missing ingress names * Changed: changelog update	2023-06-19 17:00:46 +02:00
Valeriano Manassero	dd2289f3e1	Changed: template update (#237 )	2023-06-19 16:59:00 +02:00
Valeriano Manassero	a53b0e8eac	233 clearml default externalservices values (#234 ) * Added: default externalServices values * Changed: bump up version	2023-06-16 09:23:30 +02:00
Valeriano Manassero	bad5618226	Repo templating (#232 ) * Added: issue templates * Added: pr template	2023-06-16 09:00:40 +02:00
Valeriano Manassero	8b5cc58675	229 resouces in the values file for agentk8sglue deployment (#230 ) * Added: resources definitions * Changed: bump up	2023-06-15 09:05:38 +02:00
Valeriano Manassero	63bc2c944c	227 agentk8sglue configmapyaml contains a double name tag for the imagepullsecrets (#228 ) * Fixed: typo * Changed: bump up	2023-06-14 15:53:19 +02:00
Tino Tap	2080cae5e8	Issue #218 (#219 ) * Update values.yaml added existingAdditionalSecret * add existingSecret * Update values.yaml * better implemented * Update Chart.yaml to version 7.2.1 * Update values.yaml added documentation to values.yaml * artifact hub annotations * Changed: moved to helper function * Changed: helm-docs update * changed the key to exstingSecret om _helpers --------- Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2023-06-14 15:43:23 +02:00
Valeriano Manassero	2861b5b074	Serving-1.3 (#226 ) * Fixed: if triton is disabled, ignore autoscaling * Changed: app version bump to 1.3.0 * Changed: bump up * Changed: bump up	2023-06-14 10:14:22 +02:00
Valeriano Manassero	9ba1d0ac1a	Added artifact hub annotations (#224 )	2023-06-13 13:35:30 +02:00
Jan Wytze Zuidema	22a7dea1fb	Add the ability to define custom environment variables for inference (#221 ) (#222 ) Co-authored-by: Jan Wytze Zuidema <janwytze@klippa.com>	2023-06-08 15:32:21 +02:00
Valeriano Manassero	550b7ca527	Fix ci (#223 ) * Fixed: no chart change detected * Fixed: get entire depth	2023-06-08 15:01:49 +02:00
Valeriano Manassero	3f67293663	Update CONTRIBUTING.md (#220 )	2023-06-08 09:12:57 +02:00
Valeriano Manassero	9131a64b38	214 missing resources in initcontainers (#217 ) * Added: initContainers resources definition * Changed: version bump	2023-06-07 08:34:19 +02:00
pollfly	61d9d931ae	Edit README (#215 )	2023-06-07 08:10:29 +02:00
Valeriano Manassero	80372304cd	Changed: application version upgrade to 1.11 (#213 )	2023-05-29 17:21:07 +02:00
Valeriano Manassero	78ba93a0df	210 wrong usage of extra python packages environment variable (#212 ) * Fixed: env var name reference * Changed: version bump	2023-05-29 12:55:00 +02:00
Valeriano Manassero	1b6b3dce94	Changed: slack channel reference (#209 )	2023-05-18 11:12:03 +03:00
Valeriano Manassero	1ba6440c58	[Serving] Fix resources setting (#208 ) * Fixed: resources * Changed: bump up version * Fixed: indentation * Fixed: indentation	2023-05-11 16:35:40 +02:00
Valeriano Manassero	5b31ea8599	Remove unsupported dynamic svc (#206 ) * Removed: unsupported values * Changed: version bump * Changed: removed not needed value * Changed: helm-docs * Removed: unsupported values	2023-05-08 17:25:01 +02:00
Valeriano Manassero	876df432d4	Changed: version bump	2023-04-14 12:11:19 +02:00
Valeriano Manassero	bf755ed6b8	Changed: set replication for this scenario	2023-04-14 12:11:10 +02:00
Valeriano Manassero	9b6372d730	Fixed: redis svc name creation	2023-04-14 12:10:55 +02:00
Valeriano Manassero	25af4a4d8f	Changed: remove enterprise features (#204 )	2023-04-13 17:44:58 +02:00
Valeriano Manassero	da2fb44479	Check compatibility with k8s 1.27 (#203 ) * Fixed: typo * Added: k8s 1.27 * Changed: bump up version * Changed: actions versions bump up * Fixed: gh action usage * Fixed: deep chackout	2023-04-12 09:07:11 +02:00
Valeriano Manassero	d1f46dac7a	Fix missing events permissions (#202 ) * Added: events * Changed: bump up version	2023-04-04 07:22:06 +02:00
Valeriano Manassero	02163e3779	Refactor affinity agent (#201 ) * Changed: refactor affinity section * Changed: bump up version	2023-03-30 22:45:21 +02:00
Valeriano Manassero	01f1b8703d	Fix indentation nodeaffinity (#200 ) * Fixed: indentation * Changed: bump up version	2023-03-30 15:16:49 +02:00
Valeriano Manassero	dad921e562	Affinity patch (#199 ) * Fixed: affiniti indentation * Changed: bump up version	2023-03-30 14:26:33 +02:00
Valeriano Manassero	9be7ad40c0	Enterprise backofflimit (#198 ) * Fixed: typo * Fixed: backoff limit * Changed: bump up version * Changed: helm docs update	2023-03-30 11:56:57 +02:00
Valeriano Manassero	4f1cebab11	Upgrade app to 1.10 (#197 ) * Changed: image update to 1.10 * Changed: bump up version	2023-03-29 11:54:57 +02:00
Valeriano Manassero	870338ebff	195 missing initcontainers section in agentk8sglue configmapyaml (#196 ) * Added: init-container * Changed: bump up version	2023-03-24 08:14:52 +01:00
Valeriano Manassero	27b52fa5b3	193 after upgrade to the new chart version error (#194 ) * Fixed: agent selector label * Changed: version bump	2023-03-20 15:16:23 +01:00
Valeriano Manassero	4e3169c033	flow for charts changes only (#192 )	2023-03-20 11:59:15 +01:00