Added: deploymentAnnotations (#292 )

* added deploymentAnnotations * version minor bump * fixed version in README * removed precommit file --------- Co-authored-by: Dağlar Berk Erdem <daglar@codeway.co>
Feature/multiplequeues (#286 )
2025-04-17 01:31:13 +00:00 · 2024-05-28 08:40:54 +02:00 · 2024-05-15 16:19:40 +02:00 · 2024-05-15 09:32:02 +02:00 · 2024-05-15 09:26:44 +02:00 · 2024-05-15 08:59:34 +02:00
17 changed files with 104 additions and 50 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -24,9 +24,9 @@ jobs:
    strategy:
      matrix:
        k8s:
-          - v1.27.11
-          - v1.28.7
-          - v1.29.2
+          - v1.28.9
+          - v1.29.4
+          - v1.30.0
    steps:
      - name: Checkout
        uses: actions/checkout@v4.1.1
--- 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: "5.1.3"
+version: "5.2.0"
 appVersion: "1.24"
-kubeVersion: ">= 1.21.0-0 < 1.30.0-0"
+kubeVersion: ">= 1.21.0-0 < 1.31.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
@@ -21,4 +21,6 @@ keywords:
 annotations:
  artifacthub.io/changes: |
    - kind: fixed
-      description: kubernetes 1.29 support
+      description: Support for 1.30 kubernetes
+    - kind: added
+      description: Support for multiple queues
--- a/charts/clearml-agent/README.md
+++ b/charts/clearml-agent/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Agent

-![Version: 5.1.3](https://img.shields.io/badge/Version-5.1.3-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.2.0](https://img.shields.io/badge/Version-5.2.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

@@ -47,13 +47,13 @@ Before issuing helm upgrade:

 ## Requirements

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

 ## Values

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| agentk8sglue | object | `{"additionalClusterRoleBindings":[],"additionalRoleBindings":[],"affinity":{},"annotations":{},"apiServerUrlReference":"https://api.clear.ml","basePodTemplate":{"affinity":{},"annotations":{},"containerSecurityContext":{},"env":[],"fileMounts":[],"hostAliases":[],"initContainers":[],"labels":{},"nodeSelector":{},"podSecurityContext":{},"priorityClassName":"","resources":{},"schedulerName":"","tolerations":[],"volumeMounts":[],"volumes":[]},"clearmlcheckCertificate":true,"containerSecurityContext":{},"defaultContainerImage":"ubuntu:18.04","extraEnvs":[],"fileMounts":[],"fileServerUrlReference":"https://files.clear.ml","image":{"registry":"","repository":"allegroai/clearml-agent-k8s-base","tag":"1.24-21"},"initContainers":{"resources":{}},"labels":{},"nodeSelector":{},"podSecurityContext":{},"queue":"default","replicaCount":1,"resources":{},"serviceExistingAccountName":"","tolerations":[],"volumeMounts":[],"volumes":[],"webServerUrlReference":"https://app.clear.ml"}` | This agent will spawn queued experiments in new pods, a good use case is to combine this with GPU autoscaling nodes. https://github.com/allegroai/clearml-agent/tree/master/docker/k8s-glue |
+| agentk8sglue | object | `{"additionalClusterRoleBindings":[],"additionalRoleBindings":[],"affinity":{},"annotations":{},"apiServerUrlReference":"https://api.clear.ml","basePodTemplate":{"affinity":{},"annotations":{},"containerSecurityContext":{},"env":[],"fileMounts":[],"hostAliases":[],"initContainers":[],"labels":{},"nodeSelector":{},"podSecurityContext":{},"priorityClassName":"","resources":{},"schedulerName":"","tolerations":[],"volumeMounts":[],"volumes":[]},"clearmlcheckCertificate":true,"containerSecurityContext":{},"createQueueIfNotExists":true,"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) |
@@ -78,6 +78,7 @@ Kubernetes: `>= 1.21.0-0 < 1.30.0-0`
 | 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.containerSecurityContext | object | `{}` | container securityContext setup for Agent pod (example in values.yaml comments) |
+| agentk8sglue.createQueueIfNotExists | bool | `true` | if ClearML queue does not exist, it will be create it if the value is set to true |
 | agentk8sglue.defaultContainerImage | string | `"ubuntu:18.04"` | default container image for ClearML Task pod |
 | agentk8sglue.extraEnvs | list | `[]` | Extra Environment variables for Glue Agent |
 | agentk8sglue.fileMounts | list | `[]` | file definition for Glue Agent (example in values.yaml comments) |
@@ -88,7 +89,7 @@ Kubernetes: `>= 1.21.0-0 < 1.30.0-0`
 | agentk8sglue.labels | object | `{}` | labels setup for Agent pod (example in values.yaml comments) |
 | agentk8sglue.nodeSelector | object | `{}` | nodeSelector setup for Agent pod (example in values.yaml comments) |
 | agentk8sglue.podSecurityContext | object | `{}` | container securityContext setup for Agent pod (example in values.yaml comments) |
-| agentk8sglue.queue | string | `"default"` | ClearML queue this agent will consume |
+| agentk8sglue.queue | string | `"default"` | ClearML queue this agent will consume. Multiple queues can be specified with the following format: queue1,queue2,queue3 |
 | agentk8sglue.replicaCount | int | `1` | Glue Agent number of pods |
 | agentk8sglue.resources | object | `{}` | Glue Agent pod resources |
 | agentk8sglue.serviceExistingAccountName | string | `""` | if set, don't create a serviceAccountName but use defined existing one |
--- a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
@@ -67,7 +67,7 @@ spec:
          volumeMounts:
            - name: {{ include "clearmlAgent.fullname" . }}-pt
              mountPath: /root/template
-            {{ if .Values.clearml.clearmlConfig }}
+            {{ if or (.Values.clearml.clearmlConfig) (.Values.clearml.existingClearmlConfigSecret) }}
            - name: k8sagent-clearml-conf-volume
              mountPath: /root/clearml.conf
              subPath: clearml.conf
@@ -98,12 +98,14 @@ 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 }}"
+                      --gateway-address {{ .Values.sessions.externalIP }} \
+                      {{- if .Values.agentk8sglue.createQueueIfNotExists }} --create-queue{{- end }}"
            {{- else}}
            - name: K8S_GLUE_EXTRA_ARGS
-              value: "--namespace {{ .Release.Namespace }} --template-yaml /root/template/template.yaml"
+              value: "--namespace {{ .Release.Namespace }} --template-yaml /root/template/template.yaml \
+                {{- if .Values.agentk8sglue.createQueueIfNotExists }} --create-queue{{- end }}"
            {{- end }}
-            {{- if .Values.clearml.clearmlConfig }}
+            {{ if or (.Values.clearml.clearmlConfig) (.Values.clearml.existingClearmlConfigSecret) }}
            - name: CLEARML_CONFIG_FILE
              value: /root/clearml.conf
            {{- end }}
@@ -112,12 +114,20 @@ spec:
            - name: CLEARML_API_ACCESS_KEY
              valueFrom:
                secretKeyRef:
+                  {{- if .Values.clearml.existingAgentk8sglueSecret }}
+                  name: {{ .Values.clearml.existingAgentk8sglueSecret }}
+                  {{- else }}
                  name: {{ include "clearmlAgent.fullname" . }}-ac
+                  {{- end }}
                  key: agentk8sglue_key
            - name: CLEARML_API_SECRET_KEY
              valueFrom:
                secretKeyRef:
+                  {{- if .Values.clearml.existingAgentk8sglueSecret }}
+                  name: {{ .Values.clearml.existingAgentk8sglueSecret }}
+                  {{- else }}
                  name: {{ include "clearmlAgent.fullname" . }}-ac
+                  {{- end }}
                  key: agentk8sglue_secret
            - name: CLEARML_WORKER_ID
              value: {{ include "clearmlAgent.fullname" . }}
@@ -152,7 +162,14 @@ spec:
        - name: {{ include "clearmlAgent.fullname" . }}-pt
          configMap:
            name: {{ include "clearmlAgent.fullname" . }}-pt
-        {{ if .Values.clearml.clearmlConfig }}
+        {{ if .Values.clearml.existingClearmlConfigSecret }}
+        - name: k8sagent-clearml-conf-volume
+          secret:
+            secretName: {{ .Values.clearml.existingClearmlConfigSecret }}
+            items:
+            - key: clearml.conf
+              path: clearml.conf
+        {{ else if .Values.clearml.clearmlConfig }}
        - name: k8sagent-clearml-conf-volume
          secret:
            secretName: {{ include "clearmlAgent.fullname" . }}-ac
--- a/charts/clearml-agent/templates/clearml-secrets.yaml
+++ b/charts/clearml-agent/templates/clearml-secrets.yaml
@@ -1,3 +1,4 @@
+{{- if or (not .Values.clearml.existingAgentk8sglueSecret) (not .Values.clearml.existingClearmlConfigSecret) }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -6,6 +7,7 @@ data:
  agentk8sglue_key: {{ .Values.clearml.agentk8sglueKey | b64enc }}
  agentk8sglue_secret: {{ .Values.clearml.agentk8sglueSecret | b64enc }}
  clearml.conf: {{ .Values.clearml.clearmlConfig | b64enc }}
+{{- end }}
 ---
 {{- if .Values.imageCredentials.enabled }}
 {{- if not .Values.imageCredentials.existingSecret }}
--- a/charts/clearml-agent/values.yaml
+++ b/charts/clearml-agent/values.yaml
@@ -29,6 +29,16 @@ clearml:

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

  # -- default container image for ClearML Task pod
  defaultContainerImage: ubuntu:18.04
-  # -- ClearML queue this agent will consume
+  # -- ClearML queue this agent will consume. Multiple queues can be specified with the following format: queue1,queue2,queue3
  queue: default
+  # -- if ClearML queue does not exist, it will be create it if the value is set to true
+  createQueueIfNotExists: true
  # -- labels setup for Agent pod (example in values.yaml comments)
  labels: {}
    # schedulerName: scheduler
--- a/charts/clearml-serving/Chart.yaml
+++ b/charts/clearml-serving/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: clearml-serving
 description: ClearML Serving Helm Chart
 type: application
-version: "1.5.4"
+version: "1.5.6"
 appVersion: "1.3.0"
-kubeVersion: ">= 1.21.0-0 < 1.30.0-0"
+kubeVersion: ">= 1.21.0-0 < 1.31.0-0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
@@ -33,5 +33,5 @@ dependencies:
    condition: grafana.enabled
 annotations:
  artifacthub.io/changes: |
-    - kind: fixed
-      description: kubernetes 1.29 support
+    - kind: added
+      description: k8s 1.30 support
--- a/charts/clearml-serving/README.md
+++ b/charts/clearml-serving/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Serving

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

 ClearML Serving Helm Chart

@@ -41,7 +41,7 @@ helm upgrade clearml-serving allegroai/clearml-serving --version <CURRENT CHART

 ## Requirements

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

 | Repository | Name | Version |
 |------------|------|---------|
--- a/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-inference-deployment.yaml
@@ -40,6 +40,10 @@ spec:
            name: "{{ include "clearmlServing.fullname" . }}-inference-configmap"
          {{- end }}
      {{- end }}
+      {{- with .Values.clearml_serving_inference.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      containers:
        - env:
            - name: CLEARML_API_ACCESS_KEY
@@ -98,10 +102,6 @@ spec:
          nodeSelector:
            {{- toYaml . | nindent 12 }}
          {{- end }}
-          {{- with .Values.clearml_serving_inference.affinity }}
-          affinity:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
          {{- with .Values.clearml_serving_inference.tolerations }}
          tolerations:
            {{- toYaml . | nindent 12 }}
--- a/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-statistics-deployment.yaml
@@ -41,6 +41,10 @@ spec:
            name: "{{ include "clearmlServing.fullname" . }}-statistics-configmap"
          {{- end }}
      {{- end }}
+      {{- with .Values.clearml_serving_statistics.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      containers:
        - env:
            - name: CLEARML_API_ACCESS_KEY
@@ -83,10 +87,6 @@ spec:
          nodeSelector:
            {{- toYaml . | nindent 12 }}
          {{- end }}
-          {{- with .Values.clearml_serving_statistics.affinity }}
-          affinity:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
          {{- with .Values.clearml_serving_statistics.tolerations }}
          tolerations:
            {{- toYaml . | nindent 12 }}
--- a/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
+++ b/charts/clearml-serving/templates/clearml-serving-triton-deployment.yaml
@@ -44,6 +44,10 @@ spec:
            name: "{{ include "clearmlServing.fullname" . }}-triton-configmap"
          {{- end }}
      {{- end }}
+      {{- with .Values.clearml_serving_triton.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
      containers:
        - env:
            - name: CLEARML_API_ACCESS_KEY
@@ -78,11 +82,6 @@ spec:
            - name: additional-config
              mountPath: /opt/clearml/config
          {{- end }}
-          
-          {{- with .Values.clearml_serving_triton.affinity }}
-          affinity:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
          {{- with .Values.clearml_serving_triton.tolerations }}
          tolerations:
            {{- toYaml . | nindent 12 }}
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "7.8.2"
+version: "7.9.0"
 appVersion: "1.15"
-kubeVersion: ">= 1.21.0-0 < 1.30.0-0"
+kubeVersion: ">= 1.21.0-0 < 1.31.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: asyncdelete wrong selector
+    - kind: added
+      description: Ability to add annotations to Deployments
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes

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

 MLOps platform

@@ -133,7 +133,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a

 ## Requirements

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

 | Repository | Name | Version |
 |------------|------|---------|
@@ -145,15 +145,16 @@ Kubernetes: `>= 1.21.0-0 < 1.30.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.15.0-472"},"ingress":{"annotations":{},"enabled":false,"hostName":"api.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"prepopulateEnabled":true,"processes":{"count":8,"maxRequests":1000,"maxRequestsJitter":300,"timeout":24000},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30008,"port":8008,"type":"NodePort"},"serviceAccountName":"clearml","tolerations":[]}` | Api Server configurations |
+| apiserver | object | `{"additionalConfigs":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":null,"enabled":true,"existingAdditionalConfigsConfigMap":"","existingAdditionalConfigsSecret":"","extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"},"ingress":{"annotations":{},"enabled":false,"hostName":"api.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"prepopulateEnabled":true,"processes":{"count":8,"maxRequests":1000,"maxRequestsJitter":300,"timeout":24000},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30008,"port":8008,"type":"NodePort"},"serviceAccountName":"clearml","tolerations":[]}` | Api Server configurations |
 | apiserver.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 |
+| apiserver.deploymentAnnotations | string | `nil` | Add the provided map to the annotations for the Deployment resource created by this chart. |
 | apiserver.enabled | bool | `true` | Enable/Disable component deployment |
 | apiserver.existingAdditionalConfigsConfigMap | string | `""` | reference for files declared in existing ConfigMap will be mounted and read by apiserver (examples in values.yaml) |
 | apiserver.existingAdditionalConfigsSecret | string | `""` | reference for files declared in existing Secret will be mounted and read by apiserver (examples in values.yaml) if not overridden by existingAdditionalConfigsConfigMap |
 | apiserver.extraEnvs | list | `[]` | Api Server extra envrinoment variables |
-| apiserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.0-472"}` | Api Server image configuration |
+| apiserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"}` | Api Server image configuration |
 | apiserver.ingress | object | `{"annotations":{},"enabled":false,"hostName":"api.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""}` | Ingress configuration for Api Server component |
 | apiserver.ingress.annotations | object | `{}` | Ingress annotations |
 | apiserver.ingress.enabled | bool | `false` | Enable/Disable ingress |
