From 56880de8bb75fa5d6eea6a84cd8a2ca4d8ffc2d2 Mon Sep 17 00:00:00 2001 From: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com> Date: Fri, 15 Jul 2022 08:28:40 +0200 Subject: [PATCH] Enable multiple agents installations (#92) * Changed: dynamic names * Changed: bump up version --- charts/clearml-agent/Chart.yaml | 2 +- charts/clearml-agent/README.md | 4 ++-- .../templates/agentk8sglue-configmap.yaml | 8 ++++---- .../templates/agentk8sglue-deployment.yaml | 16 ++++++++-------- .../templates/agentk8sglue-rbac.yaml | 6 +++--- .../clearml-agent/templates/clearml-secrets.yaml | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/charts/clearml-agent/Chart.yaml b/charts/clearml-agent/Chart.yaml index 1339f46..2ff006f 100644 --- a/charts/clearml-agent/Chart.yaml +++ b/charts/clearml-agent/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: clearml-agent description: MLOps platform type: application -version: "1.1.2" +version: "1.2.0" appVersion: "1.24" kubeVersion: ">= 1.19.0-0 < 1.25.0-0" home: https://clear.ml diff --git a/charts/clearml-agent/README.md b/charts/clearml-agent/README.md index 33eadc2..161c5de 100644 --- a/charts/clearml-agent/README.md +++ b/charts/clearml-agent/README.md @@ -1,6 +1,6 @@ # 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 @@ -56,4 +56,4 @@ Kubernetes: `>= 1.19.0-0 < 1.25.0-0` | 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) diff --git a/charts/clearml-agent/templates/agentk8sglue-configmap.yaml b/charts/clearml-agent/templates/agentk8sglue-configmap.yaml index 9c1e402..2ba94db 100644 --- a/charts/clearml-agent/templates/agentk8sglue-configmap.yaml +++ b/charts/clearml-agent/templates/agentk8sglue-configmap.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: k8sagent-pod-template + name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pod-template data: template.yaml: | apiVersion: v1 @@ -13,7 +13,7 @@ data: {{- if .Values.imageCredentials.existingSecret }} - name: .Values.imageCredentials.existingSecret {{- else }} - - name: clearml-agent-registry-key + - name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-registry-key {{- end }} {{- end }} serviceAccountName: {{ .Values.agentk8sglue.serviceAccountName }} @@ -43,12 +43,12 @@ data: - name: CLEARML_API_ACCESS_KEY valueFrom: secretKeyRef: - name: clearml-agent-conf + name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf key: agentk8sglue_key - name: CLEARML_API_SECRET_KEY valueFrom: secretKeyRef: - name: clearml-agent-conf + name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf key: agentk8sglue_secret {{- if .Values.agentk8sglue.podTemplate.env }} {{ toYaml .Values.agentk8sglue.podTemplate.env | nindent 8 }} diff --git a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml index 2f13702..0ab3d4c 100644 --- a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml +++ b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml @@ -12,7 +12,7 @@ spec: template: metadata: annotations: - checksum/config: {{ printf "%s" .Values.clearml | sha256sum }} + checksum/config: {{ printf "%s%s" .Values.clearml .Values.agentk8sglue | sha256sum }} labels: {{- include "agentk8sglue.selectorLabels" . | nindent 8 }} spec: @@ -21,7 +21,7 @@ spec: {{- if .Values.imageCredentials.existingSecret }} - name: .Values.imageCredentials.existingSecret {{- else }} - - name: clearml-agent-registry-key + - name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-registry-key {{- end }} {{- end }} initContainers: @@ -50,7 +50,7 @@ spec: imagePullPolicy: IfNotPresent command: ["/bin/bash", "-c", "export PATH=$PATH:$HOME/bin; source /root/.bashrc && /root/entrypoint.sh"] volumeMounts: - - name: k8sagent-pod-template + - name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pod-template mountPath: /root/template {{ if .Values.clearml.clearmlConfig }} - name: k8sagent-clearml-conf-volume @@ -76,12 +76,12 @@ spec: - name: CLEARML_API_ACCESS_KEY valueFrom: secretKeyRef: - name: clearml-agent-conf + name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf key: agentk8sglue_key - name: CLEARML_API_SECRET_KEY valueFrom: secretKeyRef: - name: clearml-agent-conf + name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf key: agentk8sglue_secret - name: CLEARML_WORKER_ID value: "{{.Values.agentk8sglue.id}}" @@ -92,13 +92,13 @@ spec: - name: CLEARML_DOCKER_IMAGE value: "{{.Values.agentk8sglue.defaultContainerImage}}" volumes: - - name: k8sagent-pod-template + - name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pod-template configMap: - name: k8sagent-pod-template + name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pod-template {{ if .Values.clearml.clearmlConfig }} - name: k8sagent-clearml-conf-volume secret: - secretName: clearml-agent-conf + secretName: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf items: - key: clearml.conf path: clearml.conf diff --git a/charts/clearml-agent/templates/agentk8sglue-rbac.yaml b/charts/clearml-agent/templates/agentk8sglue-rbac.yaml index b2b5d44..d961603 100644 --- a/charts/clearml-agent/templates/agentk8sglue-rbac.yaml +++ b/charts/clearml-agent/templates/agentk8sglue-rbac.yaml @@ -1,7 +1,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: k8sagent-pods-access + name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pods-access rules: - apiGroups: - "" @@ -12,7 +12,7 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: k8sagent-pods-access + name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pods-access subjects: - kind: ServiceAccount name: default @@ -20,4 +20,4 @@ subjects: roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: k8sagent-pods-access + name: {{ include "agentk8sglue.referenceName" . }}-k8sagent-pods-access diff --git a/charts/clearml-agent/templates/clearml-secrets.yaml b/charts/clearml-agent/templates/clearml-secrets.yaml index b92c7ed..a370691 100644 --- a/charts/clearml-agent/templates/clearml-secrets.yaml +++ b/charts/clearml-agent/templates/clearml-secrets.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: clearml-agent-conf + name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-conf data: agentk8sglue_key: {{ .Values.clearml.agentk8sglueKey | b64enc }} agentk8sglue_secret: {{ .Values.clearml.agentk8sglueSecret | b64enc }} @@ -12,7 +12,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: clearml-agent-registry-key + name: {{ include "agentk8sglue.referenceName" . }}-clearml-agent-registry-key type: kubernetes.io/dockerconfigjson data: .dockerconfigjson: {{ template "imagePullSecret" . }}