Fix full name and nonroot pod template (#188)

* Fixed: typo * Added: /tmp env var * Changed: use fullname * Fixed: fullname usage
2025-04-17 01:31:13 +00:00 · 2023-03-20 09:19:43 +01:00 · 2023-03-20 09:19:43 +01:00 · 957b7b2423
commit 957b7b2423
parent 6d9771be41
17 changed files with 90 additions and 68 deletions
--- 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.1"
+version: "4.0.2"
 appVersion: "1.24"
 kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
 home: https://clear.ml
@ -20,6 +20,7 @@ keywords:
  - "task agent"
 annotations:
  artifacthub.io/changes: |
-    - kind: changed
-      description: informational stuff refactoring
-
+    - kind: fixed
+      description: extra envs in base pod template
+    - kind: fixed
+      description: fullname usage
--- a/charts/clearml-agent/README.md
+++ b/charts/clearml-agent/README.md
@ -1,6 +1,6 @@
 # ClearML Kubernetes Agent

-![Version: 4.0.1](https://img.shields.io/badge/Version-4.0.1-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.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)

 MLOps platform Task running agent

@ -52,7 +52,7 @@ Enabling this features on OSS version can cause the entire installation to break
 In environments like Openshift or Tanzu it can be required to run non-root/non-privileged pods/containers.
 In this case it's recommended to use `values-enterprise-non-root-privileged.yaml` as base for override file.

-Keep in mind it's not possible to install packages on non-root containers so images used for Tasks must already have python and pip installed.
+Keep in mind it's not possible to install packages on non-root containers so images used for Tasks must already have python, pip and git installed.

 ## Source Code

--- a/charts/clearml-agent/README.md.gotmpl
+++ b/charts/clearml-agent/README.md.gotmpl
@ -49,7 +49,7 @@ Enabling this features on OSS version can cause the entire installation to break
 In environments like Openshift or Tanzu it can be required to run non-root/non-privileged pods/containers.
 In this case it's recommended to use `values-enterprise-non-root-privileged.yaml` as base for override file.

-Keep in mind it's not possible to install packages on non-root containers so images used for Tasks must already have python and pip installed.
+Keep in mind it's not possible to install packages on non-root containers so images used for Tasks must already have python, pip and git installed.

 {{ template "chart.sourcesSection" . }}

--- a/charts/clearml-agent/templates/_helpers.tpl
+++ b/charts/clearml-agent/templates/_helpers.tpl
@ -2,7 +2,25 @@
 Expand the name of the chart.
 */}}
 {{- define "clearmlAgent.name" -}}