@@ -201,12 +202,13 @@ Kubernetes: `>= 1.21.0-0 < 1.30.0-0`
 | externalServices.mongodbConnectionStringBackend | string | `"mongodb://mongodb_hostnamehostname:27017/backend"` | Existing MongoDB connection string for AUTH to use if mongodb.enabled is false (example in values.yaml) |
 | externalServices.redisHost | string | `"redis_hostname"` | Existing Redis Hostname to use if redis.enabled is false (example in values.yaml) |
 | externalServices.redisPort | int | `6379` | Existing Redis Port to use if redis.enabled is false |
-| fileserver | object | `{"affinity":{},"containerSecurityContext":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.0-472"},"ingress":{"annotations":{},"enabled":false,"hostName":"files.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30081,"port":8081,"type":"NodePort"},"serviceAccountName":"clearml","storage":{"data":{"accessMode":"ReadWriteOnce","class":"","existingPVC":"","size":"50Gi"},"enabled":true},"tolerations":[]}` | File Server configurations |
+| fileserver | object | `{"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"},"ingress":{"annotations":{},"enabled":false,"hostName":"files.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30081,"port":8081,"type":"NodePort"},"serviceAccountName":"clearml","storage":{"data":{"accessMode":"ReadWriteOnce","class":"","existingPVC":"","size":"50Gi"},"enabled":true},"tolerations":[]}` | File Server configurations |
 | fileserver.affinity | object | `{}` | File Server affinity setup |
 | fileserver.containerSecurityContext | object | `{}` | File Server containers security context |
