update template function names

Author: demonCoder95

cluster/config-defaults.yaml

@@ -29,11 +29,7 @@ cluster_autoscaler_max_usnchedulable_pods_considered: "1000"
 
 # karpenter settings
 karpenter_controller_cpu: "25m"
-<<<<<<< HEAD
 karpenter_controller_memory: "100Mi"
-=======
-karpenter_controller_memory: "250Mi"
->>>>>>> 8a39d9dd (set karpenter cpu default to 25m)
 # set log level of karpenter: error|debug
 karpenter_log_level: "error"
 

cluster/manifests/02-kube-aws-iam-controller/vpa.yaml

@@ -21,7 +21,7 @@ spec:
         {{ if eq $NodePool.Name "default-master" }}
         # Scaling is relative to r6g.large (smallest master node)
         # 0.014 -> 25m CPU, 0.003 -> 50Mi memory
-        cpu: {{ scaleQuantity ( instanceTypeCPU ( index .InstanceTypes 0 )) 0.014 }}
-        memory: {{ scaleQuantity ( instanceTypeMemory ( index .InstanceTypes 0 )) 0.003 }}
+        cpu: {{ scaleQuantity ( instanceTypeCPUQuantity ( index .InstanceTypes 0 )) 0.014 }}
+        memory: {{ scaleQuantity ( instanceTypeMemoryQuantity ( index .InstanceTypes 0 )) 0.003 }}
         {{ end }}
         {{ end }}

cluster/manifests/03-ebs-csi/vpa.yaml

@@ -20,8 +20,8 @@ spec:
     {{ if eq $NodePool.Name "default-master" }}
     # Scaling is relative to r6g.large (smallest master node)
     # 0.006 -> ~90Mi memory, 0.031 -> ~55m CPU
-    {{ $scaledCPU := scaleQuantity ( instanceTypeCPU ( index .InstanceTypes 0 )) 0.031 }}
-    {{ $scaledMemory := scaleQuantity ( instanceTypeMemory ( index .InstanceTypes 0 )) 0.006 }}
+    {{ $scaledCPU := scaleQuantity ( instanceTypeCPUQuantity ( index .InstanceTypes 0 )) 0.031 }}
+    {{ $scaledMemory := scaleQuantity ( instanceTypeMemoryQuantity ( index .InstanceTypes 0 )) 0.006 }}
       maxAllowed:
         cpu: {{ $scaledCPU }}
         memory: {{ $scaledMemory }}

cluster/manifests/z-karpenter/vpa.yaml

@@ -26,8 +26,8 @@ spec:
         {{ if eq $NodePool.Name "default-master" }}
           # Scaling is relative to r6g.large (smallest master node)
           # 0.016 -> ~250Mi memory, 0.027 -> ~50m CPU
-          memory: {{ scaleQuantity (instanceTypeMemory (index .InstanceTypes 0)) 0.016 }}
-          cpu: {{ scaleQuantity (instanceTypeCPU (index .InstanceTypes 0)) 0.027 }}
+          memory: {{ scaleQuantity (instanceTypeMemoryQuantity (index .InstanceTypes 0)) 0.016 }}
+          cpu: {{ scaleQuantity (instanceTypeCPUQuantity (index .InstanceTypes 0)) 0.027 }}
         {{ end }}
         {{ end }}
 {{end}}