233 clearml default externalservices values (#234 )

* Added: default externalServices values * Changed: bump up version
Repo templating (#232 )
2025-04-17 01:31:13 +00:00 · 2023-06-16 09:23:30 +02:00 · 2023-06-16 09:00:40 +02:00 · 2023-06-15 09:05:38 +02:00 · 2023-06-14 15:53:19 +02:00 · 2023-06-14 15:43:23 +02:00
70 changed files with 601 additions and 1698 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,82 @@
+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:
+  - valeriano-manassero
+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: what-happened
+    attributes:
+      label: What happened?
+      description: Enter exactly what happened.
+    validations:
+      required: false
+  - type: textarea
+    id: what-expected
+    attributes:
+      label: What you expected to happen?
+      description: Enter what you expected to happen.
+    validations:
+      required: false
+  - type: textarea
+    id: how-to-reproduce
+    attributes:
+      label: How to reproduce it?
+      description: As minimally and precisely as possible.
+    validations:
+      required: false
+  - 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
+  - type: textarea
+    id: helm-command
+    attributes:
+      label: Enter the command that you execute and failing/misfunctioning.
+      description: Enter the command as-is as how you executed.
+      placeholder: helm install my-release prometheus-community/name-of-chart --version version --values values.yaml
+    validations:
+      required: true
+  - type: textarea
+    id: anything-else
+    attributes:
+      label: Anything else we need to know?
+    validations:
+      required: 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:
+  - valeriano-manassero
+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/allegroai/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/allegroai/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,6 +1,11 @@
-#!/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')"
+if [[ -z "$CHART_DIRS" ]]; then
+    echo "No Chart.yaml changes detected, aborting helm-docs"
+    exit 1
+fi
+
 HELM_DOCS_VERSION="1.11.0"

 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
--- 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@v3.5.0
+        with:
+          fetch-depth: 0
      - name: Run helm-docs
        run: .github/helm-docs.sh
  install-chart:
@@ -22,30 +24,42 @@ jobs:
    strategy:
      matrix:
        k8s:
-          - v1.24.7
-          - v1.25.3
-          - v1.26.0
+          - v1.24.12
+          - v1.25.8
+          - v1.26.3
+          - v1.27.0
    steps:
      - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v3.5.0
+        with:
+          fetch-depth: 0
      - name: Create kind ${{ matrix.k8s }} cluster
        uses: helm/kind-action@v1.5.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.4.0
      - name: Add bitnami repo
        run: helm repo add bitnami https://charts.bitnami.com/bitnami
      - name: Add elastic repo
        run: helm repo add elastic https://helm.elastic.co
+      - name: Add prometheus repo
+        run: helm repo add prometheus https://prometheus-community.github.io/helm-charts
+      - name: Add grafana repo
+        run: helm repo add grafana https://grafana.github.io/helm-charts
      - 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
@@ -17,6 +17,10 @@ jobs:
        run: helm repo add bitnami https://charts.bitnami.com/bitnami
      - name: Add elastic repo
        run: helm repo add elastic https://helm.elastic.co
+      - name: Add prometheus repo
+        run: helm repo add prometheus https://prometheus-community.github.io/helm-charts
+      - name: Add grafana repo
+        run: helm repo add grafana https://grafana.github.io/helm-charts
      - name: Configure Git
        run: |
          git config user.name "$GITHUB_ACTOR"
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,7 +4,7 @@

 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)
+* Participating in issue discussions in the [issue tracker](https://github.com/allegroai/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

@@ -51,10 +51,13 @@ 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*`
+* 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/README.md
+++ b/README.md
@@ -46,13 +46,13 @@ 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).

--- a/charts/clearml-agent/Chart.yaml
+++ b/charts/clearml-agent/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: clearml-agent
 description: MLOps platform Task running agent
 type: application
-version: "4.0.2"
+version: "5.1.0"
 appVersion: "1.24"
-kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
+kubeVersion: ">= 1.21.0-0 < 1.28.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
@@ -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: added
+      description: resource parameters for agentk8sglue
--- 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.1.0](https://img.shields.io/badge/Version-5.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24](https://img.shields.io/badge/AppVersion-1.24-informational?style=flat-square)

 MLOps platform Task running agent

@@ -34,26 +34,12 @@ Changing values on existing installation can be done with:
 helm upgrade clearml-agent allegroai/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>
@@ -61,13 +47,13 @@ Keep in mind it's not possible to install packages on non-root containers so ima

 ## Requirements

-Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.28.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":{},"defaultContainerImage":"ubuntu:18.04","extraEnvs":[],"fileMounts":[],"fileServerUrlReference":"https://files.clear.ml","image":{"registry":"","repository":"allegroai/clearml-agent-k8s-base","tag":"1.24-21"},"initContainers":{"resources":{}},"labels":{},"nodeSelector":{},"podSecurityContext":{},"queue":"default","replicaCount":1,"resources":{},"serviceExistingAccountName":"","tolerations":[],"volumeMounts":[],"volumes":[],"webServerUrlReference":"https://app.clear.ml"}` | This agent will spawn queued experiments in new pods, a good use case is to combine this with GPU autoscaling nodes. https://github.com/allegroai/clearml-agent/tree/master/docker/k8s-glue |
 | agentk8sglue.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 +77,21 @@ 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.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.replicaCount | int | `1` | Glue Agent number of pods |
+| agentk8sglue.resources | object | `{}` | Glue Agent pod resources |
 | agentk8sglue.serviceExistingAccountName | string | `""` | if set, don't create a serviceAccountName but use defined existing one |
-| agentk8sglue.taskAsJob | bool | `false` | ClearML spawn tasks as jobs instead of pods |
 | 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 +102,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 +111,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
@@ -31,26 +31,12 @@ Changing values on existing installation can be done with:
 helm upgrade clearml-agent allegroai/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
@@ -104,26 +98,15 @@ 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 }}"
            {{- 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 }}"
+              value: "--namespace {{ .Release.Namespace }} --template-yaml /root/template/template.yaml"
            {{- end }}
            {{- if .Values.clearml.clearmlConfig }}
            - 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