+| fileserver.deploymentAnnotations | object | `{}` | Add the provided map to the annotations for the Deployment resource created by this chart. |
 | fileserver.enabled | bool | `true` | Enable/Disable component deployment |
 | fileserver.extraEnvs | list | `[]` | File Server extra envrinoment variables |
-| fileserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.0-472"}` | File Server image configuration |
+| fileserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"}` | 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 |
@@ -241,13 +243,14 @@ Kubernetes: `>= 1.21.0-0 < 1.30.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.15.0-472"},"ingress":{"annotations":{},"enabled":false,"hostName":"app.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30080,"port":8080,"type":"NodePort"},"serviceAccountName":"clearml","tolerations":[]}` | Web Server configurations |
+| webserver | object | `{"additionalConfigs":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"},"ingress":{"annotations":{},"enabled":false,"hostName":"app.clearml.127-0-0-1.nip.io","ingressClassName":"","path":"/","tlsSecretName":""},"initContainers":{"resources":{"limits":{"cpu":"10m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"64Mi"}}},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"service":{"annotations":{},"nodePort":30080,"port":8080,"type":"NodePort"},"serviceAccountName":"clearml","tolerations":[]}` | Web Server configurations |
 | webserver.additionalConfigs | object | `{}` | Additional specific webserver configurations |
 | webserver.affinity | object | `{}` | Web Server affinity setup |
 | webserver.containerSecurityContext | object | `{}` | Web Server containers security context |
