Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/clearml/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ dependencies:
condition: elasticsearch.enabled
annotations:
artifacthub.io/changes: |
- kind: fixed
description: "Bitnami registries workaround"
- kind: added
description: "mongodb conn strings from secrets"
8 changes: 5 additions & 3 deletions charts/clearml/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,12 @@ Kubernetes: `>= 1.21.0-0`
| clearml.testUserKey | string | `"ENP39EQM4SLACGD5FXB7"` | Test Server basic auth key |
| clearml.testUserSecret | string | `"lPcm0imbcBZ8mwgO7tpadutiS3gnJD05x9j7afwXPS35IKbpiQ"` | Test File Server basic auth secret |
| elasticsearch | object | `{"clusterHealthCheckParams":"wait_for_status=yellow&timeout=1s","clusterName":"clearml-elastic","enabled":true,"esConfig":{"elasticsearch.yml":"xpack.security.enabled: false\n"},"esJavaOpts":"-Xmx2g -Xms2g","extraEnvs":[{"name":"bootstrap.memory_lock","value":"false"},{"name":"cluster.routing.allocation.node_initial_primaries_recoveries","value":"500"},{"name":"cluster.routing.allocation.disk.watermark.low","value":"500mb"},{"name":"cluster.routing.allocation.disk.watermark.high","value":"500mb"},{"name":"cluster.routing.allocation.disk.watermark.flood_stage","value":"500mb"},{"name":"http.compression_level","value":"7"},{"name":"reindex.remote.whitelist","value":"*.*"},{"name":"xpack.monitoring.enabled","value":"false"},{"name":"xpack.security.enabled","value":"false"}],"httpPort":9200,"minimumMasterNodes":1,"persistence":{"enabled":true},"rbac":{"create":true},"replicas":1,"resources":{"limits":{"cpu":"2000m","memory":"4Gi"},"requests":{"cpu":"100m","memory":"2Gi"}},"roles":{"data":"true","ingest":"true","master":"true","remote_cluster_client":"true"},"volumeClaimTemplate":{"accessModes":["ReadWriteOnce"],"resources":{"requests":{"storage":"50Gi"}},"storageClassName":null}}` | Configuration from https://github.com/elastic/helm-charts/blob/7.16/elasticsearch/values.yaml |
| externalServices | object | `{"elasticsearchConnectionString":"[{\"host\":\"es_hostname1\",\"port\":9200},{\"host\":\"es_hostname2\",\"port\":9200},{\"host\":\"es_hostname3\",\"port\":9200}]","mongodbConnectionStringAuth":"mongodb://mongodb_hostname:27017/auth","mongodbConnectionStringBackend":"mongodb://mongodb_hostnamehostname:27017/backend","redisHost":"redis_hostname","redisPort":6379}` | Definition of external services to use if not enabled as dependency charts here |
| externalServices | object | `{"elasticsearchConnectionString":"[{\"host\":\"es_hostname1\",\"port\":9200},{\"host\":\"es_hostname2\",\"port\":9200},{\"host\":\"es_hostname3\",\"port\":9200}]","mongodbConnectionStringAuth":"mongodb://mongodb_hostname:27017/auth","mongodbConnectionStringAuthSecret":{"secretKey":"","secretName":""},"mongodbConnectionStringBackend":"mongodb://mongodb_hostnamehostname:27017/backend","mongodbConnectionStringBackendSecret":{"secretKey":"","secretName":""},"redisHost":"redis_hostname","redisPort":6379}` | Definition of external services to use if not enabled as dependency charts here |
| externalServices.elasticsearchConnectionString | string | `"[{\"host\":\"es_hostname1\",\"port\":9200},{\"host\":\"es_hostname2\",\"port\":9200},{\"host\":\"es_hostname3\",\"port\":9200}]"` | Existing ElasticSearch connectionstring if elasticsearch.enabled is false (example in values.yaml) |
| externalServices.mongodbConnectionStringAuth | string | `"mongodb://mongodb_hostname:27017/auth"` | Existing MongoDB connection string for BACKEND to use if mongodb.enabled is false (example in values.yaml) |
| externalServices.mongodbConnectionStringBackend | string | `"mongodb://mongodb_hostnamehostname:27017/backend"` | Existing MongoDB connection string for AUTH to use if mongodb.enabled is false (example in values.yaml) |
| externalServices.mongodbConnectionStringAuth | string | `"mongodb://mongodb_hostname:27017/auth"` | Existing MongoDB connection string for BACKEND to use if mongodb.enabled is false (example in values.yaml). Will be ignored if externalServices.mongodbConnectionStringAuthSecret is set. |
| externalServices.mongodbConnectionStringAuthSecret | object | `{"secretKey":"","secretName":""}` | Secret containing MongoDB connection string for AUTH to use if mongodb.enabled is false. The secret has to be set such that the string secret is wrapped with double quotes like "\"mongodb://clearml:XXXXXXX@yyyy.eeee.mongodb.net/auth?retryWrites=true&w=majority\"" due to the following https://github.com/clearml/clearml-server/issues/86 |
| 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). Will be ignored if externalServices.mongodbConnectionStringBackendSecret is set. |
| externalServices.mongodbConnectionStringBackendSecret | object | `{"secretKey":"","secretName":""}` | Secret containing MongoDB connection string for BACKEND to use if mongodb.enabled is false. The secret has to be set such that the string secret is wrapped with double quotes like "\"mongodb://clearml:XXXXXXX@yyyy.eeee.mongodb.net/backend?retryWrites=true&w=majority\"" due to the following https://github.com/clearml/clearml-server/issues/86 |
| 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 | `{"additionalVolumeMounts":{},"additionalVolumes":{},"affinity":{},"containerSecurityContext":{},"deploymentAnnotations":{},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","registry":"","repository":"allegroai/clearml","tag":"2.0.0-613"},"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"},"serviceAccountAnnotations":{},"serviceAccountName":"clearml","storage":{"data":{"accessMode":"ReadWriteOnce","class":"","existingPVC":"","size":"50Gi"},"enabled":true},"tolerations":[]}` | File Server configurations |
Expand Down
11 changes: 11 additions & 0 deletions charts/clearml/templates/apiserver-asyncdelete-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,17 @@ spec:
{{- if .Values.mongodb.enabled }}
- name: CLEARML_MONGODB_SERVICE_CONNECTION_STRING
value: {{ include "mongodb.connectionstring" . | quote }}
{{- else if and ( .Values.externalServices.mongodbConnectionStringAuthSecret.secretName ) ( .Values.externalServices.mongodbConnectionStringBackendSecret.secretName )}}
- name: CLEARML__HOSTS__MONGO__BACKEND__HOST
valueFrom:
secretKeyRef:
name: {{ .Values.externalServices.mongodbConnectionStringBackendSecret.secretName }}
key: {{ .Values.externalServices.mongodbConnectionStringBackendSecret.secretKey }}
- name: CLEARML__HOSTS__MONGO__AUTH__HOST
valueFrom:
secretKeyRef:
name: {{ .Values.externalServices.mongodbConnectionStringAuthSecret.secretName }}
key: {{ .Values.externalServices.mongodbConnectionStringAuthSecret.secretKey }}
{{- else }}
- name: CLEARML__HOSTS__MONGO__BACKEND__HOST
value: {{ .Values.externalServices.mongodbConnectionStringBackend | quote }}
Expand Down
11 changes: 11 additions & 0 deletions charts/clearml/templates/apiserver-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,17 @@ spec:
{{- if .Values.mongodb.enabled }}
- name: CLEARML_MONGODB_SERVICE_CONNECTION_STRING
value: {{ include "mongodb.connectionstring" . | quote }}
{{- else if and ( .Values.externalServices.mongodbConnectionStringAuthSecret.secretName ) ( .Values.externalServices.mongodbConnectionStringBackendSecret.secretName )}}
- name: CLEARML__HOSTS__MONGO__BACKEND__HOST
valueFrom:
secretKeyRef:
name: {{ .Values.externalServices.mongodbConnectionStringBackendSecret.secretName }}
key: {{ .Values.externalServices.mongodbConnectionStringBackendSecret.secretKey }}
- name: CLEARML__HOSTS__MONGO__AUTH__HOST
valueFrom:
secretKeyRef:
name: {{ .Values.externalServices.mongodbConnectionStringAuthSecret.secretName }}
key: {{ .Values.externalServices.mongodbConnectionStringAuthSecret.secretKey }}
{{- else }}
- name: CLEARML__HOSTS__MONGO__BACKEND__HOST
value: {{ .Values.externalServices.mongodbConnectionStringBackend | quote }}
Expand Down
16 changes: 14 additions & 2 deletions charts/clearml/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -378,10 +378,22 @@ webserver:
externalServices:
# -- Existing ElasticSearch connectionstring if elasticsearch.enabled is false (example in values.yaml)
elasticsearchConnectionString: "[{\"host\":\"es_hostname1\",\"port\":9200},{\"host\":\"es_hostname2\",\"port\":9200},{\"host\":\"es_hostname3\",\"port\":9200}]"
# -- Existing MongoDB connection string for BACKEND to use if mongodb.enabled is false (example in values.yaml)
# -- Existing MongoDB connection string for BACKEND to use if mongodb.enabled is false (example in values.yaml). Will be ignored if externalServices.mongodbConnectionStringAuthSecret is set.
mongodbConnectionStringAuth: "mongodb://mongodb_hostname:27017/auth"
# -- Existing MongoDB connection string for AUTH to use if mongodb.enabled is false (example in values.yaml)
# -- Existing MongoDB connection string for AUTH to use if mongodb.enabled is false (example in values.yaml). Will be ignored if externalServices.mongodbConnectionStringBackendSecret is set.
mongodbConnectionStringBackend: "mongodb://mongodb_hostnamehostname:27017/backend"
# -- Secret containing MongoDB connection string for AUTH to use if mongodb.enabled is false.
# The secret has to be set such that the string secret is wrapped with double quotes like "\"mongodb://clearml:XXXXXXX@yyyy.eeee.mongodb.net/auth?retryWrites=true&w=majority\""
# due to the following https://github.com/clearml/clearml-server/issues/86
mongodbConnectionStringAuthSecret:
secretName: ""
secretKey: ""
# -- Secret containing MongoDB connection string for BACKEND to use if mongodb.enabled is false.
# The secret has to be set such that the string secret is wrapped with double quotes like "\"mongodb://clearml:XXXXXXX@yyyy.eeee.mongodb.net/backend?retryWrites=true&w=majority\""
# due to the following https://github.com/clearml/clearml-server/issues/86
mongodbConnectionStringBackendSecret:
secretName: ""
secretKey: ""
# -- Existing Redis Hostname to use if redis.enabled is false (example in values.yaml)
redisHost: "redis_hostname"
# -- Existing Redis Port to use if redis.enabled is false
Expand Down