Enable multiple agents installations (#92)

* Changed: dynamic names

* Changed: bump up version
This commit is contained in:
Valeriano Manassero 2022-07-15 08:28:40 +02:00 committed by GitHub
parent d778d0ef93
commit 56880de8bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 20 deletions

View File

@ -2,7 +2,7 @@ apiVersion: v2
name: clearml-agent name: clearml-agent
description: MLOps platform description: MLOps platform
type: application type: application
version: "1.1.2" version: "1.2.0"
appVersion: "1.24" appVersion: "1.24"
kubeVersion: ">= 1.19.0-0 < 1.25.0-0" kubeVersion: ">= 1.19.0-0 < 1.25.0-0"
home: https://clear.ml home: https://clear.ml

View File

@ -1,6 +1,6 @@
# clearml-agent # clearml-agent
![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24](https://img.shields.io/badge/AppVersion-1.24-informational?style=flat-square) ![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.24](https://img.shields.io/badge/AppVersion-1.24-informational?style=flat-square)
MLOps platform MLOps platform
@ -56,4 +56,4 @@ Kubernetes: `>= 1.19.0-0 < 1.25.0-0`
| imageCredentials.username | string | `"someone"` | Registry username | | imageCredentials.username | string | `"someone"` | Registry username |
---------------------------------------------- ----------------------------------------------
Autogenerated from chart metadata using [helm-docs v1.10.0](https://github.com/norwoodj/helm-docs/releases/v1.10.0) Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

View File

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: k8sagent-pod-template name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pod-template
data: data:
template.yaml: | template.yaml: |
apiVersion: v1 apiVersion: v1
@ -13,7 +13,7 @@ data:
{{- if .Values.imageCredentials.existingSecret }} {{- if .Values.imageCredentials.existingSecret }}
- name: .Values.imageCredentials.existingSecret - name: .Values.imageCredentials.existingSecret
{{- else }} {{- else }}
- name: clearml-agent-registry-key - name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-registry-key
{{- end }} {{- end }}
{{- end }} {{- end }}
serviceAccountName: {{ .Values.agentk8sglue.serviceAccountName }} serviceAccountName: {{ .Values.agentk8sglue.serviceAccountName }}
@ -43,12 +43,12 @@ data:
- name: CLEARML_API_ACCESS_KEY - name: CLEARML_API_ACCESS_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: clearml-agent-conf name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf
key: agentk8sglue_key key: agentk8sglue_key
- name: CLEARML_API_SECRET_KEY - name: CLEARML_API_SECRET_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: clearml-agent-conf name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf
key: agentk8sglue_secret key: agentk8sglue_secret
{{- if .Values.agentk8sglue.podTemplate.env }} {{- if .Values.agentk8sglue.podTemplate.env }}
{{ toYaml .Values.agentk8sglue.podTemplate.env | nindent 8 }} {{ toYaml .Values.agentk8sglue.podTemplate.env | nindent 8 }}

View File

@ -12,7 +12,7 @@ spec:
template: template:
metadata: metadata:
annotations: annotations:
checksum/config: {{ printf "%s" .Values.clearml | sha256sum }} checksum/config: {{ printf "%s%s" .Values.clearml .Values.agentk8sglue | sha256sum }}
labels: labels:
{{- include "agentk8sglue.selectorLabels" . | nindent 8 }} {{- include "agentk8sglue.selectorLabels" . | nindent 8 }}
spec: spec:
@ -21,7 +21,7 @@ spec:
{{- if .Values.imageCredentials.existingSecret }} {{- if .Values.imageCredentials.existingSecret }}
- name: .Values.imageCredentials.existingSecret - name: .Values.imageCredentials.existingSecret
{{- else }} {{- else }}
- name: clearml-agent-registry-key - name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-registry-key
{{- end }} {{- end }}
{{- end }} {{- end }}
initContainers: initContainers:
@ -50,7 +50,7 @@ spec:
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["/bin/bash", "-c", "export PATH=$PATH:$HOME/bin; source /root/.bashrc && /root/entrypoint.sh"] command: ["/bin/bash", "-c", "export PATH=$PATH:$HOME/bin; source /root/.bashrc && /root/entrypoint.sh"]
volumeMounts: volumeMounts:
- name: k8sagent-pod-template - name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pod-template
mountPath: /root/template mountPath: /root/template
{{ if .Values.clearml.clearmlConfig }} {{ if .Values.clearml.clearmlConfig }}
- name: k8sagent-clearml-conf-volume - name: k8sagent-clearml-conf-volume
@ -76,12 +76,12 @@ spec:
- name: CLEARML_API_ACCESS_KEY - name: CLEARML_API_ACCESS_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: clearml-agent-conf name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf
key: agentk8sglue_key key: agentk8sglue_key
- name: CLEARML_API_SECRET_KEY - name: CLEARML_API_SECRET_KEY
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
name: clearml-agent-conf name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf
key: agentk8sglue_secret key: agentk8sglue_secret
- name: CLEARML_WORKER_ID - name: CLEARML_WORKER_ID
value: "{{.Values.agentk8sglue.id}}" value: "{{.Values.agentk8sglue.id}}"
@ -92,13 +92,13 @@ spec:
- name: CLEARML_DOCKER_IMAGE - name: CLEARML_DOCKER_IMAGE
value: "{{.Values.agentk8sglue.defaultContainerImage}}" value: "{{.Values.agentk8sglue.defaultContainerImage}}"
volumes: volumes:
- name: k8sagent-pod-template - name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pod-template
configMap: configMap:
name: k8sagent-pod-template name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pod-template
{{ if .Values.clearml.clearmlConfig }} {{ if .Values.clearml.clearmlConfig }}
- name: k8sagent-clearml-conf-volume - name: k8sagent-clearml-conf-volume
secret: secret:
secretName: clearml-agent-conf secretName: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf
items: items:
- key: clearml.conf - key: clearml.conf
path: clearml.conf path: clearml.conf

View File

@ -1,7 +1,7 @@
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
name: k8sagent-pods-access name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pods-access
rules: rules:
- apiGroups: - apiGroups:
- "" - ""
@ -12,7 +12,7 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding kind: RoleBinding
metadata: metadata:
name: k8sagent-pods-access name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pods-access
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: default name: default
@ -20,4 +20,4 @@ subjects:
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: Role kind: Role
name: k8sagent-pods-access name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pods-access

View File

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: clearml-agent-conf name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf
data: data:
agentk8sglue_key: {{ .Values.clearml.agentk8sglueKey | b64enc }} agentk8sglue_key: {{ .Values.clearml.agentk8sglueKey | b64enc }}
agentk8sglue_secret: {{ .Values.clearml.agentk8sglueSecret | b64enc }} agentk8sglue_secret: {{ .Values.clearml.agentk8sglueSecret | b64enc }}
@ -12,7 +12,7 @@ data:
apiVersion: v1 apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: clearml-agent-registry-key name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-registry-key
type: kubernetes.io/dockerconfigjson type: kubernetes.io/dockerconfigjson
data: data:
.dockerconfigjson: {{ template "imagePullSecret" . }} .dockerconfigjson: {{ template "imagePullSecret" . }}