From 4845bd3f4f37ccd62a1b91da1ae29db8fef2bd28 Mon Sep 17 00:00:00 2001 From: savitha-qs <126019623+savitha-qs@users.noreply.github.com> Date: Tue, 2 Apr 2024 01:47:14 -0500 Subject: [PATCH] Issue-275: Honor existingAgentk8sglueSecret in deployment template (#276) * Issue-275: Honor existingAgentk8sglueSecret in deployment template * Issue-275: rev the patch version of the chart * Issue-275: update README for clearml-agent chart * Issue-275: update annotation in Chart.yaml * Issue-275: remove item not relevant to Issue 275 from Chart annotations * Issue-275: add new line to end of file to get lint to pass * Update Chart.yaml --------- Co-authored-by: Savitha Ganapathi Co-authored-by: Valeriano Manassero <14011549+valeriano-manassero@users.noreply.github.com> --- charts/clearml-agent/Chart.yaml | 4 ++-- charts/clearml-agent/README.md | 2 +- .../clearml-agent/templates/agentk8sglue-deployment.yaml | 8 ++++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/charts/clearml-agent/Chart.yaml b/charts/clearml-agent/Chart.yaml index 1c1caf7..8cfb1a1 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 Task running agent type: application -version: "5.1.3" +version: "5.1.4" appVersion: "1.24" kubeVersion: ">= 1.21.0-0 < 1.30.0-0" home: https://clear.ml @@ -21,4 +21,4 @@ keywords: annotations: artifacthub.io/changes: | - kind: fixed - description: kubernetes 1.29 support + description: honor existingAgentk8sglueSecret in deployment template diff --git a/charts/clearml-agent/README.md b/charts/clearml-agent/README.md index 2d0f464..5c18c1f 100644 --- a/charts/clearml-agent/README.md +++ b/charts/clearml-agent/README.md @@ -1,6 +1,6 @@ # ClearML Kubernetes Agent -![Version: 5.1.3](https://img.shields.io/badge/Version-5.1.3-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: 5.1.4](https://img.shields.io/badge/Version-5.1.4-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 Task running agent diff --git a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml index 2dcdd01..713348d 100644 --- a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml +++ b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml @@ -112,12 +112,20 @@ spec: - name: CLEARML_API_ACCESS_KEY valueFrom: secretKeyRef: + {{- if .Values.clearml.existingAgentk8sglueSecret }} + name: {{ .Values.clearml.existingAgentk8sglueSecret }} + {{- else }} name: {{ include "clearmlAgent.fullname" . }}-ac + {{- end }} key: agentk8sglue_key - name: CLEARML_API_SECRET_KEY valueFrom: secretKeyRef: + {{- if .Values.clearml.existingAgentk8sglueSecret }} + name: {{ .Values.clearml.existingAgentk8sglueSecret }} + {{- else }} name: {{ include "clearmlAgent.fullname" . }}-ac + {{- end }} key: agentk8sglue_secret - name: CLEARML_WORKER_ID value: {{ include "clearmlAgent.fullname" . }}