-{{- .Release.Name | trunc 59 | trimSuffix "-" }}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "clearmlAgent.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
 {{- end }}

 {{/*
@ -40,7 +58,7 @@ Common annotations
 Selector labels
 */}}
 {{- define "clearmlAgent.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "clearmlAgent.name" . }}
+app.kubernetes.io/name: {{ include "clearmlAgent.fullname" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}

@ -48,8 +66,8 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Selector labels (agentk8sglue)
 */}}
 {{- define "agentk8sglue.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "clearmlAgent.name" . }}
-app.kubernetes.io/instance: {{ include "clearmlAgent.name" . }}
+app.kubernetes.io/name: {{ include "clearmlAgent.fullname" . }}
+app.kubernetes.io/instance: {{ include "clearmlAgent.fullname" . }}
 {{- end }}

 {{/*
@ -75,7 +93,7 @@ Create the name of the service account to use
 {{- if .Values.agentk8sglue.serviceExistingAccountName }}
 {{- .Values.agentk8sglue.serviceExistingAccountName }}
 {{- else }}
-{{- include "clearmlAgent.name" . }}-sa
+{{- include "clearmlAgent.fullname" . }}-sa
 {{- end }}
 {{- end }}

@ -116,7 +134,7 @@ Create a task container template
 {{- define "taskContainer.containerTemplate" -}}
 {{- if .main.Values.imageCredentials.enabled }}
 imagePullSecrets:
-  - name: {{ .main.Values.imageCredentials.existingSecret | default (printf "%s-ark" (include "clearmlAgent.name" .main )) }}
+  - name: {{ .main.Values.imageCredentials.existingSecret | default (printf "%s-ark" (include "clearmlAgent.fullname" .main )) }}
 {{- end }}
 schedulerName: {{ .value.templateOverrides.schedulerName | default (.main.Values.agentk8sglue.basePodTemplate.schedulerName) }}
 restartPolicy: Never
@ -130,11 +148,11 @@ volumes:
  {{- if .value.templateOverrides.fileMounts }}
  - name: filemounts
    secret:
-      secretName: {{ include "clearmlAgent.name" .main }}-{{ .key }}-fm
+      secretName: {{ include "clearmlAgent.fullname" .main }}-{{ .key }}-fm
  {{- else if .main.Values.agentk8sglue.basePodTemplate.fileMounts }}
  - name: filemounts
    secret:
-      secretName: {{ include "clearmlAgent.name" .main }}-fm
+      secretName: {{ include "clearmlAgent.fullname" .main }}-fm
  {{- end }}
 {{- if not .main.Values.enterpriseFeatures.serviceAccountClusterAccess }}
 serviceAccountName: {{ include "clearmlAgent.serviceAccountName" .main }}
@ -178,12 +196,12 @@ containers:
    - name: CLEARML_API_ACCESS_KEY
      valueFrom:
        secretKeyRef:
-          name: {{ .main.Values.clearml.existingAgentk8sglueSecret | default (printf "%s-ac" (include "clearmlAgent.name" .main )) }}
+          name: {{ .main.Values.clearml.existingAgentk8sglueSecret | default (printf "%s-ac" (include "clearmlAgent.fullname" .main )) }}
          key: agentk8sglue_key
    - name: CLEARML_API_SECRET_KEY
      valueFrom:
        secretKeyRef:
-          name: {{ .main.Values.clearml.existingAgentk8sglueSecret | default (printf "%s-ac" (include "clearmlAgent.name" .main )) }}
+          name: {{ .main.Values.clearml.existingAgentk8sglueSecret | default (printf "%s-ac" (include "clearmlAgent.fullname" .main )) }}
          key: agentk8sglue_secret
    {{- end }}
    - name: PYTHONUNBUFFERED
@ -192,7 +210,7 @@ containers:
    - name: CLEARML_API_HOST_VERIFY_CERT
      value: "false"
    {{- end }}
-    {{ $computedenvs := (.value.templateOverrides.env| default .main.Values.agentk8sglue.basePodTemplate.env) }}
+    {{- $computedenvs := (.value.templateOverrides.env | default .main.Values.agentk8sglue.basePodTemplate.env) -}}
    {{- if $computedenvs }}{{- $computedenvs | toYaml | nindent 4 }}{{- end }}
 nodeSelector:
  {{ .value.templateOverrides.nodeSelector | default .main.Values.agentk8sglue.basePodTemplate.nodeSelector | toYaml | nindent 2 }}
--- 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: {{ include "clearmlAgent.name" . }}-pt
+  name: {{ include "clearmlAgent.fullname" . }}-pt
 data:
 {{- if .Values.enterpriseFeatures.enabled }}
  template.yaml: |
@ -14,9 +14,9 @@ data:
    {{- range $key, $value := $.Values.enterpriseFeatures.queues }}
    {{ $key }}:
      {{- if $value.templateOverrides.fileMounts }}
-        - {{ include "clearmlAgent.name" $ }}-{{ $key }}-fm
+        - {{ include "clearmlAgent.fullname" $ }}-{{ $key }}-fm
      {{- else if $.Values.agentk8sglue.basePodTemplate.fileMounts }}
-        - {{ include "clearmlAgent.name" $ }}-fm
+        - {{ include "clearmlAgent.fullname" $ }}-fm
      {{- end }}
    {{- end }}
 {{- else }}
@ -34,7 +34,7 @@ data:
      {{- if .Values.imageCredentials.existingSecret }}
      - name: {{ .Values.imageCredentials.existingSecret }}
      {{- else }}
-      - name: name: {{ include "clearmlAgent.name" $ }}-ark
+      - name: name: {{ include "clearmlAgent.fullname" $ }}-ark
      {{- end }}
      {{- end }}
      {{- with .Values.agentk8sglue.basePodTemplate.volumes }}
@ -69,7 +69,7 @@ data:
              {{- if .Values.clearml.existingAgentk8sglueSecret }}
              name: {{ .Values.clearml.existingAgentk8sglueSecret }}
              {{- else }}
-              name: {{ include "clearmlAgent.name" . }}-ac
+              name: {{ include "clearmlAgent.fullname" . }}-ac
              {{- end }}
              key: agentk8sglue_key
        - name: CLEARML_API_SECRET_KEY
@ -78,7 +78,7 @@ data:
              {{- if .Values.clearml.existingAgentk8sglueSecret }}
              name: {{ .Values.clearml.existingAgentk8sglueSecret }}
              {{- else }}
-              name: {{ include "clearmlAgent.name" . }}-ac
+              name: {{ include "clearmlAgent.fullname" . }}-ac
              {{- end }}
              key: agentk8sglue_secret
        {{- if .Values.agentk8sglue.basePodTemplate.env }}
--- a/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-deployment.yaml
@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "clearmlAgent.name" . }}
+  name: {{ include "clearmlAgent.fullname" . }}
  labels:
    {{- include "clearmlAgent.labels" . | nindent 4 }}
  annotations:
@ -24,7 +24,7 @@ spec:
      {{- if .Values.imageCredentials.existingSecret }}
      - name: {{ .Values.imageCredentials.existingSecret }}
      {{- else }}
-      - name: {{ include "clearmlAgent.name" . }}-ark
+      - name: {{ include "clearmlAgent.fullname" . }}-ark
      {{- end }}
      {{- end }}
      serviceAccountName: {{ include "clearmlAgent.serviceAccountName" . }}
@ -71,7 +71,7 @@ spec:
              export PATH=$PATH:$HOME/bin;
              source /root/.bashrc && /root/entrypoint.sh
          volumeMounts:
-            - name: {{ include "clearmlAgent.name" . }}-pt
+            - name: {{ include "clearmlAgent.fullname" . }}-pt
              mountPath: /root/template
            {{ if .Values.clearml.clearmlConfig }}
            - name: k8sagent-clearml-conf-volume
@ -129,15 +129,15 @@ spec:
            - name: CLEARML_API_ACCESS_KEY
              valueFrom:
                secretKeyRef:
-                  name: {{ include "clearmlAgent.name" . }}-ac
+                  name: {{ include "clearmlAgent.fullname" . }}-ac
                  key: agentk8sglue_key
            - name: CLEARML_API_SECRET_KEY
              valueFrom:
                secretKeyRef:
-                  name: {{ include "clearmlAgent.name" . }}-ac
+                  name: {{ include "clearmlAgent.fullname" . }}-ac
                  key: agentk8sglue_secret
            - name: CLEARML_WORKER_ID
-              value: {{ include "clearmlAgent.name" . }}
+              value: {{ include "clearmlAgent.fullname" . }}
            - name: CLEARML_AGENT_UPDATE_REPO
              value: ""
            - name: FORCE_CLEARML_AGENT_REPO
@ -204,13 +204,13 @@ spec:
          securityContext:
            {{ toYaml .Values.agentk8sglue.containerSecurityContext | nindent 12 }}
      volumes:
-        - name: {{ include "clearmlAgent.name" . }}-pt
+        - name: {{ include "clearmlAgent.fullname" . }}-pt
          configMap:
-            name: {{ include "clearmlAgent.name" . }}-pt
+            name: {{ include "clearmlAgent.fullname" . }}-pt
        {{ if .Values.clearml.clearmlConfig }}
        - name: k8sagent-clearml-conf-volume
          secret:
-            secretName: {{ include "clearmlAgent.name" . }}-ac
+            secretName: {{ include "clearmlAgent.fullname" . }}-ac
            items:
            - key: clearml.conf
              path: clearml.conf
@ -218,7 +218,7 @@ spec:
        {{ if .Values.agentk8sglue.fileMounts }}
        - name: filemounts
          secret:
-            secretName: {{ include "clearmlAgent.name" . }}-afm
+            secretName: {{ include "clearmlAgent.fullname" . }}-afm
        {{ end }}
        {{- if .Values.agentk8sglue.volumes }}
        {{- toYaml .Values.agentk8sglue.volumes | nindent 8 }}
--- a/charts/clearml-agent/templates/agentk8sglue-rbac.yaml
+++ b/charts/clearml-agent/templates/agentk8sglue-rbac.yaml
@ -10,7 +10,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "clearmlAgent.name" . }}-kpa
+  name: {{ include "clearmlAgent.fullname" . }}-kpa
 rules:
  - apiGroups:
      - ""
@ -36,7 +36,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "clearmlAgent.name" . }}-kpa
+  name: {{ include "clearmlAgent.fullname" . }}-kpa
 subjects:
  - kind: ServiceAccount
    name: {{ include "clearmlAgent.serviceAccountName" . }}
@ -44,13 +44,13 @@ subjects:
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
-  name: {{ include "clearmlAgent.name" . }}-kpa
+  name: {{ include "clearmlAgent.fullname" . }}-kpa
 {{- else }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ include "clearmlAgent.name" . }}-kpa
+  name: {{ include "clearmlAgent.fullname" . }}-kpa
 rules:
  - apiGroups:
      - ""
@ -76,7 +76,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "clearmlAgent.name" . }}-kpa
+  name: {{ include "clearmlAgent.fullname" . }}-kpa
 subjects:
  - kind: ServiceAccount
    name: {{ include "clearmlAgent.serviceAccountName" . }}
@ -84,14 +84,14 @@ subjects:
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: Role
-  name: {{ include "clearmlAgent.name" . }}-kpa
+  name: {{ include "clearmlAgent.fullname" . }}-kpa
 {{- end }}
 {{- range .Values.agentk8sglue.additionalClusterRoleBindings }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "clearmlAgent.name" $ }}-kpa-{{ . }}
+  name: {{ include "clearmlAgent.fullname" $ }}-kpa-{{ . }}
 subjects:
  - kind: ServiceAccount
    name: {{ include "clearmlAgent.serviceAccountName" $ }}
@ -106,7 +106,7 @@ roleRef:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "clearmlAgent.name" $ }}-kpa-{{ . }}
+  name: {{ include "clearmlAgent.fullname" $ }}-kpa-{{ . }}
 subjects:
  - kind: ServiceAccount
    name: {{ include "clearmlAgent.serviceAccountName" $ }}
--- 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: {{ include "clearmlAgent.name" . }}-ac
+  name: {{ include "clearmlAgent.fullname" . }}-ac
 data:
  agentk8sglue_key: {{ .Values.clearml.agentk8sglueKey | b64enc }}
  agentk8sglue_secret: {{ .Values.clearml.agentk8sglueSecret | b64enc }}
@ -12,7 +12,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "clearmlAgent.name" . }}-ark
+  name: {{ include "clearmlAgent.fullname" . }}-ark
 type: kubernetes.io/dockerconfigjson
 data:
  .dockerconfigjson: {{ template "imagePullSecret" . }}
--- a/charts/clearml-agent/templates/service-secret.yaml
+++ b/charts/clearml-agent/templates/service-secret.yaml
@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "clearmlAgent.name" . }}-afm
+  name: {{ include "clearmlAgent.fullname" . }}-afm
 data:
  {{- range .Values.agentk8sglue.fileMounts }}
  {{ .name }}: {{ .fileContent | b64enc }}
@ -14,7 +14,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "clearmlAgent.name" . }}-fm
+  name: {{ include "clearmlAgent.fullname" . }}-fm
 data:
  {{- range .Values.agentk8sglue.basePodTemplate.fileMounts }}
  {{ .name }}: {{ .fileContent | b64enc }}
@ -26,7 +26,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "clearmlAgent.name" $ }}-{{ $key }}-fm
+  name: {{ include "clearmlAgent.fullname" $ }}-{{ $key }}-fm
 data:
  {{- range .templateOverrides.fileMounts }}
  {{ .name }}: {{ .fileContent | b64enc }}
--- a/charts/clearml-agent/values-enterprise-non-root-privileged.yaml
+++ b/charts/clearml-agent/values-enterprise-non-root-privileged.yaml
@ -22,6 +22,9 @@ agentk8sglue:
      value: /tmp/__start_agent__.sh

  basePodTemplate:
+    env:
+      - name: HOME
+        value: /tmp
    containerSecurityContext:
      runAsUser: 1000
      runAsNonRoot: true
--- a/charts/clearml/Chart.yaml
+++ b/charts/clearml/Chart.yaml
@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "6.0.1"
+version: "6.0.2"
 appVersion: "1.9.2"
 kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
 home: https://clear.ml
@ -32,5 +32,5 @@ dependencies:
    condition: elasticsearch.enabled
 annotations:
  artifacthub.io/changes: |
-    - kind: changed
-      description: informational stuff refactoring
+    - kind: fixed
+      description: fullname usage
--- a/charts/clearml/README.md
+++ b/charts/clearml/README.md
@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes

-![Version: 6.0.1](https://img.shields.io/badge/Version-6.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.2](https://img.shields.io/badge/AppVersion-1.9.2-informational?style=flat-square)
+![Version: 6.0.2](https://img.shields.io/badge/Version-6.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.2](https://img.shields.io/badge/AppVersion-1.9.2-informational?style=flat-square)

 MLOps platform

--- a/charts/clearml/templates/NOTES.txt
+++ b/charts/clearml/templates/NOTES.txt
@ -11,7 +11,7 @@
  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "clearml.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
  echo http://$SERVICE_IP:{{ .Values.webserver.service.port }}
 {{- else if contains "ClusterIP" .Values.webserver.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "clearml.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "clearml.fullname" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
  echo "Visit http://127.0.0.1:8080 to use your application"
  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
--- a/charts/clearml/templates/_helpers.tpl
+++ b/charts/clearml/templates/_helpers.tpl
@ -46,7 +46,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "clearml.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "clearml.name" . }}
+app.kubernetes.io/name: {{ include "clearml.fullname" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}

@ -70,14 +70,14 @@ Registry name
 Reference Name (apiserver)
 */}}
 {{- define "apiserver.referenceName" -}}
-{{- include "clearml.name" . }}-apiserver
+{{- include "clearml.fullname" . }}-apiserver
 {{- end }}

 {{/*
 Selector labels (apiserver)
 */}}
 {{- define "apiserver.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "clearml.name" . }}
+app.kubernetes.io/name: {{ include "clearml.fullname" . }}
 app.kubernetes.io/instance: {{ include "apiserver.referenceName" . }}
 {{- end }}

@ -85,14 +85,14 @@ app.kubernetes.io/instance: {{ include "apiserver.referenceName" . }}
 Reference Name (fileserver)
 */}}
 {{- define "fileserver.referenceName" -}}
-{{- include "clearml.name" . }}-fileserver
+{{- include "clearml.fullname" . }}-fileserver
 {{- end }}

 {{/*
 Selector labels (fileserver)
 */}}
 {{- define "fileserver.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "clearml.name" . }}
+app.kubernetes.io/name: {{ include "clearml.fullname" . }}
 app.kubernetes.io/instance: {{ include "fileserver.referenceName" . }}
 {{- end }}

@ -100,14 +100,14 @@ app.kubernetes.io/instance: {{ include "fileserver.referenceName" . }}
 Reference Name (webserver)
 */}}
 {{- define "webserver.referenceName" -}}
-{{- include "clearml.name" . }}-webserver
+{{- include "clearml.fullname" . }}-webserver
 {{- end }}

 {{/*
 Selector labels (webserver)
 */}}
 {{- define "webserver.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "clearml.name" . }}
+app.kubernetes.io/name: {{ include "clearml.fullname" . }}
 app.kubernetes.io/instance: {{ include "webserver.referenceName" . }}
 {{- end }}

@ -115,14 +115,14 @@ app.kubernetes.io/instance: {{ include "webserver.referenceName" . }}
 Reference Name (apps)
 */}}
 {{- define "clearmlApplications.referenceName" -}}
-{{- include "clearml.name" . }}-apps
+{{- include "clearml.fullname" . }}-apps
 {{- end }}

 {{/*
 Selector labels (apps)
 */}}
 {{- define "clearmlApplications.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "clearml.name" . }}
+app.kubernetes.io/name: {{ include "clearml.fullname" . }}
 app.kubernetes.io/instance: {{ include "clearmlApplications.referenceName" . }}
 {{- end }}

--- a/charts/clearml/templates/apps-configmap.yaml
+++ b/charts/clearml/templates/apps-configmap.yaml
@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "clearml.name" . }}-apps-pt
+  name: {{ include "clearml.fullname" . }}-apps-pt
 data:
  template.yaml: |
    apps_queue:
@ -24,7 +24,7 @@ data:
          {{- if .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
          - name: filemounts
            secret:
-              secretName: {{ include "clearml.name" . }}-apps-fm
+              secretName: {{ include "clearml.fullname" . }}-apps-fm
          {{- end }}
        containers:
        - resources:
--- a/charts/clearml/templates/apps-deployment.yaml
+++ b/charts/clearml/templates/apps-deployment.yaml
@ -29,9 +29,9 @@ spec:
      {{- end }}
      {{- end }}
      volumes:
-        - name: {{ include "clearml.name" . }}-apps-pt
+        - name: {{ include "clearml.fullname" . }}-apps-pt
          configMap:
-            name: {{ include "clearml.name" . }}-apps-pt
+            name: {{ include "clearml.fullname" . }}-apps-pt
      {{- if .Values.enterpriseFeatures.clearmlApplications.additionalConfigs }}
        - name: apps-config
          configMap:
@ -40,7 +40,7 @@ spec:
      {{- if .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
        - name: filemounts
          secret:
-            secretName: {{ include "clearml.name" . }}-apps-fm
+            secretName: {{ include "clearml.fullname" . }}-apps-fm
      {{- end }}
      serviceAccountName: "clearml-apps-sa"
      securityContext:
@ -117,7 +117,7 @@ spec:
          {{ toYaml .Values.enterpriseFeatures.clearmlApplications.extraEnvs | nindent 10 }}
          {{- end }}
          volumeMounts:
-          - name: {{ include "clearml.name" . }}-apps-pt
+          - name: {{ include "clearml.fullname" . }}-apps-pt
            mountPath: /root/template
          {{- if .Values.enterpriseFeatures.clearmlApplications.additionalConfigs }}
            - name: apps-config
--- a/charts/clearml/templates/apps-secrets.yaml
+++ b/charts/clearml/templates/apps-secrets.yaml
@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "clearml.name" . }}-apps-fm
+  name: {{ include "clearml.fullname" . }}-apps-fm
 data:
  {{- range .Values.enterpriseFeatures.clearmlApplications.fileMounts }}
  {{ .name }}: {{ .fileContent | b64enc }}