Fix broken reference name to controller name when setting controller.…

…containerName Follow up for aws#7384
asherf · Dec 16, 2024 · 4da2355 · 4da2355
1 parent e0cd8a4
commit 4da2355
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/charts/karpenter/templates/_helpers.tpl b/charts/karpenter/templates/_helpers.tpl
@@ -45,6 +45,14 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 {{- end }}
 
+
+{{/*
+Container name
+*/}}
+{{- define "karpenter.controller.ContainerName" -}}
+{{ .Values.controller.containerName | default "controller" }}
+{{- end }}
+
 {{/*
 Selector labels
 */}}

diff --git a/charts/karpenter/templates/deployment.yaml b/charts/karpenter/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
       schedulerName: {{ . | quote }}
       {{- end }}
       containers:
-        - name: {{ .Values.controller.containerName | default "controller" }}
+        - name: {{ include "karpenter.controller.ContainerName" . }}
           securityContext:
             runAsUser: 65532
             runAsGroup: 65532
@@ -102,7 +102,7 @@ spec:
             - name: MEMORY_LIMIT
               valueFrom:
                 resourceFieldRef:
-                  containerName: controller
+                  containerName: {{ include "karpenter.controller.ContainerName" . }}
                   divisor: "0"
                   resource: limits.memory
             - name: FEATURE_GATES