Filemount apps agent (#176 )

* Added: filemounts support for apps agent * Changed: bump up version
Update apps agent (#175 )
2025-04-17 01:31:13 +00:00 · 2023-03-06 14:23:50 +01:00 · 2023-03-03 14:09:03 +01:00 · 2023-02-20 14:50:48 +01:00 · 2023-02-20 13:52:36 +01:00 · 2023-02-16 13:25:00 +01:00
16 changed files with 115 additions and 64 deletions
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -2,29 +2,17 @@

 ## Requirements

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

-For setting up Kubernetes on various platforms refer to the Kubernetes [getting started guide](http://kubernetes.io/docs/getting-started-guides/).
+* Install Helm - Helm is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes 
+resources. To install Helm, refer to the [Helm install guide](https://github.com/helm/helm#install) and ensure that the `helm` binary is in the `PATH` of your shell.

-#### Setup a single node LOCAL Kubernetes on laptop/desktop (development)
-
-For setting up Kubernetes on your laptop/desktop we suggest [kind](https://kind.sigs.k8s.io).
-
-#### [Kubernetes Tanzu users only] Additional setup requirements
-
-For setting up Clear.ML on a Tanzu cluster, check [prerequisites](https://github.com/allegroai/clearml-helm-charts/tree/main/platform-specific-configs/tanzu).
-
-#### [Kubernetes Openshift users only] Additional setup requirements
-
-For setting up Clear.ML on a Openshift cluster, check [prerequisites](https://github.com/allegroai/clearml-helm-charts/tree/main/platform-specific-configs/openshift).
-
-### Install Helm
-
-Helm is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes resources.
-
-To install Helm, refer to the [Helm install guide](https://github.com/helm/helm#install) and ensure that the `helm` binary is in the `PATH` of your shell.
-
-## Helm charts installation
+## Helm Charts Installation

 ### Helm Repo

@@ -32,25 +20,27 @@ To install Helm, refer to the [Helm install guide](https://github.com/helm/helm#
 $ helm repo add allegroai https://allegroai.github.io/clearml-helm-charts
 $ helm repo update
 ```
-### ClearML server ecosystem
+### ClearML Server Ecosystem

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

-### ClearML agent
+### ClearML Agent

-Agent is always related a ClearML server ecosystem (by default using `app.clear.ml` public service but can be on same or another Kubernetes cluster or a single server installation).
+A ClearML Agent is always related to a ClearML server ecosystem (by default using the `app.clear.ml` hosted server, but 
+can be on the same or different Kubernetes cluster or a single server installation).

-On ClearML UI, Settings -> Workspace and Create new Credentials.
+In the ClearML UI, go to **Settings > Workspace** and click **Create New Credentials**. The dialog that pops up displays 
+the new credentials.

-In following Helm chart install command:
+In the Helm chart `install` command below:

-* set ACCESSKEY to resuted credentials access_key
-* set SECRETKEY to resuted credentials secret_key
-* set APIERVERURL to resuted credentials api_server
-* set FILESSERVERURL to resuted credentials files_server
-* set WEBSERVERURL to resuted credentials web_server
+* Set `ACCESSKEY` to the new credentials' `access_key` value 
+* Set `SECRETKEY` to the new credentials' `secret_key` value
+* Set `APISERVERURL` to the new credentials' `api_server` value
+* Set `FILESSERVERURL` to the new credentials' `files_server` value
+* Set `WEBSERVERURL` to the new credentials' `web_server` value

 ```bash
 $ helm install clearml-agent allegroai/clearml-agent --set clearml.agentk8sglueKey=ACCESSKEY --set clearml.agentk8sglueSecret=SECRETKEY --set agentk8sglue.apiServerUrlReference=APISERVERURL --set agentk8sglue.fileServerUrlReference=FILESERVERURL --set agentk8sglue.webServerUrlReference=WEBSERVERURL
--- a/README.md
+++ b/README.md
@@ -31,32 +31,32 @@ Use this repository to deploy **clearml-server** on Kubernetes clusters.

 ## Who We Are

-ClearML is supported by the team behind *allegro.ai*,
-where we build deep learning pipelines and infrastructure for enterprise companies.
+ClearML is supported by you :heart: and the [clear.ml](https://clear.ml) team, which helps enterprise companies build 
+scalable MLOps.

 We built ClearML to track and control the glorious but messy process of training production-grade deep learning models.
 We are committed to vigorously supporting and expanding the capabilities of ClearML.

-We promise to always be backwardly compatible, making sure all your logs, data and pipelines 
+We promise to always be backwards compatible, making sure all your logs, data, and pipelines 
 will always upgrade with you.

 ## License

 Apache License, Version 2.0, (see the [LICENSE](https://www.apache.org/licenses/LICENSE-2.0) for more information)

-## Installation guide
+## Installation Guide

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

 ## Documentation, Community & Support

-More information in the [official documentation](https://allegro.ai/clearml/docs) and [on YouTube](https://www.youtube.com/c/ClearML).
+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://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*).

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

-Additionally, you can always find us at *clearml@allegro.ai*
+Additionally, you can always find us at *support@clear.ml*

 ## Contributing

--- a/charts/clearml-agent/Chart.yaml
+++ b/charts/clearml-agent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml-agent
 description: MLOps platform Task running agent
 type: application
-version: "3.4.0"
+version: "3.6.0"
 appVersion: "1.24"
 kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
 home: https://clear.ml
@@ -21,8 +21,4 @@ keywords:
 annotations:
  artifacthub.io/changes: |
    - kind: added
-      description: support for parameter Job/Pod task
-    - kind: fixed
-      description: empty hostAliases map/array mismatch
-    - kind: fixed
-      description: agent deployment checksum
+      description: support for priorityClass in task pod template
--- a/charts/clearml-agent/README.md
+++ b/charts/clearml-agent/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Agent

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

@@ -30,11 +30,11 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| agentk8sglue | object | `{"affinity":{},"annotations":{},"apiServerUrlReference":"https://api.clear.ml","basePodTemplate":{"affinity":{},"annotations":{},"env":[],"fileMounts":[],"hostAliases":[],"initContainers":[],"labels":{},"nodeSelector":{},"resources":{},"schedulerName":"","securityContext":{},"tolerations":[],"volumeMounts":[],"volumes":[]},"clearmlcheckCertificate":true,"containerCustomBashScript":"","customBashScript":"","debugMode":false,"defaultContainerImage":"ubuntu:18.04","extraEnvs":[],"fileMounts":[],"fileServerUrlReference":"https://files.clear.ml","image":{"repository":"allegroai/clearml-agent-k8s-base","tag":"1.24-21"},"labels":{},"nodeSelector":{},"queue":"default","replicaCount":1,"securityContext":{},"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 | `{"affinity":{},"annotations":{},"apiServerUrlReference":"https://api.clear.ml","basePodTemplate":{"affinity":{},"annotations":{},"env":[],"fileMounts":[],"hostAliases":[],"initContainers":[],"labels":{},"nodeSelector":{},"priorityClassName":"","resources":{},"schedulerName":"","securityContext":{},"tolerations":[],"volumeMounts":[],"volumes":[]},"clearmlcheckCertificate":true,"containerCustomBashScript":"","customBashScript":"","debugMode":false,"defaultContainerImage":"ubuntu:18.04","extraEnvs":[],"fileMounts":[],"fileServerUrlReference":"https://files.clear.ml","image":{"repository":"allegroai/clearml-agent-k8s-base","tag":"1.24-21"},"labels":{},"nodeSelector":{},"queue":"default","replicaCount":1,"securityContext":{},"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.affinity | object | `{}` | affinity setup for Agent pod (example in values.yaml comments) |
 | agentk8sglue.annotations | object | `{}` | annotations setup for Agent pod (example in values.yaml comments) |
 | agentk8sglue.apiServerUrlReference | string | `"https://api.clear.ml"` | Reference to Api server url |
-| agentk8sglue.basePodTemplate | object | `{"affinity":{},"annotations":{},"env":[],"fileMounts":[],"hostAliases":[],"initContainers":[],"labels":{},"nodeSelector":{},"resources":{},"schedulerName":"","securityContext":{},"tolerations":[],"volumeMounts":[],"volumes":[]}` | base template for pods spawned to consume ClearML Task |
+| agentk8sglue.basePodTemplate | object | `{"affinity":{},"annotations":{},"env":[],"fileMounts":[],"hostAliases":[],"initContainers":[],"labels":{},"nodeSelector":{},"priorityClassName":"","resources":{},"schedulerName":"","securityContext":{},"tolerations":[],"volumeMounts":[],"volumes":[]}` | base template for pods spawned to consume ClearML Task |
 | agentk8sglue.basePodTemplate.affinity | object | `{}` | affinity setup for pods spawned to consume ClearML Task |
 | agentk8sglue.basePodTemplate.annotations | object | `{}` | annotations setup for pods spawned to consume ClearML Task (example in values.yaml comments) |
 | agentk8sglue.basePodTemplate.env | list | `[]` | environment variables for pods spawned to consume ClearML Task (example in values.yaml comments) |
@@ -43,6 +43,7 @@ Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
 | agentk8sglue.basePodTemplate.initContainers | list | `[]` | initContainers definition for pods spawned to consume ClearML Task (example in values.yaml comments) |
 | agentk8sglue.basePodTemplate.labels | object | `{}` | labels setup for pods spawned to consume ClearML Task (example in values.yaml comments) |
 | agentk8sglue.basePodTemplate.nodeSelector | object | `{}` | nodeSelector setup for pods spawned to consume ClearML Task (example in values.yaml comments) |
+| agentk8sglue.basePodTemplate.priorityClassName | string | `""` | priorityClassName setup for pods spawned to consume ClearML Task |
 | agentk8sglue.basePodTemplate.resources | object | `{}` | resources declaration for pods spawned to consume ClearML Task (example in values.yaml comments) |
 | agentk8sglue.basePodTemplate.schedulerName | string | `""` | schedulerName setup for pods spawned to consume ClearML Task |
 | agentk8sglue.basePodTemplate.securityContext | object | `{}` | securityContext setup for pods spawned to consume ClearML Task (example in values.yaml comments) |
@@ -74,9 +75,10 @@ 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-57","applyVaultEnvVars":true,"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-57"` | Image tag override for enterprise version |
+| 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 |
--- a/charts/clearml-agent/templates/_helpers.tpl
+++ b/charts/clearml-agent/templates/_helpers.tpl
@@ -72,6 +72,17 @@ Create secret to access docker registry
 {{- 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
 */}}
@@ -114,6 +125,7 @@ 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 }}
--- a/charts/clearml-agent/templates/agentk8sglue-configmap.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-configmap.yaml
@@ -42,6 +42,7 @@ data:
      {{- toYaml . | nindent 8 }}
      {{- end }}
      serviceAccountName: {{ include "clearmlAgent.serviceAccountName" $ }}
+      priorityClassName: {{ .Values.agentk8sglue.basePodTemplate.priorityClassName }}
      containers:
      - resources:
          {{- toYaml .Values.agentk8sglue.basePodTemplate.resources | nindent 10 }}
--- a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
@@ -113,6 +113,10 @@ spec:
            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 }}"
          {{- 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
@@ -168,14 +172,16 @@ spec:
          {{- 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}}
+            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}}
+            value: {{ .Values.enterpriseFeatures.monitoredResources.maxResourcesFieldName }}
          {{- else }}
          - name: K8S_GLUE_QUEUE
            value: {{ .Values.agentk8sglue.queue }}
--- a/charts/clearml-agent/values.yaml
+++ b/charts/clearml-agent/values.yaml
@@ -163,11 +163,13 @@ agentk8sglue:
      # - name: CURL_CA_BUNDLE
      #   value: ""
      # - name: PYTHONWARNINGS
-      #   value: "=\"ignore:Unverified HTTPS request\""
+      #   value: "ignore:Unverified HTTPS request"
    # -- resources declaration for pods spawned to consume ClearML Task (example in values.yaml comments)
    resources: {}
      # limits:
      #   nvidia.com/gpu: 1
+    # -- priorityClassName setup for pods spawned to consume ClearML Task
+    priorityClassName: ""
    # -- nodeSelector setup for pods spawned to consume ClearML Task (example in values.yaml comments)
    nodeSelector: {}
      # fleet: gpu-nodes
@@ -213,7 +215,7 @@ enterpriseFeatures:
  # -- Enable/Disable Enterprise features
  enabled: false
  # -- Image tag override for enterprise version
-  agentImageTagOverride: "1.24-57"
+  agentImageTagOverride: "1.24-58"
  # -- service account access every namespace flag
  serviceAccountClusterAccess: false
  # -- push env vars from Clear.ML Vault to task pods
@@ -230,6 +232,8 @@ enterpriseFeatures:
  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
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "5.7.0"
+version: "5.8.0"
 appVersion: "1.9.2"
 kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
 home: https://clear.ml
@@ -33,4 +33,4 @@ dependencies:
 annotations:
  artifacthub.io/changes: |
    - kind: added
-      description: fileserver support for emptyDir
+      description: filemount support for apps agent
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes

-![Version: 5.7.0](https://img.shields.io/badge/Version-5.7.0-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: 5.8.0](https://img.shields.io/badge/Version-5.8.0-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)

 MLOps platform

@@ -189,21 +189,22 @@ 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":{"repository":"","tag":"4"}},"apiserverImageTagOverride":"3.15.3-909","clearmlApplications":{"affinity":{},"agentKey":"GK4PRTVT3706T25K6BA1","agentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","basePodImage":{"repository":"","tag":"app-1.1.1-47"},"enabled":true,"extraEnvs":[],"gitAgentPass":"git_password","gitAgentUser":"git_user","image":{"pullPolicy":"IfNotPresent","repository":"","tag":"1.24-57"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]},"defaultCompanyGuid":"d1bd92a3b039400cbafc60a7a5b1e52b","enabled":false,"extraIndexUrl":"","fileserverImageTagOverride":"3.15.3-909","overrideReferenceApiUrl":"","overrideReferenceFileUrl":"","webserverImageTagOverride":"3.15.3-801"}` | Enterprise features (work only with an Enterprise license) |
+| enterpriseFeatures | object | `{"airGappedDocumentation":{"enabled":false,"image":{"repository":"","tag":"4"}},"apiserverImageTagOverride":"3.15.3-909","clearmlApplications":{"affinity":{},"agentKey":"GK4PRTVT3706T25K6BA1","agentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","basePodImage":{"repository":"","tag":"app-1.1.1-47"},"enabled":true,"extraEnvs":[],"fileMounts":[],"gitAgentPass":"git_password","gitAgentUser":"git_user","image":{"pullPolicy":"IfNotPresent","repository":"","tag":"1.24-58"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]},"defaultCompanyGuid":"d1bd92a3b039400cbafc60a7a5b1e52b","enabled":false,"extraIndexUrl":"","fileserverImageTagOverride":"3.15.3-909","overrideReferenceApiUrl":"","overrideReferenceFileUrl":"","webserverImageTagOverride":"3.15.3-801"}` | Enterprise features (work only with an Enterprise license) |
 | enterpriseFeatures.airGappedDocumentation | object | `{"enabled":false,"image":{"repository":"","tag":"4"}}` | Air gapped documentation  configurations |
 | enterpriseFeatures.airGappedDocumentation.enabled | bool | `false` | Enable/Disable air gapped documentation deployment |
 | enterpriseFeatures.airGappedDocumentation.image | object | `{"repository":"","tag":"4"}` | Air gapped documentation image configuration |
 | enterpriseFeatures.apiserverImageTagOverride | string | `"3.15.3-909"` | Image tag override for apiserver enterprise version |
-| enterpriseFeatures.clearmlApplications | object | `{"affinity":{},"agentKey":"GK4PRTVT3706T25K6BA1","agentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","basePodImage":{"repository":"","tag":"app-1.1.1-47"},"enabled":true,"extraEnvs":[],"gitAgentPass":"git_password","gitAgentUser":"git_user","image":{"pullPolicy":"IfNotPresent","repository":"","tag":"1.24-57"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]}` | APPS configurations |
+| enterpriseFeatures.clearmlApplications | object | `{"affinity":{},"agentKey":"GK4PRTVT3706T25K6BA1","agentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","basePodImage":{"repository":"","tag":"app-1.1.1-47"},"enabled":true,"extraEnvs":[],"fileMounts":[],"gitAgentPass":"git_password","gitAgentUser":"git_user","image":{"pullPolicy":"IfNotPresent","repository":"","tag":"1.24-58"},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]}` | APPS configurations |
 | 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.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-57"}` | APPS image configuration |
+| 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.replicaCount | int | `1` | APPS number of pods |
--- a/charts/clearml/templates/apps-configmap.yaml
+++ b/charts/clearml/templates/apps-configmap.yaml
@@ -18,11 +18,23 @@ data:
        {{- end }}
        {{- end }}
        serviceAccountName: "clearml-apps-sa"
+        volumes:
+          {{- if .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
+          - name: filemounts
+            secret:
+              secretName: {{ include "clearml.name" . }}-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 }}"
@@ -30,3 +42,6 @@ data:
            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 }}
--- a/charts/clearml/templates/apps-deployment.yaml
+++ b/charts/clearml/templates/apps-deployment.yaml
@@ -37,6 +37,11 @@ spec:
          configMap:
            name: "{{ include "clearmlApplications.referenceName" . }}-configmap"
      {{- end }}
+      {{- if .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
+        - name: filemounts
+          secret:
+            secretName: {{ include "clearml.name" . }}-apps-fm
+      {{- end }}
      serviceAccountName: "clearml-apps-sa"
      initContainers:
        - name: init-apps
@@ -108,6 +113,12 @@ spec:
            - name: apps-config
              mountPath: /opt/clearml/config/default
          {{- end }}
+          {{- range .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
+          - name: filemounts
+            mountPath: "{{ .folderPath }}/{{ .name }}"
+            subPath: "{{ .name }}"
+            readOnly: true
+          {{- end }}
          resources:
            {{- toYaml .Values.enterpriseFeatures.clearmlApplications.resources | nindent 12 }}
      {{- with .Values.enterpriseFeatures.clearmlApplications.nodeSelector }}
--- a/charts/clearml/templates/apps-secrets.yaml
+++ b/charts/clearml/templates/apps-secrets.yaml
@@ -0,0 +1,10 @@
+{{ if .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "clearml.name" . }}-apps-fm
+data:
+  {{- range .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
+  {{ .name }}: {{ .fileContent | b64enc }}
+  {{- end }}
+{{ end }}
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -422,7 +422,7 @@ enterpriseFeatures:
    image:
      repository: ""
      pullPolicy: IfNotPresent
-      tag: "1.24-57"
+      tag: "1.24-58"
    # -- APPS base spawning pods image
    basePodImage:
      repository: ""
@@ -431,6 +431,8 @@ enterpriseFeatures:
    replicaCount: 1
    # -- APPS extra envrinoment variables
    extraEnvs: []
+    # -- file definition
+    fileMounts: []
    # -- specific annotation for APPS pods
    podAnnotations: {}
    # -- APPS resources per pod; these are minimal requirements, it's suggested to increase
--- a/platform-specific-configs/openshift/values-clearml-agent.yaml
+++ b/platform-specific-configs/openshift/values-clearml-agent.yaml
@@ -1,6 +1,7 @@
 agentk8sglue:
  securityContext:
-    runAsUser: 0
+    fsGroup: <FSUSER>
+    runAsUser: <USER>
  basePodTemplate:
    securityContext:
      runAsUser: 0
--- a/platform-specific-configs/openshift/values-clearml.yaml
+++ b/platform-specific-configs/openshift/values-clearml.yaml
@@ -1,15 +1,15 @@
 apiserver:
-  podSecurityContext:
+  securityContext:
    fsGroup: <FSUSER>
    runAsUser: <USER>
    runAsNonRoot: true
 fileserver:
-  podSecurityContext:
+  securityContext:
    fsGroup: <FSUSER>
    runAsUser: <USER>
    runAsNonRoot: true
 webserver:
-  podSecurityContext:
+  securityContext:
    fsGroup: <FSUSER>
    runAsUser: <USER>
    runAsNonRoot: true
Author	SHA1	Message	Date
Valeriano Manassero	dd4d8bf086	Filemount apps agent (#176 ) * Added: filemounts support for apps agent * Changed: bump up version	2023-03-06 14:23:50 +01:00
Valeriano Manassero	bf959d2f70	Update apps agent (#175 ) * Changed: apps agent version bump * Changed: chart version bump	2023-03-03 14:09:03 +01:00
Valeriano Manassero	340d261f11	Fixed: openshift examples (#172 )	2023-02-20 14:50:48 +01:00
Valeriano Manassero	e1fcc5b466	Enterprise create queue (#171 ) * Fixed: typo in env example * Added: create queues switch * Added: force configuration file mount * Changed: bump version * Fixed: helm docs	2023-02-20 13:52:36 +01:00
pollfly	013734c184	edits (#168 )	2023-02-16 13:25:00 +01:00
Valeriano Manassero	fded7aa5b4	165 clearml agent priorityclassname in pod template (#166 ) * Added: priorityclass name * Changed: bump up version	2023-02-16 09:39:23 +01:00