Changed: dynamic names

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 }}

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

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

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" . }}