Use Recreate as strategy (#19)

* use Recreate as strategybump up version

* fix strategy indentation and position

* updatesStrategy configurable

* updateStrategy parameter

* use 2.2.0 instead of patch release

README.md

@@ -1,12 +1,8 @@
 # ClearML Helm Charts Library for Kubernetes
 
-Helm charts provided by [Allegro AI](https://clear.ml), ready to launch on Kubernetes using [Kubernetes Helm](https://github.com/helm/helm).
-
 ##  Auto-Magical Experiment Manager & Version Control for AI
 
-[![GitHub license](https://img.shields.io/badge/license-SSPL-green.svg)](https://img.shields.io/badge/license-SSPL-green.svg)
-[![GitHub version](https://img.shields.io/github/release-pre/allegroai/clearml-server.svg)](https://img.shields.io/github/release-pre/allegroai/clearml-server.svg)
-[![PyPI status](https://img.shields.io/badge/status-beta-yellow.svg)](https://img.shields.io/badge/status-beta-yellow.svg)
+Helm charts provided by [Allegro AI](https://clear.ml), ready to launch on Kubernetes using [Kubernetes Helm](https://github.com/helm/helm).
 
 ## Introduction
 
@@ -84,4 +80,4 @@ Additionally, you can always find us at *clearml@allegro.ai*
 **PRs are always welcomed** :heart: See more details in the ClearML [Guidelines for Contributing](https://github.com/allegroai/clearml-helm-charts/blob/main/CONTRIBUTING.md).
 
 
-_May the force (and the goddess of learning rates) be with you!_
+_May the force (and the goddess of learning rates) be with you!_

charts/clearml/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "2.0.0"
-appVersion: "1.1.0"
+version: "2.2.0"
+appVersion: "1.1.1"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:

charts/clearml/README.md

@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.0](https://img.shields.io/badge/AppVersion-1.1.0-informational?style=flat-square)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
 
 MLOps platform
 
@@ -131,6 +131,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentGroups.agent-group-cpu.queues | string | `"default"` |  |
 | agentGroups.agent-group-cpu.replicaCount | int | `1` |  |
 | agentGroups.agent-group-cpu.tolerations | list | `[]` |  |
+| agentGroups.agent-group-cpu.updateStrategy | string | `"Recreate"` |  |
 | agentGroups.agent-group-gpu.affinity | object | `{}` |  |
 | agentGroups.agent-group-gpu.agentVersion | string | `""` |  |
 | agentGroups.agent-group-gpu.awsAccessKeyId | string | `nil` |  |
@@ -153,6 +154,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentGroups.agent-group-gpu.queues | string | `"default"` |  |
 | agentGroups.agent-group-gpu.replicaCount | int | `0` |  |
 | agentGroups.agent-group-gpu.tolerations | list | `[]` |  |
+| agentGroups.agent-group-gpu.updateStrategy | string | `"Recreate"` |  |
 | agentservices.affinity | object | `{}` |  |
 | agentservices.agentVersion | string | `""` |  |
 | agentservices.awsAccessKeyId | string | `nil` |  |
@@ -183,7 +185,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | apiserver.extraEnvs | list | `[]` |  |
 | apiserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | apiserver.image.repository | string | `"allegroai/clearml"` |  |
-| apiserver.image.tag | string | `"1.1.0"` |  |
+| apiserver.image.tag | string | `"1.1.1"` |  |
 | apiserver.livenessDelay | int | `60` |  |
 | apiserver.nodeSelector | object | `{}` |  |
 | apiserver.podAnnotations | object | `{}` |  |
@@ -239,7 +241,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | fileserver.extraEnvs | list | `[]` |  |
 | fileserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | fileserver.image.repository | string | `"allegroai/clearml"` |  |
-| fileserver.image.tag | string | `"1.1.0"` |  |
+| fileserver.image.tag | string | `"1.1.1"` |  |
 | fileserver.nodeSelector | object | `{}` |  |
 | fileserver.podAnnotations | object | `{}` |  |
 | fileserver.replicaCount | int | `1` |  |
@@ -252,6 +254,9 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | ingress.annotations | object | `{}` |  |
 | ingress.enabled | bool | `false` |  |
 | ingress.host | string | `""` |  |
+| ingress.hostPrefixApi | string | `"api."` |  |
+| ingress.hostPrefixApp | string | `"app."` |  |
+| ingress.hostPrefixFiles | string | `"files."` |  |
 | ingress.name | string | `"clearml-server-ingress"` |  |
 | ingress.tls.secretName | string | `""` |  |
 | mongodb.architecture | string | `"standalone"` |  |
@@ -278,7 +283,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | webserver.extraEnvs | list | `[]` |  |
 | webserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | webserver.image.repository | string | `"allegroai/clearml"` |  |
-| webserver.image.tag | string | `"1.1.0"` |  |
+| webserver.image.tag | string | `"1.1.1"` |  |
 | webserver.nodeSelector | object | `{}` |  |
 | webserver.podAnnotations | object | `{}` |  |
 | webserver.replicaCount | int | `1` |  |

charts/clearml/templates/deployment-agent.yaml

@@ -9,6 +9,8 @@ metadata:
     {{- include "clearml.labels" $ | nindent 4 }}
 spec:
   replicas: {{ .replicaCount }}
+  strategy:
+    type: {{ .updateStrategy }}
   selector:
     matchLabels:
       {{- include "clearml.selectorLabelsAgent" $ | nindent 6 }}
@@ -91,6 +93,13 @@ spec:
               python3 -m pip install -U pip ;
               python3 -m pip install clearml-agent{{ .agentVersion}} ;
               CLEARML_AGENT_K8S_HOST_MOUNT=/root/.clearml:/root/.clearml clearml-agent daemon --queue {{ .queues}}"
+          {{ if .clearmlConfig }}
+          volumeMounts:
+           - name: agent-clearml-conf-volume
+             mountPath: /root/clearml.conf
+             subPath: clearml.conf
+             readOnly: true
+          {{- end }}
       {{- with .nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/clearml/templates/ingress.yaml

@@ -18,30 +18,33 @@ spec:
   {{- if .Values.ingress.tls.secretName }}
   tls:
     - hosts:
-        - "app.{{ .Values.ingress.host }}"
-        - "files.{{ .Values.ingress.host }}"
-        - "api.{{ .Values.ingress.host }}"
+        - "{{ .Values.ingress.hostPrefixAp }}{{ .Values.ingress.host }}"
+        - "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
+        - "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
       secretName: {{ .Values.ingress.tls.secretName }}
   {{- end }}
   rules:
-    - host: "app.{{ .Values.ingress.host }}"
+    - host: "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
       http:
         paths:
-          - path: "/*"
+          - path: "/"
+            pathType: Prefix
             backend:
               serviceName: {{ include "clearml.fullname" . }}-webserver
               servicePort: {{ .Values.webserver.service.port }}
-    - host: "api.{{ .Values.ingress.host }}"
+    - host: "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
       http:
         paths:
-          - path: "/*"
+          - path: "/"
+            pathType: Prefix
             backend:
               serviceName: {{ include "clearml.fullname" . }}-apiserver
               servicePort: {{ .Values.apiserver.service.port }}
-    - host: "files.{{ .Values.ingress.host }}"
+    - host: "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
       http:
         paths:
-          - path: "/*"
+          - path: "/"
+            pathType: Prefix
             backend:
               serviceName: {{ include "clearml.fullname" . }}-fileserver
               servicePort: {{ .Values.fileserver.service.port }}

charts/clearml/values.yaml

@@ -5,6 +5,9 @@ ingress:
   name: clearml-server-ingress
   annotations: {}
   host: ""
+  hostPrefixApp: "app."
+  hostPrefixApi: "api."
+  hostPrefixFiles: "files."
   tls:
     secretName: ""
 
@@ -26,7 +29,7 @@ apiserver:
   image:
     repository: "allegroai/clearml"
     pullPolicy: IfNotPresent
-    tag: "1.1.0"
+    tag: "1.1.1"
 
   extraEnvs: []
 
@@ -67,7 +70,7 @@ fileserver:
   image:
     repository: "allegroai/clearml"
     pullPolicy: IfNotPresent
-    tag: "1.1.0"
+    tag: "1.1.1"
 
   extraEnvs: []
 
@@ -108,7 +111,7 @@ webserver:
   image:
     repository: "allegroai/clearml"
     pullPolicy: IfNotPresent
-    tag: "1.1.0"
+    tag: "1.1.1"
 
   podAnnotations: {}
 
@@ -183,6 +186,7 @@ agentGroups:
   agent-group-cpu:
     name: agent-group-cpu
     replicaCount: 1
+    updateStrategy: Recreate
     nvidiaGpusPerAgent: 0
     agentVersion: ""  # if set, it *MUST* include comparison operator (e.g. ">=0.16.1")
     queues: "default"  # multiple queues can be specified separated by a space (e.g. "important_jobs default")
@@ -215,6 +219,7 @@ agentGroups:
   agent-group-gpu:
     name: agent-group-gpu
     replicaCount: 0
+    updateStrategy: Recreate
     nvidiaGpusPerAgent: 1
     agentVersion: ""  # if set, it *MUST* include comparison operator (e.g. ">=0.16.1")
     queues: "default"  # multiple queues can be specified separated by a space (e.g. "important_jobs default")