From 27b52fa5b380833e8c87c1acccec25ce46f35598 Mon Sep 17 00:00:00 2001
From: Valeriano Manassero
 <14011549+valeriano-manassero@users.noreply.github.com>
Date: Mon, 20 Mar 2023 15:16:23 +0100
Subject: [PATCH] 193 after upgrade to the new chart version error (#194)

* Fixed: agent selector label

* Changed: version bump
---
 charts/clearml-agent/Chart.yaml                   |  6 ++----
 charts/clearml-agent/README.md                    |  2 +-
 charts/clearml-agent/templates/_helpers.tpl       | 15 +++++++++++++++
 .../templates/agentk8sglue-deployment.yaml        |  4 ++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/charts/clearml-agent/Chart.yaml b/charts/clearml-agent/Chart.yaml
index 4bc1b7d..c2e9dca 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: "4.0.2"
+version: "4.0.3"
 appVersion: "1.24"
 kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
 home: https://clear.ml
@@ -21,6 +21,4 @@ keywords:
 annotations:
   artifacthub.io/changes: |
     - kind: fixed
-      description: extra envs in base pod template
-    - kind: fixed
-      description: fullname usage
+      description: wrong selector for agent
diff --git a/charts/clearml-agent/README.md b/charts/clearml-agent/README.md
index 3699c70..bd83303 100644
--- a/charts/clearml-agent/README.md
+++ b/charts/clearml-agent/README.md
@@ -1,6 +1,6 @@
 # ClearML Kubernetes Agent
 
-![Version: 4.0.2](https://img.shields.io/badge/Version-4.0.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: 4.0.3](https://img.shields.io/badge/Version-4.0.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)
 
 MLOps platform Task running agent
 
diff --git a/charts/clearml-agent/templates/_helpers.tpl b/charts/clearml-agent/templates/_helpers.tpl
index 8663402..5944885 100644
--- a/charts/clearml-agent/templates/_helpers.tpl
+++ b/charts/clearml-agent/templates/_helpers.tpl
@@ -45,6 +45,21 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 {{- end }}
 
+{{/*
+Common labels (agentk8sglue)
+*/}}
+{{- define "agentk8sglue.labels" -}}
+helm.sh/chart: {{ include "clearmlAgent.chart" . }}
+{{ include "agentk8sglue.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if $.Values.agentk8sglue.labels }}
+{{ toYaml $.Values.agentk8sglue.labels }}
+{{- end }}
+{{- end }}
+
 {{/*
 Common annotations
 */}}
diff --git a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
index 2ed8297..300e63d 100644
--- a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: {{ include "clearmlAgent.fullname" . }}
   labels:
-    {{- include "clearmlAgent.labels" . | nindent 4 }}
+    {{- include "agentk8sglue.labels" . | nindent 4 }}
   annotations:
     {{- include "clearmlAgent.annotations" . | nindent 4 }}
 spec:
@@ -17,7 +17,7 @@ spec:
         checksum/config: {{ printf "%s" .Values | sha256sum }}
         {{- include "clearmlAgent.annotations" . | nindent 8 }}
       labels:
-        {{- include "clearmlAgent.labels" . | nindent 8 }}
+        {{- include "agentk8sglue.labels" . | nindent 8 }}
     spec:
       {{- if .Values.imageCredentials.enabled }}
       imagePullSecrets: