Agent foreground mode (#46)

* use foreground to push output on console

* bump up version

.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

charts/clearml/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "2.2.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

charts/clearml/README.md

@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![Version: 2.2.2](https://img.shields.io/badge/Version-2.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)
+![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"` |  |
@@ -144,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"` |  |
@@ -168,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"` |  |
@@ -180,7 +189,9 @@ 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"` |  |
@@ -195,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"` |  |
@@ -237,6 +246,12 @@ 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"` |  |
@@ -246,19 +261,21 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | 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.hostPrefixApi | string | `"api."` |  |
-| ingress.hostPrefixApp | string | `"app."` |  |
-| ingress.hostPrefixFiles | string | `"files."` |  |
+| 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` |  |
@@ -279,6 +296,12 @@ 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"` |  |
@@ -288,6 +311,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | 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 | `[]` |  |

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"

charts/clearml/templates/_helpers.tpl

@@ -101,13 +101,13 @@ Create the name of the App service to use
 */}}
 {{- define "clearml.serviceApp" -}}
 {{- if .Values.ingress.enabled }}
-{{- if .Values.ingress.tls.secretName }}
-{{- printf "%s%s%s" "https://" .Values.ingress.hostPrefixApp .Values.ingress.host }}
+{{- if .Values.ingress.app.tlsSecretName }}
+{{- printf "%s%s" "https://" .Values.ingress.app.hostName }}
 {{- else }}
-{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixApp .Values.ingress.host }}
+{{- printf "%s%s" "http://" .Values.ingress.app.hostName }}
 {{- end }}
 {{- else }}
-{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-webserver:" (.Values.webserver.service.port | quote) }}
+{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-webserver:" (.Values.webserver.service.port | toString) }}
 {{- end }}
 {{- end }}
 
@@ -116,13 +116,13 @@ Create the name of the Api service to use
 */}}
 {{- define "clearml.serviceApi" -}}
 {{- if .Values.ingress.enabled }}
-{{- if .Values.ingress.tls.secretName }}
-{{- printf "%s%s%s" "https://" .Values.ingress.hostPrefixApi .Values.ingress.host }}
+{{- if .Values.ingress.api.tlsSecretName }}
+{{- printf "%s%s" "https://" .Values.ingress.api.hostName }}
 {{- else }}
-{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixApi .Values.ingress.host }}
+{{- printf "%s%s" "http://" .Values.ingress.api.hostName }}
 {{- end }}
 {{- else }}
-{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-apiserver:" (.Values.apiserver.service.port | quote) }}
+{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-apiserver:" (.Values.apiserver.service.port | toString) }}
 {{- end }}
 {{- end }}
 
@@ -131,12 +131,12 @@ Create the name of the Files service to use
 */}}
 {{- define "clearml.serviceFiles" -}}
 {{- if .Values.ingress.enabled }}
-{{- if .Values.ingress.tls.secretName }}
-{{- printf "%s%s%s" "https://" .Values.ingress.hostPrefixFiles .Values.ingress.host }}
+{{- if .Values.ingress.files.tlsSecretName }}
+{{- printf "%s%s" "https://" .Values.ingress.files.hostName }}
 {{- else }}
-{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixFiles .Values.ingress.host }}
+{{- printf "%s%s" "http://" .Values.ingress.files.hostName }}
 {{- end }}
 {{- else }}
-{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-fileserver:" (.Values.fileserver.service.port | quote) }}
+{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-fileserver:" (.Values.fileserver.service.port | toString) }}
 {{- end }}
 {{- end }}

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 -}}

charts/clearml/templates/deployment-agent.yaml

@@ -1,5 +1,6 @@
 {{- range $key, $value := .Values.agentGroups }}
 {{- with $value }}
+{{- if .enabled }}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -16,8 +17,9 @@ spec:
       {{- 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:
@@ -92,7 +94,7 @@ 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
@@ -114,3 +116,4 @@ spec:
       {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}

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:
@@ -98,3 +100,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- end }}

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 }}

charts/clearml/templates/ingress-api.yaml

@@ -1,13 +1,14 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "clearml.fullname" . -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- 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: {{ $fullName }}-api
+  name: {{ include "clearml.fullname" . }}-api
   labels:
     {{- include "clearml.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
@@ -15,19 +16,27 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingress.tls.secretName }}
+  {{- if .Values.ingress.api.tlsSecretName }}
   tls:
     - hosts:
-        - "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
-      secretName: {{ .Values.ingress.tls.secretName }}
+        - {{ .Values.ingress.api.hostName }}
+      secretName: {{ .Values.ingress.api.tlsSecretName }}
   {{- end }}
   rules:
-    - host: "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: "/"
-            pathType: Prefix
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-apiserver
-              servicePort: {{ .Values.apiserver.service.port }}
+  - 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 }}

charts/clearml/templates/ingress-app.yaml

@@ -1,13 +1,14 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "clearml.fullname" . -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- 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: {{ $fullName }}-app
+  name: {{ include "clearml.fullname" . }}-app
   labels:
     {{- include "clearml.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
@@ -15,19 +16,27 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingress.tls.secretName }}
+  {{- if .Values.ingress.app.tlsSecretName }}
   tls:
     - hosts:
-        - "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
-      secretName: {{ .Values.ingress.tls.secretName }}
+        - {{ .Values.ingress.app.hostName }}
+      secretName: {{ .Values.ingress.app.tlsSecretName }}
   {{- end }}
   rules:
-    - host: "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: "/"
-            pathType: Prefix
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-webserver
-              servicePort: {{ .Values.webserver.service.port }}
+  - 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 }}

charts/clearml/templates/ingress-files.yaml

@@ -1,13 +1,14 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "clearml.fullname" . -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- 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: {{ $fullName }}-files
+  name: {{ include "clearml.fullname" . }}-files
   labels:
     {{- include "clearml.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
@@ -15,19 +16,27 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.ingress.tls.secretName }}
+  {{- if .Values.ingress.files.tlsSecretName }}
   tls:
     - hosts:
-        - "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
-      secretName: {{ .Values.ingress.tls.secretName }}
+        - {{ .Values.ingress.files.hostName }}
+      secretName: {{ .Values.ingress.files.tlsSecretName }}
   {{- end }}
   rules:
-    - host: "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: "/"
-            pathType: Prefix
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-fileserver
-              servicePort: {{ .Values.fileserver.service.port }}
+  - 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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

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 }}

charts/clearml/values.yaml

@@ -4,12 +4,32 @@ ingress:
   enabled: false
   name: clearml-server-ingress
   annotations: {}
-  host: ""
-  hostPrefixApp: "app."
-  hostPrefixApi: "api."
-  hostPrefixFiles: "files."
-  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"
@@ -17,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
@@ -53,17 +80,25 @@ 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
 
@@ -103,8 +138,12 @@ 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
 
@@ -134,6 +173,7 @@ webserver:
   affinity: {}
 
 agentservices:
+  enabled: false
   clearmlHostIp: null
   agentVersion: ""
   clearmlWebHost: null
@@ -184,6 +224,7 @@ agentservices:
 
 agentGroups:
   agent-group-cpu:
+    enabled: true
     name: agent-group-cpu
     replicaCount: 1
     updateStrategy: Recreate
@@ -217,6 +258,7 @@ agentGroups:
     affinity: {}
 
   agent-group-gpu:
+    enabled: true
     name: agent-group-gpu
     replicaCount: 0
     updateStrategy: Recreate
@@ -249,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