resolve merge conflicts with dev

demonCoder95 · demonCoder95 · commit abf70a2beba5 · 2024-02-12T13:46:33.000+01:00
diff --git a/cluster/config-defaults.yaml b/cluster/config-defaults.yaml
@@ -29,7 +29,11 @@ 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"
 
