Agent foreground mode (#46 )

* use foreground to push output on console * bump up version
add k8s 1.22.1 to ci procedure (#44 )
2025-04-17 01:31:13 +00:00 · 2021-12-13 09:04:02 +01:00 · 2021-12-09 11:47:13 +01:00 · 2021-12-09 11:39:04 +01:00 · 2021-12-09 11:30:15 +01:00 · 2021-12-09 11:00:57 +01:00
22 changed files with 494 additions and 127 deletions
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -21,8 +21,9 @@ jobs:
    strategy:
      matrix:
        k8s:
-          - v1.20.7
-          - v1.21.1
+          - v1.21.2
+          - v1.22.1
+          - v1.23.0
    steps:
      - name: Checkout
        uses: actions/checkout@v1
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,16 +1,60 @@
-# Contributing to AllegroAI helm charts repository
+# Guidelines for Contributing

-:+1::tada: First off, thank you for taking the time to contribute! :tada::+1:
+:+1::tada: Firstly, we thank you for taking the time to contribute! :tada::+1:

-This page contains information about reporting issues as well as some tips and guidelines useful to experienced open source contributors.
+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)
+* Suggesting new features or enhancements
+* Implementing new features or fixing outstanding issues

-## Reporting issues
-A great way to contribute to the project is to send a detailed report when you encounter an issue. We always appreciate a well-written, thorough bug report, and will thank you for it!
+The following is a set of guidelines for contributing to ClearML.
+These are primarily guidelines, not rules.
+Use your best judgment and feel free to propose changes to this document in a pull request.

-Check that our [issue database](https://github.com/allegroai/clearml-helm-charts/issues) doesn't already include that problem or suggestion before submitting an issue. If you find a match, you can use the "subscribe" button to get notified on updates. Do not leave random "+1" or "I have this too" comments, as they only clutter the discussion, and don't help resolving it. However, if you have ways to reproduce the issue or have additional information that may help resolving the issue, please leave a comment.
+## Reporting Issues

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

-## Contributing code
-Pull requests are always welcome! Not sure if that typo is worth a pull request? Found a bug and know how to fix it? Do it! We appreciate the help. Any significant improvement should be documented as [a GitHub issue](https://github.com/allegroai/clearml-helm-charts/issues) before starting working on it.
+Before reporting an issue, please check whether it already appears [here](https://github.com/allegroai/clearml-helm-charts/issues).
+If it does, join the on-going discussion instead.

-We are always thrilled to receive pull requests and we do our best to process them quickly and provide feedback
+**Note**: If you find a **Closed** issue that may be the same issue which you are currently experiencing,
+then open a **New** issue and include a link to the original (Closed) issue in the body of your new one.
+
+When reporting an issue, please include as much detail as possible: explain the problem and include additional details to help maintainers reproduce the problem:
+
+* **Use a clear and descriptive title** for the issue to identify the problem.
+* **Describe the exact steps necessary to reproduce the problem** in as much detail as possible. Please do not just summarize what you did. Make sure to explain how you did it.
+* **Provide the specific environment setup.** Include the `pip freeze` output, specific environment variables, Python version, and other relevant information.
+* **Provide specific examples to demonstrate the steps.** Include links to files or GitHub projects, or copy/paste snippets which you use in those examples.
+* **If you are reporting any  ClearML crash,** include a crash report with a stack trace from the operating system. Make sure to add the crash report in the issue and place it in a [code block](https://help.github.com/en/articles/getting-started-with-writing-and-formatting-on-github#multiple-lines),
+a [file attachment](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests/), or just put it in a [gist](https://gist.github.com/) (and provide link to that gist).
+* **Describe the behavior you observed after following the steps** and the exact problem with that behavior.
+* **Explain which behavior you expected to see and why.**
+* **For Web-App issues, please include screenshots and animated GIFs** which recreate the described steps and clearly demonstrate the problem. You can use [LICEcap](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [silentcast](https://github.com/colinkeenan/silentcast) or [byzanz](https://github.com/threedaymonk/byzanz) on Linux.
+
+## Suggesting New Features and Enhancements
+
+By following these guidelines, you help maintainers and the community understand your suggestion and find related suggestions.
+
+Enhancement suggestions are tracked as GitHub issues. After you determine which repository your enhancement suggestion is related to, create an issue on that repository and provide the following:
+
+* **A clear and descriptive title** for the issue to identify the suggestion.
+* **A step-by-step description of the suggested enhancement** in as much detail as possible.
+* **Specific examples to demonstrate the steps.** Include copy/pasteable snippets which you use in those examples as [Markdown code blocks](https://help.github.com/articles/markdown-basics/#multiple-lines).
+* **Describe the current behavior and explain which behavior you expected to see instead and why.**
+* **Include screenshots or animated GIFs** which help you demonstrate the steps or point out the part of ClearML which the suggestion is related to. You can use [LICEcap](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [silentcast](https://github.com/colinkeenan/silentcast) or [byzanz](https://github.com/threedaymonk/byzanz) on Linux.
+
+## Pull Requests
+
+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*`
+
+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
@@ -1,7 +1,45 @@
 # ClearML Helm Charts Library for Kubernetes

+##  Auto-Magical Experiment Manager & Version Control for AI
+
 Helm charts provided by [Allegro AI](https://clear.ml), ready to launch on Kubernetes using [Kubernetes Helm](https://github.com/helm/helm).

+## Introduction
+
+The **clearml-server** is the backend service infrastructure for [ClearML](https://github.com/allegroai/clearml).
+It allows multiple users to collaborate and manage their experiments.
+By default, **ClearML** is set up to work with the **ClearML** demo server, which is open to anyone and resets periodically. 
+In order to host your own server, you will need to install **clearml-server** and point **ClearML** to it.
+
+**clearml-server** contains the following components:
+
+* The **ClearML** Web-App, a single-page UI for experiment management and browsing
+* RESTful API for:
+    * Documenting and logging experiment information, statistics and results
+    * Querying experiments history, logs and results
+* Locally-hosted file server for storing images and models making them easily accessible using the Web-App
+
+Use this repository to deploy **clearml-server** on Kubernetes clusters.
+
+## Provided in this repository
+
+### [All around Helm Chart](https://github.com/allegroai/clearml-helm-charts/tree/main/charts/clearml)
+
+## Who We Are
+
+ClearML is supported by the team behind *allegro.ai*,
+where we build deep learning pipelines and infrastructure for enterprise companies.
+
+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 
+will always upgrade with you.
+
+## License
+
+Server Side Public License, Version 1 (see the [LICENSE](https://en.wikipedia.org/wiki/Server_Side_Public_License) for more information)
+
 ## Requirements

 ### Setup a Kubernetes Cluster
@@ -26,3 +64,20 @@ $ helm repo update
 $ helm search repo allegroai
 $ helm install <release-name> allegroai/<chart>
 ```
+
+## Documentation, Community & Support
+
+More information in the [official documentation](https://allegro.ai/clearml/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*).
+
+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*
+
+## Contributing
+
+**PRs are always welcomed** :heart: See more details in the ClearML [Guidelines for Contributing](https://github.com/allegroai/clearml-helm-charts/blob/main/CONTRIBUTING.md).
+
+
+_May the force (and the goddess of learning rates) be with you!_
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "2.0.0-beta2"
-appVersion: "1.0.2"
+version: "3.2.2"
+appVersion: "1.1.1"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
 sources:
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes

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

@@ -39,14 +39,20 @@ apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
  extraPortMappings:
+  # API server's default nodePort is 30008. If you customize it in helm values by
+  # `apiserver.service.nodePort`, `containerPort` should match it
  - containerPort: 30008
    hostPort: 30008
    listenAddress: "127.0.0.1"
    protocol: TCP
+  # Web server's default nodePort is 30080. If you customize it in helm values by
+  # `webserver.service.nodePort`, `containerPort` should match it
  - containerPort: 30080
    hostPort: 30080
    listenAddress: "127.0.0.1"
    protocol: TCP
+  # File server's default nodePort is 30081. If you customize it in helm values by
+  # `fileserver.service.nodePort`, `containerPort` should match it
  - containerPort: 30081
    hostPort: 30081
    listenAddress: "127.0.0.1"
@@ -121,6 +127,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentGroups.agent-group-cpu.clearmlGitPassword | string | `nil` |  |
 | agentGroups.agent-group-cpu.clearmlGitUser | string | `nil` |  |
 | agentGroups.agent-group-cpu.clearmlSecretKey | string | `nil` |  |
+| agentGroups.agent-group-cpu.enabled | bool | `true` |  |
 | agentGroups.agent-group-cpu.image.pullPolicy | string | `"IfNotPresent"` |  |
 | agentGroups.agent-group-cpu.image.repository | string | `"ubuntu"` |  |
 | agentGroups.agent-group-cpu.image.tag | string | `"18.04"` |  |
@@ -131,6 +138,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` |  |
@@ -143,6 +151,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentGroups.agent-group-gpu.clearmlGitPassword | string | `nil` |  |
 | agentGroups.agent-group-gpu.clearmlGitUser | string | `nil` |  |
 | agentGroups.agent-group-gpu.clearmlSecretKey | string | `nil` |  |
+| agentGroups.agent-group-gpu.enabled | bool | `true` |  |
 | agentGroups.agent-group-gpu.image.pullPolicy | string | `"IfNotPresent"` |  |
 | agentGroups.agent-group-gpu.image.repository | string | `"nvidia/cuda"` |  |
 | agentGroups.agent-group-gpu.image.tag | string | `"11.0-base-ubuntu18.04"` |  |
@@ -153,6 +162,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` |  |
@@ -166,6 +176,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentservices.clearmlHostIp | string | `nil` |  |
 | agentservices.clearmlWebHost | string | `nil` |  |
 | agentservices.clearmlWorkerId | string | `"clearml-services"` |  |
+| agentservices.enabled | bool | `false` |  |
 | agentservices.extraEnvs | list | `[]` |  |
 | agentservices.googleCredentials | string | `nil` |  |
 | agentservices.image.pullPolicy | string | `"IfNotPresent"` |  |
@@ -178,12 +189,14 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentservices.storage.data.class | string | `"standard"` |  |
 | agentservices.storage.data.size | string | `"50Gi"` |  |
 | agentservices.tolerations | list | `[]` |  |
+| apiserver.additionalConfigs | object | `{}` |  |
 | apiserver.affinity | object | `{}` |  |
+| apiserver.authCookiesMaxAge | int | `864000` | Amount of seconds the authorization cookie will last in user browser |
 | apiserver.configDir | string | `"/opt/clearml/config"` |  |
 | apiserver.extraEnvs | list | `[]` |  |
 | apiserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | apiserver.image.repository | string | `"allegroai/clearml"` |  |
-| apiserver.image.tag | string | `"1.0.2"` |  |
+| apiserver.image.tag | string | `"1.1.1"` |  |
 | apiserver.livenessDelay | int | `60` |  |
 | apiserver.nodeSelector | object | `{}` |  |
 | apiserver.podAnnotations | object | `{}` |  |
@@ -193,11 +206,9 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | apiserver.readinessDelay | int | `60` |  |
 | apiserver.replicaCount | int | `1` |  |
 | apiserver.resources | object | `{}` |  |
+| 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.service.port | int | `8008` |  |
-| apiserver.service.type | string | `"NodePort"` |  |
-| apiserver.storage.config.class | string | `"standard"` |  |
-| apiserver.storage.config.size | string | `"1Gi"` |  |
-| apiserver.storage.enableConfigVolume | bool | `false` |  |
+| apiserver.service.type | string | `"NodePort"` | This will set to service's spec.type field |
 | apiserver.tolerations | list | `[]` |  |
 | clearml.defaultCompany | string | `"d1bd92a3b039400cbafc60a7a5b1e52b"` |  |
 | elasticsearch.clusterHealthCheckParams | string | `"wait_for_status=yellow&timeout=1s"` |  |
@@ -235,25 +246,36 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | elasticsearch.roles.remote_cluster_client | string | `"true"` |  |
 | elasticsearch.volumeClaimTemplate.accessModes[0] | string | `"ReadWriteOnce"` |  |
 | elasticsearch.volumeClaimTemplate.resources.requests.storage | string | `"50Gi"` |  |
+| externalServices.elasticsearchHost | string | `""` | Existing ElasticSearch Hostname to use if elasticsearch.enabled is false |
+| externalServices.elasticsearchPort | int | `9200` | Existing ElasticSearch Port to use if elasticsearch.enabled is false |
+| externalServices.mongodbHost | string | `""` | Existing MongoDB Hostname to use if elasticsearch.enabled is false |
+| externalServices.mongodbPort | int | `27017` | Existing MongoDB Port to use if elasticsearch.enabled is false |
+| externalServices.redisHost | string | `""` | Existing Redis Hostname to use if elasticsearch.enabled is false |
+| externalServices.redisPort | int | `6379` | Existing Redis Port to use if elasticsearch.enabled is false |
 | fileserver.affinity | object | `{}` |  |
 | fileserver.extraEnvs | list | `[]` |  |
 | fileserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | fileserver.image.repository | string | `"allegroai/clearml"` |  |
-| fileserver.image.tag | string | `"1.0.2"` |  |
+| fileserver.image.tag | string | `"1.1.1"` |  |
 | fileserver.nodeSelector | object | `{}` |  |
 | fileserver.podAnnotations | object | `{}` |  |
 | fileserver.replicaCount | int | `1` |  |
 | fileserver.resources | object | `{}` |  |
+| fileserver.service.nodePort | int | `30081` | If service.type set to NodePort, this will be set to service's nodePort field. If service.type is set to others, this field will be ignored |
 | fileserver.service.port | int | `8081` |  |
-| fileserver.service.type | string | `"NodePort"` |  |
+| fileserver.service.type | string | `"NodePort"` | This will set to service's spec.type field |
 | fileserver.storage.data.class | string | `"standard"` |  |
 | fileserver.storage.data.size | string | `"50Gi"` |  |
 | fileserver.tolerations | list | `[]` |  |
 | ingress.annotations | object | `{}` |  |
+| ingress.api.hostName | string | `"api.clearml.127-0-0-1.nip.io"` |  |
+| ingress.api.tlsSecretName | string | `""` |  |
+| ingress.app.hostName | string | `"app.clearml.127-0-0-1.nip.io"` |  |
+| ingress.app.tlsSecretName | string | `""` |  |
 | ingress.enabled | bool | `false` |  |
-| ingress.host | string | `""` |  |
+| ingress.files.hostName | string | `"files.clearml.127-0-0-1.nip.io"` |  |
+| ingress.files.tlsSecretName | string | `""` |  |
 | ingress.name | string | `"clearml-server-ingress"` |  |
-| ingress.tls.secretName | string | `""` |  |
 | mongodb.architecture | string | `"standalone"` |  |
 | mongodb.auth.enabled | bool | `false` |  |
 | mongodb.enabled | bool | `true` |  |
@@ -274,15 +296,22 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | redis.master.persistence.size | string | `"5Gi"` |  |
 | redis.master.port | int | `6379` |  |
 | redis.usePassword | bool | `false` |  |
+| secret.authToken | string | `"1SCf0ov3Nm544Td2oZ0gXSrsNx5XhMWdVlKz1tOgcx158bD5RV"` | Set for auth_token field |
+| secret.credentials.apiserver.accessKey | string | `"5442F3443MJMORWZA3ZH"` | Set for apiserver_key field |
+| secret.credentials.apiserver.secretKey | string | `"BxapIRo9ZINi8x25CRxz8Wdmr2pQjzuWVB4PNASZqCtTyWgWVQ"` | Set for apiserver_secret field |
+| secret.credentials.tests.accessKey | string | `"ENP39EQM4SLACGD5FXB7"` | Set for tests_user_key field |
+| secret.credentials.tests.secretKey | string | `"lPcm0imbcBZ8mwgO7tpadutiS3gnJD05x9j7afwXPS35IKbpiQ"` | Set for tests_user_secret field |
+| secret.httpSession | string | `"9Tw20RbhJ1bLBiHEOWXvhplKGUbTgLzAtwFN2oLQvWwS0uRpD5"` | Set for http_session field |
 | webserver.affinity | object | `{}` |  |
 | webserver.extraEnvs | list | `[]` |  |
 | webserver.image.pullPolicy | string | `"IfNotPresent"` |  |
 | webserver.image.repository | string | `"allegroai/clearml"` |  |
-| webserver.image.tag | string | `"1.0.2"` |  |
+| webserver.image.tag | string | `"1.1.1"` |  |
 | webserver.nodeSelector | object | `{}` |  |
 | webserver.podAnnotations | object | `{}` |  |
 | webserver.replicaCount | int | `1` |  |
 | webserver.resources | object | `{}` |  |
+| webserver.service.nodePort | int | `30080` | If service.type set to NodePort, this will be set to service's nodePort field. If service.type is set to others, this field will be ignored |
 | webserver.service.port | int | `80` |  |
-| webserver.service.type | string | `"NodePort"` |  |
+| webserver.service.type | string | `"NodePort"` | This will set to service's spec.type field |
 | webserver.tolerations | list | `[]` |  |
--- a/charts/clearml/README.md.gotmpl
+++ b/charts/clearml/README.md.gotmpl
@@ -36,14 +36,20 @@ apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
  extraPortMappings:
+  # API server's default nodePort is 30008. If you customize it in helm values by
+  # `apiserver.service.nodePort`, `containerPort` should match it
  - containerPort: 30008
    hostPort: 30008
    listenAddress: "127.0.0.1"
    protocol: TCP
+  # Web server's default nodePort is 30080. If you customize it in helm values by
+  # `webserver.service.nodePort`, `containerPort` should match it
  - containerPort: 30080
    hostPort: 30080
    listenAddress: "127.0.0.1"
    protocol: TCP
+  # File server's default nodePort is 30081. If you customize it in helm values by
+  # `fileserver.service.nodePort`, `containerPort` should match it
  - containerPort: 30081
    hostPort: 30081
    listenAddress: "127.0.0.1"
--- a/charts/clearml/templates/_helpers.tpl
+++ b/charts/clearml/templates/_helpers.tpl
@@ -95,3 +95,48 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create the name of the App service to use
+*/}}
+{{- define "clearml.serviceApp" -}}
+{{- if .Values.ingress.enabled }}
+{{- if .Values.ingress.app.tlsSecretName }}
+{{- printf "%s%s" "https://" .Values.ingress.app.hostName }}
+{{- else }}
+{{- printf "%s%s" "http://" .Values.ingress.app.hostName }}
+{{- end }}
+{{- else }}
+{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-webserver:" (.Values.webserver.service.port | toString) }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the Api service to use
+*/}}
+{{- define "clearml.serviceApi" -}}
+{{- if .Values.ingress.enabled }}
+{{- if .Values.ingress.api.tlsSecretName }}
+{{- printf "%s%s" "https://" .Values.ingress.api.hostName }}
+{{- else }}
+{{- printf "%s%s" "http://" .Values.ingress.api.hostName }}
+{{- end }}
+{{- else }}
+{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-apiserver:" (.Values.apiserver.service.port | toString) }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the Files service to use
+*/}}
+{{- define "clearml.serviceFiles" -}}
+{{- if .Values.ingress.enabled }}
+{{- if .Values.ingress.files.tlsSecretName }}
+{{- printf "%s%s" "https://" .Values.ingress.files.hostName }}
+{{- else }}
+{{- printf "%s%s" "http://" .Values.ingress.files.hostName }}
+{{- end }}
+{{- else }}
+{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-fileserver:" (.Values.fileserver.service.port | toString) }}
+{{- end }}
+{{- end }}
--- a/charts/clearml/templates/configmap-apiserver.yaml
+++ b/charts/clearml/templates/configmap-apiserver.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.apiserver.additionalConfigs -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "{{ include "clearml.fullname" . }}-apiserver-configmap"
+  labels:
+    {{- include "clearml.labels" . | nindent 4 }}
+data:
+  {{- range $key, $val := .Values.apiserver.additionalConfigs }}
+  {{ $key }}: |
+    {{- $val | nindent 4 }}
+  {{- end }}
+{{- end -}}
--- a/charts/clearml/templates/deployment-agent.yaml
+++ b/charts/clearml/templates/deployment-agent.yaml
@@ -1,5 +1,6 @@
 {{- range $key, $value := .Values.agentGroups }}
 {{- with $value }}
+{{- if .enabled }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -9,13 +10,16 @@ metadata:
    {{- include "clearml.labels" $ | nindent 4 }}
 spec:
  replicas: {{ .replicaCount }}
+  strategy:
+    type: {{ .updateStrategy }}
  selector:
    matchLabels:
      {{- include "clearml.selectorLabelsAgent" $ | nindent 6 }}
  template:
    metadata:
-      {{- with .podAnnotations }}
      annotations:
+        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") $ | sha256sum }}
+      {{- with .podAnnotations }}
        {{- toYaml . | nindent 8 }}
      {{- end }}
      labels:
@@ -38,7 +42,7 @@ spec:
            - -c
            - >
              set -x;
-              while [ $(curl -sw '%{http_code}' "http://{{ include "clearml.fullname" $ }}-apiserver:{{ $.Values.apiserver.service.port }}/debug.ping" -o /dev/null) -ne 200 ] ; do
+              while [ $(curl -sw '%{http_code}' "{{ include "clearml.serviceApi" $ }}/debug.ping" -o /dev/null) -ne 200 ] ; do
                echo "waiting for apiserver" ;
                sleep 5 ;
              done
@@ -54,11 +58,11 @@ spec:
                {{ .nvidiaGpusPerAgent }}
          env:
          - name: CLEARML_API_HOST
-            value: 'http://{{ include "clearml.fullname" $ }}-apiserver:{{ $.Values.apiserver.service.port }}'
+            value: {{ include "clearml.serviceApi" $ }}
          - name: CLEARML_WEB_HOST
-            value: 'http://{{ include "clearml.fullname" $ }}-webserver:{{ $.Values.webserver.service.port }}'
+            value: {{ include "clearml.serviceApp" $ }}
          - name: CLEARML_FILES_HOST
-            value: 'http://{{ include "clearml.fullname" $ }}-fileserver:{{ $.Values.fileserver.service.port }}'
+            value: {{ include "clearml.serviceFiles" $ }}
          - name: CLEARML_AGENT_GIT_USER
            value: {{ .clearmlGitUser}}
          - name: CLEARML_AGENT_GIT_PASS
@@ -90,7 +94,14 @@ spec:
              apt-get install -y curl python3-pip git;
              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}}"
+              CLEARML_AGENT_K8S_HOST_MOUNT=/root/.clearml:/root/.clearml clearml-agent daemon --foreground --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 }}
@@ -105,3 +116,4 @@ spec:
      {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}
--- a/charts/clearml/templates/deployment-agentservices.yaml
+++ b/charts/clearml/templates/deployment-agentservices.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.agentservices.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -11,8 +12,9 @@ spec:
      {{- include "clearml.selectorLabelsAgentServices" . | nindent 6 }}
  template:
    metadata:
-      {{- with .Values.agentservices.podAnnotations }}
      annotations:
+        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+      {{- with .Values.agentservices.podAnnotations }}
        {{- toYaml . | nindent 8 }}
      {{- end }}
      labels:
@@ -30,7 +32,7 @@ spec:
              - -c
              - >
                set -x;
-                while [ $(curl -sw '%{http_code}' "http://{{ include "clearml.fullname" . }}-apiserver:{{ .Values.apiserver.service.port }}/debug.ping" -o /dev/null) -ne 200 ] ; do
+                while [ $(curl -sw '%{http_code}' "{{ include "clearml.serviceApi" $ }}/debug.ping" -o /dev/null) -ne 200 ] ; do
                  echo "waiting for apiserver" ;
                  sleep 5 ;
                done
@@ -42,7 +44,7 @@ spec:
          - name: CLEARML_HOST_IP
            value: {{ .Values.agentservices.clearmlHostIp }}
          - name: CLEARML_API_HOST
-            value: "http://{{ include "clearml.fullname" . }}-apiserver:{{ .Values.apiserver.service.port }}"
+            value: {{ include "clearml.serviceApi" $ }}
          - name: CLEARML_WEB_HOST
            value: {{ .Values.agentservices.clearmlWebHost }}
          - name: CLEARML_FILES_HOST
@@ -98,3 +100,4 @@ spec:
      tolerations:
        {{- toYaml . | nindent 8 }}
      {{- end }}
+{{- end }}
--- a/charts/clearml/templates/deployment-apiserver.yaml
+++ b/charts/clearml/templates/deployment-apiserver.yaml
@@ -11,19 +11,14 @@ spec:
      {{- include "clearml.selectorLabelsApiServer" . | nindent 6 }}
  template:
    metadata:
-      {{- with .Values.apiserver.podAnnotations }}
      annotations:
+        checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+      {{- with .Values.apiserver.podAnnotations }}
        {{- toYaml . | nindent 8 }}
      {{- end }}
      labels:
        {{- include "clearml.selectorLabelsApiServer" . | nindent 8 }}
    spec:
-      {{- if .Values.apiserver.storage.enableConfigVolume }}
-      volumes:
-        - name: apiserver-config
-          persistentVolumeClaim:
-            claimName: {{ include "clearml.fullname" . }}-apiserver-config
-      {{- end }}
      containers:
        - name: {{ .Chart.Name }}
          image: "{{ .Values.apiserver.image.repository }}:{{ .Values.apiserver.image.tag | default .Chart.AppVersion }}"
@@ -34,23 +29,49 @@ spec:
              protocol: TCP
          env:
          - name: CLEARML_ELASTIC_SERVICE_HOST
+          {{- if .Values.elasticsearch.enabled }}
            value: "{{ .Values.elasticsearch.clusterName }}-master"
+          {{- else }}
+            value: "{{ .Values.externalServices.elasticsearchHost }}"
+          {{- end }}
          - name: CLEARML_ELASTIC_SERVICE_PORT
+          {{- if .Values.elasticsearch.enabled }}
            value: "{{ .Values.elasticsearch.httpPort }}"
+          {{- else }}
+            value: "{{ .Values.externalServices.elasticsearchPort }}"
+          {{- end }}
          - name: CLEARML_MONGODB_SERVICE_HOST
+          {{- if .Values.mongodb.enabled }}
            value: "{{ tpl .Values.mongodb.service.name . }}"
+          {{- else }}
+            value: "{{ .Values.externalServices.mongodbHost }}"
+          {{- end }}
          - name: CLEARML_MONGODB_SERVICE_PORT
+          {{- if .Values.mongodb.enabled }}
            value: "{{ .Values.mongodb.service.port }}"
+          {{- else }}
+            value: "{{ .Values.externalServices.mongodbPort }}"
+          {{- end }}
          - name: CLEARML_REDIS_SERVICE_HOST
+          {{- if .Values.redis.enabled }}
            value: "{{ tpl .Values.redis.master.name . }}"
+          {{- else }}
+            value: "{{ .Values.externalServices.redisHost }}"
+          {{- end }}
          - name: CLEARML_REDIS_SERVICE_PORT
+          {{- if .Values.redis.enabled }}
            value: "{{ .Values.redis.master.port }}"
+          {{- else }}
+            value: "{{ .Values.externalServices.redisPort }}"
+          {{- end }}
          - name: CLEARML__APISERVER__PRE_POPULATE__ENABLED
            value: "{{ .Values.apiserver.prepopulateEnabled }}"
          - name: CLEARML__APISERVER__PRE_POPULATE__ZIP_FILES
            value: "{{ .Values.apiserver.prepopulateZipFiles }}"
          - name: CLEARML_SERVER_DEPLOYMENT_TYPE
            value: "helm-cloud"
+          - name: CLEARML__APISERVER__AUTH__COOKIES__MAX_AGE
+            value: "{{ .Values.apiserver.authCookiesMaxAge }}"
          - name: CLEARML_CONFIG_DIR
            value: /opt/clearml/config
          - name: CLEARML__APISERVER__DEFAULT_COMPANY
@@ -101,13 +122,19 @@ spec:
            httpGet:
              path: /debug.ping
              port: 8008
-          {{- if .Values.apiserver.storage.enableConfigVolume }}
+          {{- if .Values.apiserver.additionalConfigs }}
          volumeMounts:
           - name: apiserver-config
             mountPath: /opt/clearml/config
          {{- end }}
          resources:
            {{- toYaml .Values.apiserver.resources | nindent 12 }}
+      {{- if .Values.apiserver.additionalConfigs }}
+      volumes:
+        - name: apiserver-config
+          configMap:
+            name: "{{ include "clearml.fullname" . }}-apiserver-configmap"
+      {{- end }}
      {{- with .Values.apiserver.nodeSelector }}
      nodeSelector:
        {{- toYaml . | nindent 8 }}
--- a/charts/clearml/templates/ingress-api.yaml
+++ b/charts/clearml/templates/ingress-api.yaml
@@ -0,0 +1,42 @@
+{{- if .Values.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: {{ include "clearml.fullname" . }}-api
+  labels:
+    {{- include "clearml.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.api.tlsSecretName }}
+  tls:
+    - hosts:
+        - {{ .Values.ingress.api.hostName }}
+      secretName: {{ .Values.ingress.api.tlsSecretName }}
+  {{- end }}
+  rules:
+  - host: {{ .Values.ingress.api.hostName }}
+    http:
+      paths:
+      - path: "/"
+  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ include "clearml.fullname" . }}-apiserver
+            port:
+              number: {{ .Values.apiserver.service.port }}
+  {{ else }}
+        backend:
+          serviceName: {{ include "clearml.fullname" . }}-apiserver
+          servicePort: {{ .Values.apiserver.service.port }}
+  {{ end }}
+{{- end }}
--- a/charts/clearml/templates/ingress-app.yaml
+++ b/charts/clearml/templates/ingress-app.yaml
@@ -0,0 +1,42 @@
+{{- if .Values.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: {{ include "clearml.fullname" . }}-app
+  labels:
+    {{- include "clearml.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.app.tlsSecretName }}
+  tls:
+    - hosts:
+        - {{ .Values.ingress.app.hostName }}
+      secretName: {{ .Values.ingress.app.tlsSecretName }}
+  {{- end }}
+  rules:
+  - host: {{ .Values.ingress.app.hostName }}
+    http:
+      paths:
+      - path: "/"
+  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ include "clearml.fullname" . }}-webserver
+            port:
+              number: {{ .Values.webserver.service.port }}
+  {{ else }}
+        backend:
+          serviceName: {{ include "clearml.fullname" . }}-webserver
+          servicePort: {{ .Values.webserver.service.port }}
+  {{ end }}
+{{- end }}
--- a/charts/clearml/templates/ingress-files.yaml
+++ b/charts/clearml/templates/ingress-files.yaml
@@ -0,0 +1,42 @@
+{{- if .Values.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: {{ include "clearml.fullname" . }}-files
+  labels:
+    {{- include "clearml.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.files.tlsSecretName }}
+  tls:
+    - hosts:
+        - {{ .Values.ingress.files.hostName }}
+      secretName: {{ .Values.ingress.files.tlsSecretName }}
+  {{- end }}
+  rules:
+  - host: {{ .Values.ingress.files.hostName }}
+    http:
+      paths:
+      - path: "/"
+  {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ include "clearml.fullname" . }}-fileserver
+            port:
+              number: {{ .Values.fileserver.service.port }}
+  {{ else }}
+        backend:
+          serviceName: {{ include "clearml.fullname" . }}-fileserver
+          servicePort: {{ .Values.fileserver.service.port }}
+  {{ end }}
+{{- end }}
--- a/charts/clearml/templates/ingress.yaml
+++ b/charts/clearml/templates/ingress.yaml
@@ -1,48 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "clearml.fullname" . -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    {{- include "clearml.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  {{- if .Values.ingress.tls.secretName }}
-  tls:
-    - hosts:
-        - "app.{{ .Values.ingress.host }}"
-        - "files.{{ .Values.ingress.host }}"
-        - "api.{{ .Values.ingress.host }}"
-      secretName: {{ .Values.ingress.tls.secretName }}
-  {{- end }}
-  rules:
-    - host: "app.{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: "/*"
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-webserver
-              servicePort: {{ .Values.webserver.service.port }}
-    - host: "api.{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: "/*"
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-apiserver
-              servicePort: {{ .Values.apiserver.service.port }}
-    - host: "files.{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: "/*"
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-fileserver
-              servicePort: {{ .Values.fileserver.service.port }}
-{{- end }}
--- a/charts/clearml/templates/pvc-agentservices.yaml
+++ b/charts/clearml/templates/pvc-agentservices.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.agentservices.enabled }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -11,3 +12,4 @@ spec:
    requests:
      storage: {{ .Values.agentservices.storage.data.size | quote }}
  storageClassName: {{ .Values.agentservices.storage.data.class | quote }}
+{{- end }}
--- a/charts/clearml/templates/pvc-apiserver.yaml
+++ b/charts/clearml/templates/pvc-apiserver.yaml
@@ -1,15 +0,0 @@
-{{- if .Values.apiserver.storage.enableConfigVolume }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ include "clearml.fullname" . }}-apiserver-config
-  labels:
-    {{- include "clearml.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .Values.apiserver.storage.config.size | quote }}
-  storageClassName: {{ .Values.apiserver.storage.config.class | quote }}
-{{- end }}
--- a/charts/clearml/templates/secrets.yaml
+++ b/charts/clearml/templates/secrets.yaml
@@ -2,10 +2,10 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: clearml-conf
-data:
-  apiserver_key: NTQ0MkYzNDQzTUpNT1JXWkEzWkg=
-  apiserver_secret: QnhhcElSbzlaSU5pOHgyNUNSeHo4V2RtcjJwUWp6dVdWQjRQTkFTWnFDdFR5V2dXVlE=
-  http_session: OVR3MjBSYmhKMWJMQmlIRU9XWHZocGxLR1ViVGdMekF0d0ZOMm9MUXZXd1MwdVJwRDU=
-  auth_token: MVNDZjBvdjNObTU0NFRkMm9aMGdYU3JzTng1WGhNV2RWbEt6MXRPZ2N4MTU4YkQ1UlY=
-  tests_user_key: RU5QMzlFUU00U0xBQ0dENUZYQjc=
-  tests_user_secret: bFBjbTBpbWJjQlo4bXdnTzd0cGFkdXRpUzNnbkpEMDV4OWo3YWZ3WFBTMzVJS2JwaVE=
+stringData:
+  apiserver_key: {{ .Values.secret.credentials.apiserver.accessKey }}
+  apiserver_secret: {{ .Values.secret.credentials.apiserver.secretKey }}
+  http_session: {{ .Values.secret.httpSession }}
+  auth_token: {{ .Values.secret.authToken }}
+  tests_user_key: {{ .Values.secret.credentials.tests.accessKey }}
+  tests_user_secret: {{ .Values.secret.credentials.tests.secretKey }}
--- a/charts/clearml/templates/service-apiserver.yaml
+++ b/charts/clearml/templates/service-apiserver.yaml
@@ -9,7 +9,9 @@ spec:
  ports:
    - port: {{ .Values.apiserver.service.port }}
      targetPort: {{ .Values.apiserver.service.port }}
-      nodePort: 30008
+{{- if eq .Values.apiserver.service.type "NodePort" }}
+      nodePort: {{ .Values.apiserver.service.nodePort }}
+{{- end }}
      protocol: TCP
  selector:
    {{- include "clearml.selectorLabelsApiServer" . | nindent 4 }}
--- a/charts/clearml/templates/service-fileserver.yaml
+++ b/charts/clearml/templates/service-fileserver.yaml
@@ -9,7 +9,9 @@ spec:
  ports:
    - port: {{ .Values.fileserver.service.port }}
      targetPort: {{ .Values.fileserver.service.port }}
-      nodePort: 30081
+{{- if eq .Values.fileserver.service.type "NodePort" }}
+      nodePort: {{ .Values.fileserver.service.nodePort }}
+{{- end }}
      protocol: TCP
  selector:
    {{- include "clearml.selectorLabelsFileServer" . | nindent 4 }}
--- a/charts/clearml/templates/service-webserver.yaml
+++ b/charts/clearml/templates/service-webserver.yaml
@@ -9,7 +9,9 @@ spec:
  ports:
    - port: {{ .Values.webserver.service.port }}
      targetPort: {{ .Values.webserver.service.port }}
-      nodePort: 30080
+{{- if eq .Values.webserver.service.type "NodePort" }}
+      nodePort: {{ .Values.webserver.service.nodePort }}
+{{- end }}
      protocol: TCP
  selector:
    {{- include "clearml.selectorLabelsWebServer" . | nindent 4 }}
--- a/charts/clearml/values.yaml
+++ b/charts/clearml/values.yaml
@@ -4,9 +4,32 @@ ingress:
  enabled: false
  name: clearml-server-ingress
  annotations: {}
-  host: ""
-  tls:
-    secretName: ""
+  app:
+    hostName: "app.clearml.127-0-0-1.nip.io"
+    tlsSecretName: ""
+  api:
+    hostName: "api.clearml.127-0-0-1.nip.io"
+    tlsSecretName: ""
+  files:
+    hostName: "files.clearml.127-0-0-1.nip.io"
+    tlsSecretName: ""
+
+secret:
+  # -- Set for http_session field
+  httpSession: "9Tw20RbhJ1bLBiHEOWXvhplKGUbTgLzAtwFN2oLQvWwS0uRpD5"
+  # -- Set for auth_token field
+  authToken: "1SCf0ov3Nm544Td2oZ0gXSrsNx5XhMWdVlKz1tOgcx158bD5RV"
+  credentials:
+    apiserver:
+      # -- Set for apiserver_key field
+      accessKey: "5442F3443MJMORWZA3ZH"
+      # -- Set for apiserver_secret field
+      secretKey: "BxapIRo9ZINi8x25CRxz8Wdmr2pQjzuWVB4PNASZqCtTyWgWVQ"
+    tests:
+      # -- Set for tests_user_key field
+      accessKey: "ENP39EQM4SLACGD5FXB7"
+      # -- Set for tests_user_secret field
+      secretKey: "lPcm0imbcBZ8mwgO7tpadutiS3gnJD05x9j7afwXPS35IKbpiQ"

 apiserver:
  prepopulateEnabled: "true"
@@ -14,9 +37,16 @@ apiserver:
  prepopulateArtifactsPath: "/mnt/fileserver"
  configDir: /opt/clearml/config

+  # -- Amount of seconds the authorization cookie will last in user browser
+  authCookiesMaxAge: 864000
+
  service:
+    # -- This will set to service's spec.type field
    type: NodePort
    port: 8008
+    # -- 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
+    nodePort: 30008

  livenessDelay: 60
  readinessDelay: 60
@@ -26,7 +56,7 @@ apiserver:
  image:
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.0.2"
+    tag: "1.1.1"

  extraEnvs: []

@@ -50,24 +80,32 @@ apiserver:

  affinity: {}

-  # Optional: used in pvc-apiserver containing optional server configuration files
-  storage:
-    enableConfigVolume: false
-    config:
-      class: "standard"
-      size: 1Gi
+  additionalConfigs: {}
+    # services.conf: |
+    #   tasks {
+    #     non_responsive_tasks_watchdog {
+    #       # In-progress tasks that haven't been updated for at least 'value' seconds will be stopped by the watchdog
+    #       threshold_sec: 21000
+    #       # Watchdog will sleep for this number of seconds after each cycle
+    #       watch_interval_sec: 900
+    #     }
+    #   }

 fileserver:
  service:
+    # -- This will set to service's spec.type field
    type: NodePort
    port: 8081
+    # -- 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
+    nodePort: 30081

  replicaCount: 1

  image:
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.0.2"
+    tag: "1.1.1"

  extraEnvs: []

@@ -100,15 +138,19 @@ webserver:
  extraEnvs: []

  service:
+    # -- This will set to service's spec.type field
    type: NodePort
    port: 80
+    # -- 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
+    nodePort: 30080

  replicaCount: 1

  image:
    repository: "allegroai/clearml"
    pullPolicy: IfNotPresent
-    tag: "1.0.2"
+    tag: "1.1.1"

  podAnnotations: {}

@@ -131,6 +173,7 @@ webserver:
  affinity: {}

 agentservices:
+  enabled: false
  clearmlHostIp: null
  agentVersion: ""
  clearmlWebHost: null
@@ -181,8 +224,10 @@ agentservices:

 agentGroups:
  agent-group-cpu:
+    enabled: true
    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")
@@ -213,8 +258,10 @@ agentGroups:
    affinity: {}

  agent-group-gpu:
+    enabled: true
    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")
@@ -244,6 +291,20 @@ agentGroups:

    affinity: {}

+externalServices:
+  # -- Existing ElasticSearch Hostname to use if elasticsearch.enabled is false
+  elasticsearchHost: ""
+  # -- Existing ElasticSearch Port to use if elasticsearch.enabled is false
+  elasticsearchPort: 9200
+  # -- Existing MongoDB Hostname to use if elasticsearch.enabled is false
+  mongodbHost: ""
+  # -- Existing MongoDB Port to use if elasticsearch.enabled is false
+  mongodbPort: 27017
+  # -- Existing Redis Hostname to use if elasticsearch.enabled is false
+  redisHost: ""
+  # -- Existing Redis Port to use if elasticsearch.enabled is false
+  redisPort: 6379
+
 redis:  # configuration from https://github.com/bitnami/charts/blob/master/bitnami/redis/values.yaml
  enabled: true
  usePassword: false
Author	SHA1	Message	Date
Valeriano Manassero	7b8e40c626	Agent foreground mode (#46 ) * use foreground to push output on console * bump up version	2021-12-13 09:04:02 +01:00
Valeriano Manassero	d8117eeb0d	add k8s 1.22.1 to ci procedure (#44 ) After some tests I found 1.22.1 doesn't have ulimit issue so I can include it into the ci process	2021-12-09 11:47:13 +01:00
Valeriano Manassero	4c09ae2c92	Fix env typo (#39 ) * typo fix * bump up version	2021-12-09 11:39:04 +01:00
Valeriano Manassero	478eecd5f2	remove k8s 1.22 from ci (#43 ) It looks 1.22 k8s image from kind has a very low ulimit preventing elastic search from installing, removing it waiting for a fix.	2021-12-09 11:30:15 +01:00
Valeriano Manassero	43f4c44219	test one single kind cluster at time to avoid pressure fails (#42 )	2021-12-09 11:00:57 +01:00
Valeriano Manassero	b83c8cd0e8	indentation fix (#41 )	2021-12-09 10:32:42 +01:00
Valeriano Manassero	97f219228d	update kind k8s versions (#40 )	2021-12-09 10:31:17 +01:00
Valeriano Manassero	1b5b9407f6	Configurable auth cookies age (#38 ) * configurable auth cookies age * version bump up	2021-12-09 08:14:09 +01:00
Valeriano Manassero	b494a8c0cf	External services (#36 ) * use external services switch * bump up version * readme update	2021-11-26 08:11:55 +01:00
Weixiao Huang	266a1e3c41	feat: make service nodePort configurable and add some doc descriptions (#33 ) * feat: make service nodePort configurable * feat: bump version to 3.0.6 * docs: add descriptions for secret and service fields * feat: add comments in clearml-kind.yaml of README.md Co-authored-by: 黄维啸 <huangweixiao@megvii.com>	2021-11-08 14:23:10 +01:00
Weixiao Huang	bba5c0769f	feat: make secret configurable and add secret annotations to deployment (#32 )	2021-11-04 20:36:21 +01:00
Valeriano Manassero	b7f73e3bd9	Switch enabler agentservices (#31 ) * switch to enable/disable agentservices * bump up version	2021-09-21 14:16:30 +02:00
Valeriano Manassero	d3f6f3e50d	Fix helper typo (#30 ) * fix helper typo on api service name * bump up version	2021-09-16 11:21:25 +02:00
Valeriano Manassero	979e73fe3d	Fix ingress compat (#29 ) * fix ingress compatibility with different k8s version * bump up version	2021-09-16 10:54:25 +02:00
Valeriano Manassero	7352f35836	Helpers fix (#28 ) * fix wrong service names * bump up version	2021-09-16 09:11:58 +02:00
Valeriano Manassero	82ad17860d	New ingress style (#27 ) * new ingress style * bump up version * hostName fix * helm-docs update	2021-09-16 08:51:07 +02:00
Valeriano Manassero	aa761dd450	Agent enable switch (#26 ) * enable/disable switch * bump up chart	2021-09-15 08:13:01 +02:00
Valeriano Manassero	7ff2f94d1a	Apiserver configmap (#25 ) * metadata name fix * use toString * use configmap for apiserver configs * bump up version * indentation fix * fix trailing whitespaces	2021-09-14 15:43:10 +02:00
Valeriano Manassero	618a269c97	Fix service url generation (#21 ) * service url generation functions * use generation functions * bump up version	2021-08-26 10:58:06 +02:00
Valeriano Manassero	3f215d2d90	Use many ingresses (#20 ) * use many ingresses * bump up version	2021-08-25 14:49:43 +02:00
Valeriano Manassero	03223fc1c1	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	2021-08-17 14:59:13 +02:00
Valeriano Manassero	898089b7fb	Fix agent clearml conf (#18 ) * fix agent mount clearml.conf * bump up version	2021-08-14 12:00:23 +02:00
Valeriano Manassero	732bb970aa	Configurable prefix ingress (#17 ) * ingress configurable prefixes * chart version bump up * fix version number	2021-08-12 12:02:26 +03:00
Valeriano Manassero	91d45281fa	bump up app version to 1.1.1 (#16 )	2021-08-06 14:18:53 +02:00
Valeriano Manassero	28b6e9f4e4	Remove badges from root README since we have them in chart one (#14 )	2021-07-27 16:18:02 +02:00
Valeriano Manassero	7f6df85ec5	Bump up version (#13 ) * bump up to 1.1.0 * helm-docs update	2021-07-27 15:26:51 +02:00
Valeriano Manassero	97f1077072	Readme improvements (#12 ) * better contributing guidelins * added more info on repo itself	2021-07-27 13:30:55 +02:00