@@ -144,65 +127,27 @@ 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:
--- a/charts/clearml-agent/templates/agentk8sglue-rbac.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-rbac.yaml
@@ -5,47 +5,6 @@ metadata:
  name: {{ include "clearmlAgent.serviceAccountName" . }}
  namespace: {{ .Release.Namespace }}
 {{- 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 +17,7 @@ rules:
      - pods
      - secrets
      - services
+      - events
    verbs: ["get", "list", "watch", "create", "patch", "delete"]
  - apiGroups:
      - ""
@@ -85,7 +45,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/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
@@ -47,15 +47,20 @@ agentk8sglue:
  # -- Glue Agent number of pods
  replicaCount: 1

+  # -- Glue Agent pod resources
+  resources: {}
+
+  # -- Glue Agent pod initContainers configs
+  initContainers:
+    # -- Glue Agent initcontainers pod resources
+    resources: {}
+
  # -- if set, don't create a serviceAccountName but use defined existing one
  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
@@ -67,19 +72,12 @@ agentk8sglue:
  defaultContainerImage: ubuntu:18.04
  # -- ClearML queue this agent will consume
  queue: default
-  # -- ClearML spawn tasks as jobs instead of pods
-  taskAsJob: false
-  # -- Custom Bash script for the Glue Agent
  # -- 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 +214,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 +224,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.lock
+++ b/charts/clearml-serving/Chart.lock
@@ -0,0 +1,12 @@
+dependencies:
+- name: kafka
+  repository: https://charts.bitnami.com/bitnami
+  version: 21.4.0
+- name: prometheus
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 19.7.2
+- name: grafana
+  repository: https://grafana.github.io/helm-charts
+  version: 6.52.3
+digest: sha256:b28d01875a50b24230ba164d14671225b71d79172192a97e345661e4832f484b
+generated: "2023-03-16T09:10:35.77395+01:00"
--- a/charts/clearml-serving/Chart.yaml
+++ b/charts/clearml-serving/Chart.yaml
@@ -2,9 +2,14 @@ apiVersion: v2
 name: clearml-serving
 description: ClearML Serving Helm Chart
 type: application
-version: 0.7.0
-appVersion: "1.2.0"
-kubeVersion: ">= 1.19.0-0 < 1.26.0-0"
+version: "1.2.0"
+appVersion: "1.3.0"
+kubeVersion: ">= 1.21.0-0 < 1.28.0-0"
+home: https://clear.ml
+icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
+sources:
+  - https://github.com/allegroai/clearml-helm-charts
+  - https://github.com/allegroai/clearml
 maintainers:
  - name: valeriano-manassero
    url: https://github.com/valeriano-manassero
@@ -13,3 +18,22 @@ keywords:
  - "machine learning"
  - mlops
  - "model serving"
+dependencies:
+  - name: kafka
+    version: "21.4.0"
+    repository: "https://charts.bitnami.com/bitnami"
+    condition: kafka.enabled
+  - name: prometheus
+    version: "19.7.2"
+    repository: "https://prometheus-community.github.io/helm-charts"
+    condition: prometheus.enabled
+  - name: grafana
+    version: "6.52.3"
+    repository: "https://grafana.github.io/helm-charts"
+    condition: grafana.enabled
+annotations:
+  artifacthub.io/changes: |
+    - kind: changed
+      description: app version to 1.3.0
+    - kind: fixed
+      description: triton hpa disabled if triton disabled
--- a/charts/clearml-serving/README.md
+++ b/charts/clearml-serving/README.md
@@ -1,55 +1,98 @@
-# clearml-serving
+# ClearML Kubernetes Serving

-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.2.0](https://img.shields.io/badge/AppVersion-1.2.0-informational?style=flat-square)
+![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-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

+**Homepage:** <https://clear.ml>
+
 ## Maintainers

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

+## Introduction
+
+The **clearml-serving** is the Kubernetes serving for for [ClearML](https://github.com/allegroai/clearml-serving).
+It allows you to serve models on a Kubernetes cluster.
+
+# Upgrading Chart
+
+## Upgrades/ Values upgrades
+
+Updating to latest version of this chart can be done in two steps:
+
+```
+helm repo update
+helm upgrade clearml-serving allegroai/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
+```
+
+## Source Code
+
+* <https://github.com/allegroai/clearml-helm-charts>
+* <https://github.com/allegroai/clearml>
+
 ## Requirements

-Kubernetes: `>= 1.19.0-0 < 1.26.0-0`
+Kubernetes: `>= 1.21.0-0 < 1.28.0-0`
+
+| Repository | Name | Version |
+|------------|------|---------|
+| https://charts.bitnami.com/bitnami | kafka | 21.4.0 |
+| https://grafana.github.io/helm-charts | grafana | 6.52.3 |
+| https://prometheus-community.github.io/helm-charts | prometheus | 19.7.2 |

 ## Values

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| alertmanager | object | `{"affinity":{},"image":{"repository":"prom/alertmanager","tag":"v0.23.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Alertmanager generic configigurations |
 | clearml | object | `{"apiAccessKey":"ClearML API Access Key","apiHost":"http://clearml-server-apiserver:8008","apiSecretKey":"ClearML API Secret Key","defaultBaseServeUrl":"http://127.0.0.1:8080/serve","filesHost":"http://clearml-server-fileserver:8081","servingTaskId":"ClearML Serving Task ID","webHost":"http://clearml-server-webserver:80"}` | ClearMl generic configurations |
-| clearml_serving_inference | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-inference","tag":"1.2.0"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving inference configurations |
+| clearml_serving_inference | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50},"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.affinity | object | `{}` | Affinity configuration |
 | clearml_serving_inference.autoscaling | object | `{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50}` | Autoscaling configuration |
+| 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.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
+| 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 |
+| clearml_serving_inference.ingress.hostName | string | `"serving.clearml.127-0-0-1.nip.io"` | Ingress hostname domain |
+| clearml_serving_inference.ingress.ingressClassName | string | `""` | ClassName (must be defined if no default ingressClassName is available) |
+| clearml_serving_inference.ingress.path | string | `"/"` | Ingress root path url |
+| clearml_serving_inference.ingress.tlsSecretName | string | `""` | Reference to secret containing TLS certificate. If set, it enables HTTPS on ingress rule. |
 | 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 | `{"affinity":{},"extraPythonPackages":[],"image":{"repository":"allegroai/clearml-serving-statistics","tag":"1.3.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving statistics configurations |
 | clearml_serving_statistics.affinity | object | `{}` | Affinity configuration |
 | clearml_serving_statistics.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
-| clearml_serving_statistics.image | 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","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | ClearML serving Triton configurations |
+| 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.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.affinity | object | `{}` | Affinity configuration |
 | clearml_serving_triton.autoscaling | object | `{"enabled":false,"maxReplicas":11,"minReplicas":1,"targetCPU":50,"targetMemory":50}` | Autoscaling configuration |
 | clearml_serving_triton.enabled | bool | `true` | Triton pod creation enable/disable |
 | clearml_serving_triton.extraPythonPackages | list | `[]` | Extra Python Packages to be installed in running pods |
-| clearml_serving_triton.image | object | `{"repository":"allegroai/clearml-serving-triton","tag":"1.2.0-22.07"}` | Container Image |
-| clearml_serving_triton.ingress | object | `{"annotations":{},"enabled":false,"hostName":"serving-grpc.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""}` | Ingress exposing configurations |
+| clearml_serving_triton.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 |
+| clearml_serving_triton.ingress.hostName | string | `"serving-grpc.clearml.127-0-0-1.nip.io"` | Ingress hostname domain |
+| clearml_serving_triton.ingress.ingressClassName | string | `""` | ClassName (must be defined if no default ingressClassName is available) |
+| clearml_serving_triton.ingress.path | string | `"/"` | Ingress root path url |
+| clearml_serving_triton.ingress.tlsSecretName | string | `""` | Reference to secret containing TLS certificate. If set, it enables HTTPS on ingress rule. |
 | clearml_serving_triton.nodeSelector | object | `{}` | Node Selector configuration |
 | clearml_serving_triton.resources | object | `{}` | Pod resources definition |
 | clearml_serving_triton.tolerations | list | `[]` | Tolerations configuration |
-| grafana | object | `{"affinity":{},"image":{"repository":"grafana/grafana","tag":"8.4.4-ubuntu"},"ingress":{"annotations":{},"enabled":false,"hostName":"serving-grafana.clearml.127-0-0-1.nip.io","path":"/","tlsSecretName":""},"nodeSelector":{},"resources":{},"tolerations":[]}` | Grafana generic configigurations |
-| kafka | object | `{"affinity":{},"image":{"repository":"bitnami/kafka","tag":"3.1.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Kafka generic configigurations |
-| prometheus | object | `{"affinity":{},"image":{"repository":"prom/prometheus","tag":"v2.34.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Prometheus generic configigurations |
-| zookeeper | object | `{"affinity":{},"image":{"repository":"bitnami/zookeeper","tag":"3.7.0"},"nodeSelector":{},"resources":{},"tolerations":[]}` | Zookeeper generic configigurations |
-
----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
+| grafana | object | `{"adminPassword":"clearml","adminUser":"admin","datasources":{"datasources.yaml":{"apiVersion":1,"datasources":[{"access":"proxy","isDefault":true,"name":"Prometheus","type":"prometheus","url":"http://{{ .Release.Name }}-prometheus-server"}]}},"enabled":true}` | Configuration from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml |
+| kafka | object | `{"enabled":true}` | Configuration from https://github.com/bitnami/charts/blob/main/bitnami/kafka/values.yaml |
+| prometheus | object | `{"enabled":true,"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
@@ -0,0 +1,38 @@
+# ClearML Kubernetes Serving
+{{ template "chart.deprecationWarning" . }}
+
+{{ template "chart.badgesSection" . }}
+
+{{ template "chart.description" . }}
+
+{{ template "chart.homepageLine" . }}
+
+{{ template "chart.maintainersSection" . }}
+
+## Introduction
+
+The **clearml-serving** is the Kubernetes serving for for [ClearML](https://github.com/allegroai/clearml-serving).
+It allows you to serve models on a Kubernetes cluster.
+
+# Upgrading Chart
+
+## Upgrades/ Values upgrades
+
+Updating to latest version of this chart can be done in two steps:
+
+```
+helm repo update
+helm upgrade clearml-serving allegroai/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
+```
+
+{{ template "chart.sourcesSection" . }}
+
+{{ template "chart.requirementsSection" . }}
+
+{{ template "chart.valuesSection" . }}
--- a/charts/clearml-serving/charts/grafana-6.52.3.tgz
+++ b/charts/clearml-serving/charts/grafana-6.52.3.tgz
--- a/charts/clearml-serving/charts/kafka-21.4.0.tgz
+++ b/charts/clearml-serving/charts/kafka-21.4.0.tgz
--- a/charts/clearml-serving/charts/prometheus-19.7.2.tgz
+++ b/charts/clearml-serving/charts/prometheus-19.7.2.tgz
--- a/charts/clearml-serving/templates/_helpers.tpl
+++ b/charts/clearml-serving/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "clearml-serving.name" -}}
+{{- define "clearmlServing.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}

@@ -10,7 +10,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "clearml-serving.fullname" -}}
+{{- define "clearmlServing.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "clearml-serving.chart" -}}
+{{- define "clearmlServing.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}

 {{/*
 Common labels
 */}}
-{{- define "clearml-serving.labels" -}}
-helm.sh/chart: {{ include "clearml-serving.chart" . }}
-{{ include "clearml-serving.selectorLabels" . }}
+{{- define "clearmlServing.labels" -}}
+helm.sh/chart: {{ include "clearmlServing.chart" . }}
+{{ include "clearmlServing.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "clearml-serving.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "clearml-serving.name" . }}
+{{- define "clearmlServing.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "clearmlServing.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}

 {{/*
 Create the name of the service account to use
 */}}
-{{- define "clearml-serving.serviceAccountName" -}}
+{{- define "clearmlServing.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "clearml-serving.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "clearmlServing.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
--- a/charts/clearml-serving/templates/alertmanager-deployment.yaml
+++ b/charts/clearml-serving/templates/alertmanager-deployment.yaml
@@ -1,27 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: alertmanager
-  name: alertmanager
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      clearml.serving.service: alertmanager
-  strategy: {}
-  template:
-    metadata:
-      annotations: {}
-      labels:
-        clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: alertmanager
-    spec:
-      containers:
-        - image: "{{ .Values.alertmanager.image.repository }}:{{ .Values.alertmanager.image.tag }}"
-          name: clearml-serving-alertmanager
-          ports:
-            - containerPort: 9093
-          resources: {}
-      restartPolicy: Always
--- a/charts/clearml-serving/templates/alertmanager-service.yaml
+++ b/charts/clearml-serving/templates/alertmanager-service.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: alertmanager
-  name: clearml-serving-alertmanager
-spec:
-  ports:
-    - name: "9093"
-      port: 9093
-      targetPort: 9093
-  selector:
-    clearml.serving.service: alertmanager
--- a/charts/clearml-serving/templates/clearml-serving-backend-networkpolicy.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-backend-networkpolicy.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: clearml-serving-backend
+  name: {{ include "clearmlServing.fullname" . }}-backend
 spec:
  ingress:
    - from:
--- a/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
@@ -3,20 +3,20 @@ kind: Deployment
 metadata:
  annotations: {}
  labels:
-    clearml.serving.service: clearml-serving-inference
-  name: clearml-serving-inference
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
+  name: {{ include "clearmlServing.fullname" . }}-inference
 spec:
  replicas: 1
  selector:
    matchLabels:
-      clearml.serving.service: clearml-serving-inference
+      clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
  strategy: {}
  template:
    metadata:
      annotations: {}
      labels:
        clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: clearml-serving-inference
+        clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
    spec:
      containers:
        - env:
@@ -31,14 +31,14 @@ spec:
            - name: CLEARML_WEB_HOST
              value: "{{ .Values.clearml.webHost }}"
            - name: CLEARML_DEFAULT_KAFKA_SERVE_URL
-              value: clearml-serving-kafka:9092
+              value: {{ include "clearmlServing.fullname" . }}-kafka:9092
            - name: CLEARML_SERVING_POLL_FREQ
              value: "1.0"
            - name: CLEARML_DEFAULT_BASE_SERVE_URL
              value: "{{ .Values.clearml.defaultBaseServeUrl }}"
            - name: CLEARML_DEFAULT_TRITON_GRPC_ADDR
            {{- if .Values.clearml_serving_triton.enabled }}
-              value: "clearml-serving-triton:8001"
+              value: "{{ include "clearmlServing.fullname" . }}-triton:8001"
            {{- else }}
              value: ""
            {{- end }}
@@ -51,12 +51,16 @@ 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: clearml-serving-inference
+          name: {{ include "clearmlServing.fullname" . }}-inference
          ports:
            - containerPort: 8080
-          resources: {}
+          resources:
+            {{- toYaml .Values.clearml_serving_inference.resources | nindent 12 }}
      restartPolicy: Always
--- a/charts/clearml-serving/templates/clearml-serving-inference-hpa.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-hpa.yaml
@@ -2,16 +2,16 @@
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:
-  name: clearml-serving-inference-hpa
+  name: {{ include "clearmlServing.fullname" . }}-inference-hpa
  namespace: {{ .Release.Namespace | quote }}
  annotations: {}
  labels:
-    clearml.serving.service: clearml-serving-inference
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
 spec:
  scaleTargetRef:
    apiVersion: "apps/v1"
    kind: Deployment
-    name: clearml-serving-inference
+    name: {{ include "clearmlServing.fullname" . }}-inference
  minReplicas: {{ .Values.clearml_serving_inference.autoscaling.minReplicas }}
  maxReplicas: {{ .Values.clearml_serving_inference.autoscaling.maxReplicas }}
  metrics:
--- a/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-ingress.yaml
@@ -8,9 +8,9 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: clearml-serving-inference
+  name: {{ include "clearmlServing.fullname" . }}-inference
  labels:
-    clearml.serving.service: clearml-serving-inference
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
  annotations:
    {{- toYaml .Values.clearml_serving_inference.ingress.annotations | nindent 4 }}
 spec:
@@ -29,12 +29,12 @@ spec:
        pathType: Prefix
        backend:
          service:
-            name: clearml-serving-inference
+            name: {{ include "clearmlServing.fullname" . }}-inference
            port:
              number: 8080
  {{ else }}
        backend:
-          serviceName: clearml-serving-inference
+          servicename: {{ include "clearmlServing.fullname" . }}-inference
          servicePort: 8080
  {{ end }}
 {{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-inference-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-service.yaml
@@ -3,12 +3,12 @@ kind: Service
 metadata:
  annotations: {}
  labels:
-    clearml.serving.service: clearml-serving-inference
-  name: clearml-serving-inference
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
+  name: {{ include "clearmlServing.fullname" . }}-inference
 spec:
  ports:
    - name: "8080"
      port: 8080
      targetPort: 8080
  selector:
-    clearml.serving.service: clearml-serving-inference
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-inference
--- a/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
@@ -3,20 +3,20 @@ kind: Deployment
 metadata:
  annotations: {}
  labels:
-    clearml.serving.service: clearml-serving-statistics
-  name: clearml-serving-statistics
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
+  name: {{ include "clearmlServing.fullname" . }}-statistics
 spec:
  replicas: 1
  selector:
    matchLabels:
-      clearml.serving.service: clearml-serving-statistics
+      clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
  strategy: {}
  template:
    metadata:
      annotations: {}
      labels:
        clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: clearml-serving-statistics
+        clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
    spec:
      containers:
        - env:
@@ -31,18 +31,19 @@ spec:
            - name: CLEARML_WEB_HOST
              value: "{{ .Values.clearml.webHost }}"
            - name: CLEARML_DEFAULT_KAFKA_SERVE_URL
-              value: clearml-serving-kafka:9092
+              value: {{ include "clearmlServing.fullname" . }}-kafka:9092
            - 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 }}
          image: "{{ .Values.clearml_serving_statistics.image.repository }}:{{ .Values.clearml_serving_statistics.image.tag }}"
-          name: clearml-serving-statistics
+          name: {{ include "clearmlServing.fullname" . }}-statistics
          ports:
            - containerPort: 9999
-          resources: {}
+          resources:
+            {{- toYaml .Values.clearml_serving_statistics.resources | nindent 12 }}
      restartPolicy: Always
--- a/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-service.yaml
@@ -3,12 +3,12 @@ kind: Service
 metadata:
  annotations: {}
  labels:
-    clearml.serving.service: clearml-serving-statistics
-  name: clearml-serving-statistics
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
+  name: {{ include "clearmlServing.fullname" . }}-statistics
 spec:
  ports:
    - name: "9999"
      port: 9999
      targetPort: 9999
  selector:
-    clearml.serving.service: clearml-serving-statistics
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-statistics
--- a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
@@ -4,20 +4,20 @@ kind: Deployment
 metadata:
  annotations: {}
  labels:
-    clearml.serving.service: clearml-serving-triton
-  name: clearml-serving-triton
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
+  name: {{ include "clearmlServing.fullname" . }}-triton
 spec:
  replicas: 1
  selector:
    matchLabels:
-      clearml.serving.service: clearml-serving-triton
+      clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
  strategy: {}
  template:
    metadata:
      annotations: {}
      labels:
        clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: clearml-serving-triton
+        clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
    spec:
      containers:
        - env:
@@ -38,14 +38,15 @@ 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 }}
          image: "{{ .Values.clearml_serving_triton.image.repository }}:{{ .Values.clearml_serving_triton.image.tag }}"
-          name: clearml-serving-triton
+          name: {{ include "clearmlServing.fullname" . }}-triton
          ports:
            - containerPort: 8001
-          resources: {}
+          resources:
+            {{- toYaml .Values.clearml_serving_triton.resources | nindent 12 }}
      restartPolicy: Always
 {{ end }}

--- a/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-hpa.yaml
@@ -1,17 +1,18 @@
+{{- if .Values.clearml_serving_triton.enabled }}
 {{- if .Values.clearml_serving_triton.autoscaling.enabled }}
 apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ ) }}
 kind: HorizontalPodAutoscaler
 metadata:
-  name: clearml-serving-triton-hpa
+  name: {{ include "clearmlServing.fullname" . }}-triton-hpa
  namespace: {{ .Release.Namespace | quote }}
  annotations: {}
  labels:
-    clearml.serving.service: clearml-serving-triton
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
 spec:
  scaleTargetRef:
    apiVersion: "apps/v1"
    kind: Deployment
-    name: clearml-serving-triton
+    name: {{ include "clearmlServing.fullname" . }}-triton
  minReplicas: {{ .Values.clearml_serving_triton.autoscaling.minReplicas }}
  maxReplicas: {{ .Values.clearml_serving_triton.autoscaling.maxReplicas }}
  metrics:
@@ -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
@@ -9,9 +9,9 @@ apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: clearml-serving-triton
+  name: {{ include "clearmlServing.fullname" . }}-triton
  labels:
-    clearml.serving.service: clearml-serving-triton
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
  annotations:
    {{- toYaml .Values.clearml_serving_triton.ingress.annotations | nindent 4 }}
 spec:
@@ -30,12 +30,12 @@ spec:
        pathType: Prefix
        backend:
          service:
-            name: clearml-serving-triton
+            name: {{ include "clearmlServing.fullname" . }}-triton
            port:
              number: 8001
  {{ else }}
        backend:
-          serviceName: clearml-serving-triton
+          servicename: {{ include "clearmlServing.fullname" . }}-triton
          servicePort: 8001
  {{ end }}
 {{- end }}
--- a/charts/clearml-serving/templates/clearml-serving-triton-service.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-service.yaml
@@ -4,13 +4,13 @@ kind: Service
 metadata:
  annotations: {}
  labels:
-    clearml.serving.service: clearml-serving-triton
-  name: clearml-serving-triton
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
+  name: {{ include "clearmlServing.fullname" . }}-triton
 spec:
  ports:
    - name: "8001"
      port: 8001
      targetPort: 8001
  selector:
-    clearml.serving.service: clearml-serving-triton
+    clearml.serving.service: {{ include "clearmlServing.fullname" . }}-triton
 {{ end }}
--- a/charts/clearml-serving/templates/grafana-config-secret.yaml
+++ b/charts/clearml-serving/templates/grafana-config-secret.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: grafana-config
-stringData:
-  datasource.yaml: |-
-    apiVersion: 1
-
-    datasources:
-      - name: Prometheus
-        type: prometheus
-        # Access mode - proxy (server in the UI) or direct (browser in the UI).
-        access: proxy
-        url: http://clearml-serving-prometheus:9090
--- a/charts/clearml-serving/templates/grafana-deployment.yaml
+++ b/charts/clearml-serving/templates/grafana-deployment.yaml
@@ -1,35 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: grafana
-  name: grafana
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      clearml.serving.service: grafana
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      annotations: {}
-      labels:
-        clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: grafana
-    spec:
-      containers:
-        - image: "{{ .Values.grafana.image.repository }}:{{ .Values.grafana.image.tag }}"
-          name: clearml-serving-grafana
-          ports:
-            - containerPort: 3000
-          resources: {}
-          volumeMounts:
-            - mountPath: /etc/grafana/provisioning/datasources/
-              name: grafana-conf
-      restartPolicy: Always
-      volumes:
-        - name: grafana-conf
-          secret:
-            secretName: grafana-config
--- a/charts/clearml-serving/templates/grafana-ingress.yaml
+++ b/charts/clearml-serving/templates/grafana-ingress.yaml
@@ -1,40 +0,0 @@
-{{- if .Values.grafana.ingress.enabled -}}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: clearml-serving-grafana
-  labels:
-    clearml.serving.service: clearml-serving-grafana
-  annotations:
-    {{- toYaml .Values.grafana.ingress.annotations | nindent 4 }}
-spec:
-  {{- if .Values.grafana.ingress.tlsSecretName }}
-  tls:
-    - hosts:
-        - {{ .Values.grafana.ingress.hostName }}
-      secretName: {{ .Values.grafana.ingress.tlsSecretName }}
-  {{- end }}
-  rules:
-  - host: {{ .Values.grafana.ingress.hostName }}
-    http:
-      paths:
-      - path: {{ .Values.grafana.ingress.path }}
-  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
-        pathType: Prefix
-        backend:
-          service:
-            name: clearml-serving-grafana
-            port:
-              number: 3000
-  {{ else }}
-        backend:
-          serviceName: clearml-serving-grafana
-          servicePort: 3000
-  {{ end }}
-{{- end }}
--- a/charts/clearml-serving/templates/grafana-service.yaml
+++ b/charts/clearml-serving/templates/grafana-service.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: grafana
-  name: clearml-serving-grafana
-spec:
-  ports:
-    - name: "3000"
-      port: 3000
-      targetPort: 3000
-  selector:
-    clearml.serving.service: grafana
--- a/charts/clearml-serving/templates/kafka-deployment.yaml
+++ b/charts/clearml-serving/templates/kafka-deployment.yaml
@@ -1,40 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: kafka
-  name: kafka
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      clearml.serving.service: kafka
-  strategy: {}
-  template:
-    metadata:
-      annotations: {}
-      labels:
-        clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: kafka
-    spec:
-      containers:
-        - env:
-            - name: ALLOW_PLAINTEXT_LISTENER
-              value: "yes"
-            - name: KAFKA_BROKER_ID
-              value: "1"
-            - name: KAFKA_CFG_ADVERTISED_LISTENERS
-              value: PLAINTEXT://clearml-serving-kafka:9092
-            - name: KAFKA_CFG_LISTENERS
-              value: PLAINTEXT://0.0.0.0:9092
-            - name: KAFKA_CFG_ZOOKEEPER_CONNECT
-              value: clearml-serving-zookeeper:2181
-            - name: KAFKA_CREATE_TOPICS
-              value: '"topic_test:1:1"'
-          image: "{{ .Values.kafka.image.repository }}:{{ .Values.kafka.image.tag }}"
-          name: clearml-serving-kafka
-          ports:
-            - containerPort: 9092
-          resources: {}
-      restartPolicy: Always
--- a/charts/clearml-serving/templates/kafka-service.yaml
+++ b/charts/clearml-serving/templates/kafka-service.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: kafka
-  name: clearml-serving-kafka
-spec:
-  ports:
-    - name: "9092"
-      port: 9092
-      targetPort: 9092
-  selector:
-    clearml.serving.service: kafka
--- a/charts/clearml-serving/templates/prometheus-config-secret.yaml
+++ b/charts/clearml-serving/templates/prometheus-config-secret.yaml
@@ -1,28 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: prometheus-config
-stringData:
-  prometheus.yml: |-
-    global:
-      scrape_interval:     "15s" # By default, scrape targets every 15 seconds.
-      evaluation_interval:     15s # By default, scrape targets every 15 seconds.
-      external_labels:
-        monitor: 'clearml-serving'
-
-    scrape_configs:
-      # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
-      - job_name: 'prometheus'
-
-        scrape_interval: 5s
-
-        static_configs:
-          - targets: ['localhost:9090']
-
-      # The job name is added as a label `job=<job_name>` to any timeseries scraped from this config.
-      - job_name: 'clearml-inference-stats'
-
-        scrape_interval: 5s
-
-        static_configs:
-          - targets: ['clearml-serving-statistics:9999']
--- a/charts/clearml-serving/templates/prometheus-deployment.yaml
+++ b/charts/clearml-serving/templates/prometheus-deployment.yaml
@@ -1,42 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: prometheus
-  name: prometheus
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      clearml.serving.service: prometheus
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      annotations: {}
-      labels:
-        clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: prometheus
-    spec:
-      containers:
-        - args:
-            - --config.file=/mnt/prometheus.yml
-            - --storage.tsdb.path=/prometheus
-            - --web.console.libraries=/etc/prometheus/console_libraries
-            - --web.console.templates=/etc/prometheus/consoles
-            - --storage.tsdb.retention.time=200h
-            - --web.enable-lifecycle
-          image: "{{ .Values.prometheus.image.repository }}:{{ .Values.prometheus.image.tag }}"
-          name: clearml-serving-prometheus
-          ports:
-            - containerPort: 9090
-          resources: {}
-          volumeMounts:
-            - mountPath: /mnt
-              name: prometheus-conf
-      restartPolicy: Always
-      volumes:
-        - name: prometheus-conf
-          secret:
-            secretName: prometheus-config
--- a/charts/clearml-serving/templates/prometheus-service.yaml
+++ b/charts/clearml-serving/templates/prometheus-service.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: prometheus
-  name: clearml-serving-prometheus
-spec:
-  ports:
-    - name: "9090"
-      port: 9090
-      targetPort: 9090
-  selector:
-    clearml.serving.service: prometheus
--- a/charts/clearml-serving/templates/zookeeper-deployment.yaml
+++ b/charts/clearml-serving/templates/zookeeper-deployment.yaml
@@ -1,30 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: zookeeper
-  name: zookeeper
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      clearml.serving.service: zookeeper
-  strategy: {}
-  template:
-    metadata:
-      annotations: {}
-      labels:
-        clearml.serving.network/clearml-serving-backend: "true"
-        clearml.serving.service: zookeeper
-    spec:
-      containers:
-        - env:
-            - name: ALLOW_ANONYMOUS_LOGIN
-              value: "yes"
-          image: "{{ .Values.zookeeper.image.repository }}:{{ .Values.zookeeper.image.tag }}"
-          name: clearml-serving-zookeeper
-          ports:
-            - containerPort: 2181
-          resources: {}
-      restartPolicy: Always
--- a/charts/clearml-serving/templates/zookeeper-service.yaml
+++ b/charts/clearml-serving/templates/zookeeper-service.yaml
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  annotations: {}
-  labels:
-    clearml.serving.service: zookeeper
-  name: clearml-serving-zookeeper
-spec:
-  ports:
-    - name: "2181"
-      port: 2181
-      targetPort: 2181
-  selector:
-    clearml.serving.service: zookeeper
--- a/charts/clearml-serving/values.yaml
+++ b/charts/clearml-serving/values.yaml
@@ -8,68 +8,12 @@ clearml:
  defaultBaseServeUrl: http://127.0.0.1:8080/serve
  servingTaskId: "ClearML Serving Task ID"

-# -- Zookeeper generic configigurations
-zookeeper:
-  image:
-    repository: "bitnami/zookeeper"
-    tag: "3.7.0"
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-  resources: {}
-
-# -- Kafka generic configigurations
-kafka:
-  image:
-    repository: "bitnami/kafka"
-    tag: "3.1.0"
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-  resources: {}
-
-# -- Prometheus generic configigurations
-prometheus:
-  image:
-    repository: "prom/prometheus"
-    tag: "v2.34.0"
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-  resources: {}
-
-# -- Grafana generic configigurations
-grafana:
-  image:
-    repository: "grafana/grafana"
-    tag: "8.4.4-ubuntu"
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-  resources: {}
-  ingress:
-    enabled: false
-    hostName: "serving-grafana.clearml.127-0-0-1.nip.io"
-    tlsSecretName: ""
-    annotations: {}
-    path: "/"
-
-# -- Alertmanager generic configigurations
-alertmanager:
-  image:
-    repository: "prom/alertmanager"
-    tag: "v0.23.0"
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-  resources: {}
-
 # -- ClearML serving statistics configurations
 clearml_serving_statistics:
  # -- Container Image
  image:
    repository: "allegroai/clearml-serving-statistics"
-    tag: "1.2.0"
+    tag: "1.3.0"
  # -- Node Selector configuration
  nodeSelector: {}
  # -- Tolerations configuration
@@ -88,7 +32,7 @@ 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
@@ -97,6 +41,8 @@ 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
@@ -110,10 +56,17 @@ clearml_serving_inference:
    targetMemory: 50
  # -- Ingress exposing configurations
  ingress:
+    # -- Enable/Disable ingress
    enabled: false
+    # -- ClassName (must be defined if no default ingressClassName is available)
+    ingressClassName: ""
+    # -- Ingress hostname domain
    hostName: "serving.clearml.127-0-0-1.nip.io"
+    # -- Reference to secret containing TLS certificate. If set, it enables HTTPS on ingress rule.
    tlsSecretName: ""
+    # -- Ingress annotations
    annotations: {}
+    # -- Ingress root path url
    path: "/"

 # -- ClearML serving Triton configurations
@@ -123,7 +76,7 @@ clearml_serving_triton:
  # -- Container Image
  image:
    repository: "allegroai/clearml-serving-triton"
-    tag: "1.2.0-22.07"
+    tag: "1.3.0"
  # -- Node Selector configuration
  nodeSelector: {}
  # -- Tolerations configuration
@@ -145,20 +98,56 @@ clearml_serving_triton:
    targetMemory: 50
  # -- Ingress exposing configurations
  ingress:
+    # -- Enable/Disable ingress
    enabled: false
+    # -- ClassName (must be defined if no default ingressClassName is available)
+    ingressClassName: ""
+    # -- Ingress hostname domain
    hostName: "serving-grpc.clearml.127-0-0-1.nip.io"
+    # -- Reference to secret containing TLS certificate. If set, it enables HTTPS on ingress rule.
    tlsSecretName: ""
+    # -- Ingress annotations
    annotations: {}
-    #  # Example for AWS ALB
-    #  kubernetes.io/ingress.class: alb
-    #  alb.ingress.kubernetes.io/backend-protocol: HTTP
-    #  alb.ingress.kubernetes.io/backend-protocol-version: GRPC
-    #  alb.ingress.kubernetes.io/certificate-arn: <cerntificate arn>
-    #  alb.ingress.kubernetes.io/ssl-redirect: '443'
-    #  alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
-    #  alb.ingress.kubernetes.io/target-type: ip
-    #
-    #  # Example for NNGINX ingress controller
-    #  nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    #  nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
+    # -- Ingress root path url
    path: "/"
+
+# -- Configuration from https://github.com/bitnami/charts/blob/main/bitnami/kafka/values.yaml
+kafka:
+  enabled: true
+
+# -- Configuration from https://github.com/prometheus-community/helm-charts/blob/main/charts/prometheus/values.yaml
+prometheus:
+  enabled: true
+  kube-state-metrics:
+    enabled: false
+  prometheus-node-exporter:
+    enabled: false
+  prometheus-pushgateway:
+    enabled: false
+  serverFiles:
+    prometheus.yml:
+      scrape_configs:
+        - job_name: prometheus
+          static_configs:
+            - targets:
+              - localhost:9090
+  extraScrapeConfigs: |
+    - job_name: "{{ .Release.Name }}-stats"
+      static_configs:
+        - targets:
+          - "{{ .Release.Name }}-statistics:9999"
+
+# -- Configuration from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml
+grafana:
+  enabled: true
+  adminUser: admin
+  adminPassword: clearml
+  datasources:
+    datasources.yaml:
+      apiVersion: 1
+      datasources:
+      - name: Prometheus
+        type: prometheus
+        url: "http://{{ .Release.Name }}-prometheus-server"
+        access: proxy
+        isDefault: true
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,9 +2,9 @@ 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.2.2"
+appVersion: "1.11.0"
+kubeVersion: ">= 1.21.0-0 < 1.28.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
@@ -32,5 +32,5 @@ dependencies:
    condition: elasticsearch.enabled
 annotations:
  artifacthub.io/changes: |
-    - kind: fixed
-      description: fullname usage
+    - kind: added
+      description: defaulr externalServices value
--- 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.2.2](https://img.shields.io/badge/Version-7.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.11.0](https://img.shields.io/badge/AppVersion-1.11.0-informational?style=flat-square)

 MLOps platform

@@ -117,18 +117,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:
@@ -145,7 +133,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a

 ## Requirements

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

 | Repository | Name | Version |
 |------------|------|---------|
@@ -157,7 +145,7 @@ 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":{},"affinity":{},"containerSecurityContext":{},"enabled":true,"existingAdditionalConfigsConfigMap":"","existingAdditionalConfigsSecret":"","extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.11.0-373"},"indexReplicas":0,"indexShards":1,"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"},"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.affinity | object | `{}` | Api Server affinity setup |
 | apiserver.containerSecurityContext | object | `{}` | Api Server containers security context |
@@ -165,7 +153,7 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | apiserver.existingAdditionalConfigsConfigMap | string | `""` | reference for files declared in existing ConfigMap will be mounted and read by apiserver (examples in values.yaml) |
 | apiserver.existingAdditionalConfigsSecret | string | `""` | reference for files declared in existing Secret will be mounted and read by apiserver (examples in values.yaml) if not overridden by existingAdditionalConfigsConfigMap |
 | apiserver.extraEnvs | list | `[]` | Api Server extra envrinoment variables |
-| apiserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.9.2-317"}` | Api Server image configuration |
+| apiserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.11.0-373"}` | 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.ingress | object | `{"annotations":{},"enabled":false,"hostName":"api.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""}` | Ingress configuration for Api Server component |
@@ -175,6 +163,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 |
@@ -190,7 +179,7 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | 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.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 +187,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 |
@@ -206,52 +196,18 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | 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 |
+| 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 | `{"affinity":{},"containerSecurityContext":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.11.0-373"},"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"},"storage":{"data":{"accessMode":"ReadWriteOnce","class":"","existingPVC":"","size":"50Gi"},"enabled":true},"tolerations":[]}` | File Server configurations |
 | fileserver.affinity | object | `{}` | File Server affinity setup |
 | fileserver.containerSecurityContext | object | `{}` | File Server containers security context |
 | 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":"1.11.0-373"}` | 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 +215,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 |
@@ -284,13 +241,13 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | imageCredentials.username | string | `"someone"` | Registry username |
 | mongodb | object | `{"architecture":"standalone","auth":{"enabled":false},"enabled":true,"persistence":{"accessModes":["ReadWriteOnce"],"enabled":true,"size":"50Gi","storageClass":null},"replicaCount":1}` | Configuration from https://github.com/bitnami/charts/blob/master/bitnami/mongodb/values.yaml |
 | redis | object | `{"architecture":"standalone","auth":{"enabled":false},"databaseNumber":0,"enabled":true,"master":{"name":"{{ .Release.Name }}-redis-master","persistence":{"accessModes":["ReadWriteOnce"],"enabled":true,"size":"5Gi","storageClass":null},"port":6379}}` | Configuration from https://github.com/bitnami/charts/blob/master/bitnami/redis/values.yaml |
-| webserver | object | `{"additionalConfigs":{},"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":{},"affinity":{},"containerSecurityContext":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.11.0-373"},"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"},"tolerations":[]}` | Web Server configurations |
 | webserver.additionalConfigs | object | `{}` | Additional specific webserver configurations |
 | webserver.affinity | object | `{}` | Web Server affinity setup |
 | webserver.containerSecurityContext | object | `{}` | Web Server containers security context |
 | 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":"1.11.0-373"}` | 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 +255,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 |
--- a/charts/clearml/README.md.gotmpl
+++ b/charts/clearml/README.md.gotmpl
@@ -114,18 +114,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:
--- a/charts/clearml/templates/_helpers.tpl
+++ b/charts/clearml/templates/_helpers.tpl
@@ -153,6 +153,13 @@ 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 }}
+
 {{/*
 Elasticsearch Service name
 */}}
@@ -194,7 +201,7 @@ MongoDB Comnnection string
 {{- end }}

 {{/*
-MongoDB hotname
+MongoDB hostname
 */}}
 {{- define "mongodb.hostname" -}}
 {{- if eq .Values.mongodb.architecture "standalone" }}
@@ -209,8 +216,12 @@ Redis Service name
 */}}
 {{- define "redis.servicename" -}}
 {{- if .Values.redis.enabled }}
+{{- if eq .Values.redis.architecture "standalone" }}
 {{- tpl .Values.redis.master.name . }}
 {{- else }}
+{{- printf "%s-headless" (tpl .Values.redis.master.name . ) }}
+{{- end }}
+{{- else }}
 {{- .Values.externalServices.redisHost }}
 {{- end }}
 {{- end }}
--- a/charts/clearml/templates/apiserver-deployment.yaml
+++ b/charts/clearml/templates/apiserver-deployment.yaml
@@ -45,11 +45,7 @@ spec:
        {{ 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 +71,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 +116,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 +134,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,11 +160,7 @@ spec:
            initialDelaySeconds: 60
            failureThreshold: 8
            httpGet:
-              {{- if .Values.enterpriseFeatures.enabled }}
-              path: /server.health_check
-              {{- else }}
              path: /debug.ping
-              {{- end }}
              port: 8008
              httpHeaders:
                - name: Authorization
@@ -245,11 +168,7 @@ spec:
          {{- if or .Values.apiserver.additionalConfigs .Values.apiserver.existingAdditionalConfigsConfigMap  .Values.apiserver.existingAdditionalConfigsSecret }}
          volumeMounts:  
            - name: apiserver-config
-              {{- if .Values.enterpriseFeatures.enabled }}
-              mountPath: /opt/clearml/config/default
-              {{- else }}
              mountPath: /opt/clearml/config
-              {{- 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
@@ -46,11 +46,7 @@ spec:
        {{ 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 +58,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 +82,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:
--- 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
@@ -31,36 +31,11 @@ spec:
        - name: webserver-config
          configMap:
            name: "{{ include "webserver.referenceName" . }}-configmap"
-        {{- if .Values.enterpriseFeatures.airGappedDocumentation.enabled }}
-        - name: documentation
-          emptyDir: {}
-        {{- 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 +47,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,17 +81,11 @@ 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
-            {{- end }}
          resources:
            {{- toYaml .Values.webserver.resources | nindent 12 }}
          securityContext:
--- 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
@@ -34,6 +34,8 @@ redis:
      size: 5Gi
      ## If undefined (the default) or set to null, no storageClassName spec is set, choosing the default provisioner
      storageClass: null
+  architecture: replication
+
 mongodb:
  enabled: true
  architecture: replicaset
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -48,6 +48,9 @@ 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:
@@ -60,7 +63,7 @@ apiserver:
    registry: ""
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.9.2-317"
+    tag: "1.11.0-373"
  # -- Api Server internal service configuration
  service:
    # -- specific annotation for Api Server service
@@ -72,6 +75,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
@@ -169,7 +181,7 @@ fileserver:
    registry: ""
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.9.2-317"
+    tag: "1.11.0-373"
  # -- File Server internal service configuration
  service:
    # -- specific annotation for File Server service
@@ -181,6 +193,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
@@ -242,7 +263,7 @@ webserver:
    registry: ""
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.9.2-317"
+    tag: "1.11.0-373"
  # -- Web Server internal service configuration
  service:
    # -- specific annotation for Web Server service
@@ -254,6 +275,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
@@ -299,14 +329,13 @@ webserver:
 # -- 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

@@ -397,91 +426,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
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
Valeriano Manassero	70f6544ad7	temporarily force release (#191 )	2023-03-20 11:57:57 +01:00
Valeriano Manassero	5f8cc597ad	Update release.yaml (#190 )	2023-03-20 11:51:44 +01:00
Valeriano Manassero	cbc1239d10	Serving 1.0.0 refactoring (#189 ) * Changed: use dep charts * Changed: improved ingresses * Changed: naming management * Fixed: naming * Fixed: disable kubestats for prom * Added: dependencies * Fixed: typos	2023-03-20 11:49:42 +01:00