mirror of
https://github.com/clearml/clearml-helm-charts
synced 2025-04-17 01:31:13 +00:00
Changed: enterprise parameters name
This commit is contained in:
Valeriano Manassero
parent
cb4426fd0a
commit
7fecb76adc
@ -185,26 +185,26 @@ Kubernetes: `>= 1.21.0-0 < 1.26.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},"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 |
|
||||
| enterpriseFeatures | object | `{"airGappedDocumentation":{"enabled":false,"image":{"repository":"","tag":""}},"apps":{"AgentKey":"GK4PRTVT3706T25K6BA1","AgentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","GitAgentPass":"git_password","GitAgentUser":"git_user","affinity":{},"basePodImage":{"repository":"","tag":""},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","repository":"","tag":""},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]},"defaultCompanyGuid":"d1bd92a3b039400cbafc60a7a5b1e52b","enabled":false}` | Enterprise features (work only with an Enterprise license) |
|
||||
| enterpriseFeatures | object | `{"airGappedDocumentation":{"enabled":false,"image":{"repository":"","tag":""}},"clearmlApplications":{"affinity":{},"agentKey":"GK4PRTVT3706T25K6BA1","agentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","basePodImage":{"repository":"","tag":""},"enabled":true,"extraEnvs":[],"gitAgentPass":"git_password","gitAgentUser":"git_user","image":{"pullPolicy":"IfNotPresent","repository":"","tag":""},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]},"defaultCompanyGuid":"d1bd92a3b039400cbafc60a7a5b1e52b","enabled":false}` | Enterprise features (work only with an Enterprise license) |
|
||||
| enterpriseFeatures.airGappedDocumentation | object | `{"enabled":false,"image":{"repository":"","tag":""}}` | Air gapped documentation configurations |
|
||||
| enterpriseFeatures.airGappedDocumentation.enabled | bool | `false` | Enable/Disable air gapped documentation deployment |
|
||||
| enterpriseFeatures.airGappedDocumentation.image | object | `{"repository":"","tag":""}` | Air gapped documentation image configuration |
|
||||
| enterpriseFeatures.apps | object | `{"AgentKey":"GK4PRTVT3706T25K6BA1","AgentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","GitAgentPass":"git_password","GitAgentUser":"git_user","affinity":{},"basePodImage":{"repository":"","tag":""},"enabled":true,"extraEnvs":[],"image":{"pullPolicy":"IfNotPresent","repository":"","tag":""},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]}` | APPS configurations |
|
||||
| enterpriseFeatures.apps.AgentKey | string | `"GK4PRTVT3706T25K6BA1"` | Apps Server basic auth key |
|
||||
| enterpriseFeatures.apps.AgentSecret | string | `"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2"` | Apps Server basic auth secret |
|
||||
| enterpriseFeatures.apps.GitAgentPass | string | `"git_password"` | Apps Server Git password |
|
||||
| enterpriseFeatures.apps.GitAgentUser | string | `"git_user"` | Apps Server Git user |
|
||||
| enterpriseFeatures.apps.affinity | object | `{}` | APPS affinity setup |
|
||||
| enterpriseFeatures.apps.basePodImage | object | `{"repository":"","tag":""}` | APPS base spawning pods image |
|
||||
| enterpriseFeatures.apps.enabled | bool | `true` | Enable/Disable component deployment |
|
||||
| enterpriseFeatures.apps.extraEnvs | list | `[]` | APPS extra envrinoment variables |
|
||||
| enterpriseFeatures.apps.image | object | `{"pullPolicy":"IfNotPresent","repository":"","tag":""}` | APPS image configuration |
|
||||
| enterpriseFeatures.apps.nodeSelector | object | `{}` | APPS nodeselector |
|
||||
| enterpriseFeatures.apps.podAnnotations | object | `{}` | specific annotation for APPS pods |
|
||||
| enterpriseFeatures.apps.replicaCount | int | `1` | APPS number of pods |
|
||||
| enterpriseFeatures.apps.resources | object | `{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}}` | APPS resources per pod; these are minimal requirements, it's suggested to increase these values in production environments |
|
||||
| enterpriseFeatures.apps.tolerations | list | `[]` | APPS tolerations setup |
|
||||
| enterpriseFeatures.defaultCompanyGuid | string | `"d1bd92a3b039400cbafc60a7a5b1e52b"` | Company name |
|
||||
| enterpriseFeatures.clearmlApplications | object | `{"affinity":{},"agentKey":"GK4PRTVT3706T25K6BA1","agentSecret":"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2","basePodImage":{"repository":"","tag":""},"enabled":true,"extraEnvs":[],"gitAgentPass":"git_password","gitAgentUser":"git_user","image":{"pullPolicy":"IfNotPresent","repository":"","tag":""},"nodeSelector":{},"podAnnotations":{},"replicaCount":1,"resources":{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}},"tolerations":[]}` | APPS configurations |
|
||||
| enterpriseFeatures.clearmlApplications.affinity | object | `{}` | APPS affinity setup |
|
||||
| enterpriseFeatures.clearmlApplications.agentKey | string | `"GK4PRTVT3706T25K6BA1"` | Apps Server basic auth key |
|
||||
| enterpriseFeatures.clearmlApplications.agentSecret | string | `"ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2"` | Apps Server basic auth secret |
|
||||
| enterpriseFeatures.clearmlApplications.basePodImage | object | `{"repository":"","tag":""}` | APPS base spawning pods image |
|
||||
| enterpriseFeatures.clearmlApplications.enabled | bool | `true` | Enable/Disable component deployment |
|
||||
| enterpriseFeatures.clearmlApplications.extraEnvs | list | `[]` | APPS extra envrinoment variables |
|
||||
| enterpriseFeatures.clearmlApplications.gitAgentPass | string | `"git_password"` | Apps Server Git password |
|
||||
| enterpriseFeatures.clearmlApplications.gitAgentUser | string | `"git_user"` | Apps Server Git user |
|
||||
| enterpriseFeatures.clearmlApplications.image | object | `{"pullPolicy":"IfNotPresent","repository":"","tag":""}` | APPS image configuration |
|
||||
| enterpriseFeatures.clearmlApplications.nodeSelector | object | `{}` | APPS nodeselector |
|
||||
| enterpriseFeatures.clearmlApplications.podAnnotations | object | `{}` | specific annotation for APPS pods |
|
||||
| enterpriseFeatures.clearmlApplications.replicaCount | int | `1` | APPS number of pods |
|
||||
| enterpriseFeatures.clearmlApplications.resources | object | `{"limits":{"cpu":"2000m","memory":"1Gi"},"requests":{"cpu":"100m","memory":"256Mi"}}` | APPS resources per pod; these are minimal requirements, it's suggested to increase these values in production environments |
|
||||
| enterpriseFeatures.clearmlApplications.tolerations | list | `[]` | APPS tolerations setup |
|
||||
| enterpriseFeatures.defaultCompanyGuid | string | `"d1bd92a3b039400cbafc60a7a5b1e52b"` | Company ID |
|
||||
| enterpriseFeatures.enabled | bool | `false` | Enable/Disable Enterprise features |
|
||||
| externalServices | object | `{"elasticsearchHost":"","elasticsearchPort":9200,"mongodbConnectionString":"","redisHost":"","redisPort":6379}` | Definition of external services to use if not enabled as dependency charts here |
|
||||
| externalServices.elasticsearchHost | string | `""` | Existing ElasticSearch Hostname to use if elasticsearch.enabled is false |
|
||||
|
||||
@ -98,16 +98,16 @@ app.kubernetes.io/instance: {{ include "webserver.referenceName" . }}
|
||||
{{/*
|
||||
Reference Name (apps)
|
||||
*/}}
|
||||
{{- define "apps.referenceName" -}}
|
||||
{{- define "clearmlApplications.referenceName" -}}
|
||||
{{- include "clearml.name" . }}-apps
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Selector labels (apps)
|
||||
*/}}
|
||||
{{- define "apps.selectorLabels" -}}
|
||||
{{- define "clearmlApplications.selectorLabels" -}}
|
||||
app.kubernetes.io/name: {{ include "clearml.name" . }}
|
||||
app.kubernetes.io/instance: {{ include "apps.referenceName" . }}
|
||||
app.kubernetes.io/instance: {{ include "clearmlApplications.referenceName" . }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
{{- if .Values.enterpriseFeatures.enabled }}
|
||||
{{- if .Values.enterpriseFeatures.apps.enabled }}
|
||||
{{- if .Values.enterpriseFeatures.clearmlApplications.enabled }}
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "apps.referenceName" . }}
|
||||
name: {{ include "clearmlApplications.referenceName" . }}
|
||||
labels:
|
||||
{{- include "clearml.labels" . | nindent 4 }}
|
||||
spec:
|
||||
replicas: {{ .Values.enterpriseFeatures.apps.replicaCount }}
|
||||
replicas: {{ .Values.enterpriseFeatures.clearmlApplications.replicaCount }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "apps.selectorLabels" . | nindent 6 }}
|
||||
{{- include "clearmlApplications.selectorLabels" . | nindent 6 }}
|
||||
template:
|
||||
metadata:
|
||||
{{- with .Values.enterpriseFeatures.apps.podAnnotations }}
|
||||
{{- with .Values.enterpriseFeatures.clearmlApplications.podAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "apps.selectorLabels" . | nindent 8 }}
|
||||
{{- include "clearmlApplications.selectorLabels" . | nindent 8 }}
|
||||
spec:
|
||||
{{- if .Values.imageCredentials.enabled }}
|
||||
imagePullSecrets:
|
||||
@ -28,16 +28,16 @@ spec:
|
||||
- name: clearml-registry-key
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if .Values.enterpriseFeatures.apps.additionalConfigs }}
|
||||
{{- if .Values.enterpriseFeatures.clearmlApplications.additionalConfigs }}
|
||||
volumes:
|
||||
- name: apps-config
|
||||
configMap:
|
||||
name: "{{ include "apps.referenceName" . }}-configmap"
|
||||
name: "{{ include "clearmlApplications.referenceName" . }}-configmap"
|
||||
{{- end }}
|
||||
serviceAccountName: "clearml-apps-sa"
|
||||
initContainers:
|
||||
- name: init-apps
|
||||
image: "{{ .Values.enterpriseFeatures.apps.image.repository }}:{{ .Values.enterpriseFeatures.apps.image.tag | default .Chart.AppVersion }}"
|
||||
image: "{{ .Values.enterpriseFeatures.clearmlApplications.image.repository }}:{{ .Values.enterpriseFeatures.clearmlApplications.image.tag | default .Chart.AppVersion }}"
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
@ -49,8 +49,8 @@ spec:
|
||||
done
|
||||
containers:
|
||||
- name: clearml-apps
|
||||
image: "{{ .Values.enterpriseFeatures.apps.image.repository }}:{{ .Values.enterpriseFeatures.apps.image.tag | default .Chart.AppVersion }}"
|
||||
imagePullPolicy: {{ .Values.enterpriseFeatures.apps.image.pullPolicy }}
|
||||
image: "{{ .Values.enterpriseFeatures.clearmlApplications.image.repository }}:{{ .Values.enterpriseFeatures.clearmlApplications.image.tag | default .Chart.AppVersion }}"
|
||||
imagePullPolicy: {{ .Values.enterpriseFeatures.clearmlApplications.image.pullPolicy }}
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: 8008
|
||||
@ -63,7 +63,7 @@ spec:
|
||||
- name: CLEARML_WEB_HOST
|
||||
value: "http://{{ include "webserver.referenceName" . }}:{{ .Values.webserver.service.port }}"
|
||||
- name: CLEARML_AGENT_DEFAULT_BASE_DOCKER
|
||||
value: "{{ .Values.enterpriseFeatures.apps.basePodImage.repository }}:{{ .Values.enterpriseFeatures.apps.basePodImage.tag }}"
|
||||
value: "{{ .Values.enterpriseFeatures.clearmlApplications.basePodImage.repository }}:{{ .Values.enterpriseFeatures.clearmlApplications.basePodImage.tag }}"
|
||||
- name: CLEARML_WORKER_ID
|
||||
value: "apps-agent-1"
|
||||
- name: CLEARML_NO_DEFAULT_SERVER
|
||||
@ -94,25 +94,25 @@ spec:
|
||||
secretKeyRef:
|
||||
name: clearml-conf
|
||||
key: apps_git_agent_pass
|
||||
{{- if .Values.enterpriseFeatures.apps.extraEnvs }}
|
||||
{{ toYaml .Values.enterpriseFeatures.apps.extraEnvs | nindent 10 }}
|
||||
{{- if .Values.enterpriseFeatures.clearmlApplications.extraEnvs }}
|
||||
{{ toYaml .Values.enterpriseFeatures.clearmlApplications.extraEnvs | nindent 10 }}
|
||||
{{- end }}
|
||||
{{- if .Values.enterpriseFeatures.apps.additionalConfigs }}
|
||||
{{- if .Values.enterpriseFeatures.clearmlApplications.additionalConfigs }}
|
||||
volumeMounts:
|
||||
- name: apps-config
|
||||
mountPath: /opt/clearml/config/default
|
||||
{{- end }}
|
||||
resources:
|
||||
{{- toYaml .Values.enterpriseFeatures.apps.resources | nindent 12 }}
|
||||
{{- with .Values.enterpriseFeatures.apps.nodeSelector }}
|
||||
{{- toYaml .Values.enterpriseFeatures.clearmlApplications.resources | nindent 12 }}
|
||||
{{- with .Values.enterpriseFeatures.clearmlApplications.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.enterpriseFeatures.apps.affinity }}
|
||||
{{- with .Values.enterpriseFeatures.clearmlApplications.affinity }}
|
||||
affinity:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.enterpriseFeatures.apps.tolerations }}
|
||||
{{- with .Values.enterpriseFeatures.clearmlApplications.tolerations }}
|
||||
tolerations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{{- if .Values.enterpriseFeatures.enabled }}
|
||||
{{- if .Values.enterpriseFeatures.apps.enabled }}
|
||||
{{- if .Values.enterpriseFeatures.clearmlApplications.enabled }}
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
@ -9,7 +9,7 @@ metadata:
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRole
|
||||
metadata:
|
||||
name: {{ include "apps.referenceName" . }}-kpa
|
||||
name: {{ include "clearmlApplications.referenceName" . }}-kpa
|
||||
rules:
|
||||
- apiGroups:
|
||||
- ""
|
||||
@ -20,7 +20,7 @@ rules:
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: ClusterRoleBinding
|
||||
metadata:
|
||||
name: {{ include "apps.referenceName" . }}-kpa
|
||||
name: {{ include "clearmlApplications.referenceName" . }}-kpa
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: "clearml-apps-sa"
|
||||
@ -28,13 +28,13 @@ subjects:
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: ClusterRole
|
||||
name: {{ include "apps.referenceName" . }}-kpa
|
||||
name: {{ include "clearmlApplications.referenceName" . }}-kpa
|
||||
{{- else }}
|
||||
---
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: Role
|
||||
metadata:
|
||||
name: {{ include "apps.referenceName" . }}-kpa
|
||||
name: {{ include "clearmlApplications.referenceName" . }}-kpa
|
||||
rules:
|
||||
- apiGroups:
|
||||
- ""
|
||||
@ -45,7 +45,7 @@ rules:
|
||||
apiVersion: rbac.authorization.k8s.io/v1
|
||||
kind: RoleBinding
|
||||
metadata:
|
||||
name: {{ include "apps.referenceName" . }}-kpa
|
||||
name: {{ include "clearmlApplications.referenceName" . }}-kpa
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: "clearml-apps-sa"
|
||||
@ -53,6 +53,6 @@ subjects:
|
||||
roleRef:
|
||||
apiGroup: rbac.authorization.k8s.io
|
||||
kind: Role
|
||||
name: {{ include "apps.referenceName" . }}-kpa
|
||||
name: {{ include "clearmlApplications.referenceName" . }}-kpa
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
@ -7,11 +7,11 @@ data:
|
||||
apiserver_secret: {{ .Values.clearml.apiserverSecret | b64enc }}
|
||||
fileserver_key: {{ .Values.clearml.fileserverKey | b64enc }}
|
||||
fileserver_secret: {{ .Values.clearml.fileserverSecret | b64enc }}
|
||||
apps_agent_key: {{ .Values.enterpriseFeatures.apps.AgentKey | b64enc }}
|
||||
apps_agent_secret: {{ .Values.enterpriseFeatures.apps.AgentSecret | b64enc }}
|
||||
apps_agent_key: {{ .Values.enterpriseFeatures.clearmlApplications.agentKey | b64enc }}
|
||||
apps_agent_secret: {{ .Values.enterpriseFeatures.clearmlApplications.agentSecret | b64enc }}
|
||||
secure_auth_token_secret: {{ .Values.clearml.secureAuthTokenSecret | b64enc }}
|
||||
apps_git_agent_user: {{ .Values.enterpriseFeatures.apps.GitAgentUser | b64enc }}
|
||||
apps_git_agent_pass: {{ .Values.enterpriseFeatures.apps.GitAgentPass | b64enc }}
|
||||
apps_git_agent_user: {{ .Values.enterpriseFeatures.clearmlApplications.gitAgentUser | b64enc }}
|
||||
apps_git_agent_pass: {{ .Values.enterpriseFeatures.clearmlApplications.gitAgentPass | b64enc }}
|
||||
test_user_key: {{ .Values.clearml.testUserKey | b64enc }}
|
||||
test_user_secret: {{ .Values.clearml.testUserSecret | b64enc }}
|
||||
---
|
||||
|
||||
@ -361,7 +361,7 @@ elasticsearch:
|
||||
enterpriseFeatures:
|
||||
# -- Enable/Disable Enterprise features
|
||||
enabled: false
|
||||
# -- Company name
|
||||
# -- Company ID
|
||||
defaultCompanyGuid: "d1bd92a3b039400cbafc60a7a5b1e52b"
|
||||
# -- Air gapped documentation configurations
|
||||
airGappedDocumentation:
|
||||
@ -372,15 +372,15 @@ enterpriseFeatures:
|
||||
repository: ""
|
||||
tag: ""
|
||||
# -- APPS configurations
|
||||
apps:
|
||||
clearmlApplications:
|
||||
# -- Apps Server basic auth key
|
||||
AgentKey: GK4PRTVT3706T25K6BA1
|
||||
agentKey: GK4PRTVT3706T25K6BA1
|
||||
# -- Apps Server basic auth secret
|
||||
AgentSecret: ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2
|
||||
agentSecret: ymLh1ok5k5xNUQfS944Xdx9xjf0wueokqKM2dMZfHuH9ayItG2
|
||||
# -- Apps Server Git user
|
||||
GitAgentUser: "git_user"
|
||||
gitAgentUser: "git_user"
|
||||
# -- Apps Server Git password
|
||||
GitAgentPass: "git_password"
|
||||
gitAgentPass: "git_password"
|
||||
# -- Enable/Disable component deployment
|
||||
enabled: true
|
||||
# -- APPS image configuration
|
||||
|
||||
Loading…
Reference in New Issue
Block a user