+| webserver.deploymentAnnotations | object | `{}` | Add the provided map to the annotations for the Deployment resource created by this chart. |
 | webserver.enabled | bool | `true` | Enable/Disable component deployment |
 | webserver.extraEnvs | list | `[]` | Web Server extra envrinoment variables |
-| webserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.0-472"}` | Web Server image configuration |
+| webserver.image | object | `{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"1.15.1-478"}` | 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 |
--- a/charts/clearml/templates/apiserver-deployment.yaml
+++ b/charts/clearml/templates/apiserver-deployment.yaml
@@ -5,6 +5,10 @@ metadata:
  name: {{ include "apiserver.referenceName" . }}
  labels:
    {{- include "clearml.labels" . | nindent 4 }}
+{{- with .Values.apiserver.deploymentAnnotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
  replicas: {{ .Values.apiserver.replicaCount }}
  selector:
--- a/charts/clearml/templates/fileserver-deployment.yaml
+++ b/charts/clearml/templates/fileserver-deployment.yaml
@@ -5,6 +5,10 @@ metadata:
  name: {{ include "fileserver.referenceName" . }}
  labels:
    {{- include "clearml.labels" . | nindent 4 }}
+{{- with .Values.fileserver.deploymentAnnotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
  replicas: {{ .Values.fileserver.replicaCount }}
  selector:
--- a/charts/clearml/templates/webserver-deployment.yaml
+++ b/charts/clearml/templates/webserver-deployment.yaml
@@ -5,6 +5,10 @@ metadata:
  name: {{ include "webserver.referenceName" . }}
  labels:
    {{- include "clearml.labels" . | nindent 4 }}
+{{- with .Values.webserver.deploymentAnnotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
 spec:
  replicas: {{ .Values.webserver.replicaCount }}
  selector:
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -56,6 +56,8 @@ clearml:
 apiserver:
  # -- Enable/Disable component deployment
  enabled: true
+  # -- Add the provided map to the annotations for the Deployment resource created by this chart.
+  deploymentAnnotations:
  # -- Enable/Disable example data load
  prepopulateEnabled: true
  # -- The default serviceAccountName to be used
@@ -65,7 +67,7 @@ apiserver:
    registry: ""
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.15.0-472"
+    tag: "1.15.1-478"
  # -- Api Server internal service configuration
  service:
    # -- specific annotation for Api Server service
@@ -174,6 +176,8 @@ apiserver:
 fileserver:
  # -- Enable/Disable component deployment
  enabled: true
+  # -- Add the provided map to the annotations for the Deployment resource created by this chart.
+  deploymentAnnotations: {}
  # -- The default serviceAccountName to be used
  serviceAccountName: clearml
  # -- File Server image configuration
@@ -181,7 +185,7 @@ fileserver:
    registry: ""
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.15.0-472"
+    tag: "1.15.1-478"
  # -- File Server internal service configuration
  service:
    # -- specific annotation for File Server service
@@ -258,6 +262,8 @@ fileserver:
 webserver:
  # -- Enable/Disable component deployment
  enabled: true
+  # -- Add the provided map to the annotations for the Deployment resource created by this chart.
+  deploymentAnnotations: {}
  # -- The default serviceAccountName to be used
  serviceAccountName: clearml
  # -- Web Server image configuration
@@ -265,7 +271,7 @@ webserver:
    registry: ""
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.15.0-472"
+    tag: "1.15.1-478"
  # -- Web Server internal service configuration
  service:
    # -- specific annotation for Web Server service
Author	SHA1	Message	Date
Daglar Berk Erdem	312813cc34	Added: deploymentAnnotations (#292 ) * added deploymentAnnotations * version minor bump * fixed version in README * removed precommit file --------- Co-authored-by: Dağlar Berk Erdem <daglar@codeway.co>	2024-05-28 08:40:54 +02:00
Uzmar Gomez	255cabfd7f	Feature/multiplequeues (#286 ) * copy changes * add workflow when push * update readme * update readme * delete test workflow * bump chart version to 5.2.0 * test ci * delete test ci * bump kubeversion * update readme * Update Chart.yaml --------- Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2024-05-15 16:19:40 +02:00
Valeriano Manassero	204e2ac350	Fixed: 1.5.6 release (#289 )	2024-05-15 09:32:02 +02:00
Valeriano Manassero	56d246fcea	Added: k8s 1.30 support (#288 )	2024-05-15 09:26:44 +02:00
Valeriano Manassero	0e4a809d46	Added: 1.30 support (#287 )	2024-05-15 08:59:34 +02:00
Uzmar Gomez	cfe62484af	Use existingClearmlConfigSecret (#283 ) * use config as secret * update chart and readme * avoid creating secret if not needed * move string on values.yaml	2024-05-14 11:05:03 +02:00
Valeriano Manassero	5ded87ec92	Update 1.15.1 (#284 ) * Changed: 1.15.1 update * Changed: bump up version	2024-05-14 08:24:24 +02:00
stephanbertl	65393cd4bf	affinity for serving deployments was incorrectly put under containers… (#280 ) * affinity for serving deployments was incorrectly put under containers. It needs to be put at pod spec level. * Fixed: helm docs generation * Fixed: helm-docs generation --------- Co-authored-by: = <s.bertl@iaea.org> Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2024-05-07 14:03:29 +02:00
savitha-qs	4845bd3f4f	Issue-275: Honor existingAgentk8sglueSecret in deployment template (#276 ) * Issue-275: Honor existingAgentk8sglueSecret in deployment template * Issue-275: rev the patch version of the chart * Issue-275: update README for clearml-agent chart * Issue-275: update annotation in Chart.yaml * Issue-275: remove item not relevant to Issue 275 from Chart annotations * Issue-275: add new line to end of file to get lint to pass * Update Chart.yaml --------- Co-authored-by: Savitha Ganapathi <sganapathi@quantumscape.com> Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com>	2024-04-02 08:47:14 +02:00