fix: incorrect format for bugets and limits

AtomiCloud · Feb 21, 2024 · aefba44 · aefba44
1 parent 866b60d
commit aefba44
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/chart/README.md b/chart/README.md
@@ -14,26 +14,26 @@ Helm chart to deploy Karpenter to auto-scale EKS clusters
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| al2 | object | `{"disruption":{"budgets":["20%"],"consolidateAfter":"30s","consolidationPolicy":"WhenUnderutilized","expireAfter":"720h"},"enable":false,"limits":{"cpu":50,"memory":"100Gi"},"requirements":[]}` | Values to control Amazon Linux 2 (AL2) provisioners |
-| al2.disruption | object | `{"budgets":["20%"],"consolidateAfter":"30s","consolidationPolicy":"WhenUnderutilized","expireAfter":"720h"}` | Control how the provisioner handles disruptions |
-| al2.disruption.budgets | list | `["20%"]` | Budgets to use for consolidating resources |
+| al2 | object | `{"disruption":{"budgets":[{"nodes":"20%"}],"consolidateAfter":"30s","consolidationPolicy":"WhenUnderutilized","expireAfter":"720h"},"enable":false,"limits":{"cpu":"50","memory":"100Gi"},"requirements":[]}` | Values to control Amazon Linux 2 (AL2) provisioners |
+| al2.disruption | object | `{"budgets":[{"nodes":"20%"}],"consolidateAfter":"30s","consolidationPolicy":"WhenUnderutilized","expireAfter":"720h"}` | Control how the provisioner handles disruptions |
+| al2.disruption.budgets | list | `[{"nodes":"20%"}]` | Budgets to use for consolidating resources |
 | al2.disruption.consolidateAfter | string | `"30s"` | Time to wait before consolidating resources |
 | al2.disruption.consolidationPolicy | string | `"WhenUnderutilized"` | Consolidation policy to use |
 | al2.disruption.expireAfter | string | `"720h"` | Time to wait before expiring resources (will automatically restart nodes periodically) |
 | al2.enable | bool | `false` | Enable the AL2 Provisioner |
-| al2.limits | object | `{"cpu":50,"memory":"100Gi"}` | Total limits that the provisioner can provision |
-| al2.limits.cpu | int | `50` | Maximum CPU that the provisioner can provision |
+| al2.limits | object | `{"cpu":"50","memory":"100Gi"}` | Total limits that the provisioner can provision |
+| al2.limits.cpu | string | `"50"` | Maximum CPU that the provisioner can provision |
 | al2.limits.memory | string | `"100Gi"` | Maximum memory that the provisioner can provision |
 | al2.requirements | list | `[]` | Requirement for the AL2 provisioner |
-| bottlerocket | object | `{"disruption":{"budgets":["20%"],"consolidateAfter":"30s","consolidationPolicy":"WhenUnderutilized","expireAfter":"720h"},"enable":false,"limits":{"cpu":50,"memory":"100Gi"},"requirements":[]}` | Values to control Bottlerocket provisioners |
-| bottlerocket.disruption | object | `{"budgets":["20%"],"consolidateAfter":"30s","consolidationPolicy":"WhenUnderutilized","expireAfter":"720h"}` | Control how the provisioner handles disruptions |
-| bottlerocket.disruption.budgets | list | `["20%"]` | Budgets to use for consolidating resources |
+| bottlerocket | object | `{"disruption":{"budgets":[{"nodes":"20%"}],"consolidateAfter":"30s","consolidationPolicy":"WhenUnderutilized","expireAfter":"720h"},"enable":false,"limits":{"cpu":"50","memory":"100Gi"},"requirements":[]}` | Values to control Bottlerocket provisioners |
+| bottlerocket.disruption | object | `{"budgets":[{"nodes":"20%"}],"consolidateAfter":"30s","consolidationPolicy":"WhenUnderutilized","expireAfter":"720h"}` | Control how the provisioner handles disruptions |
+| bottlerocket.disruption.budgets | list | `[{"nodes":"20%"}]` | Budgets to use for consolidating resources |
 | bottlerocket.disruption.consolidateAfter | string | `"30s"` | Time to wait before consolidating resources |
 | bottlerocket.disruption.consolidationPolicy | string | `"WhenUnderutilized"` | Consolidation policy to use |
 | bottlerocket.disruption.expireAfter | string | `"720h"` | Time to wait before expiring resources (will automatically restart nodes periodically) |
 | bottlerocket.enable | bool | `false` | Enable the Bottlerocket Provisioner |
-| bottlerocket.limits | object | `{"cpu":50,"memory":"100Gi"}` | Total limits that the provisioner can provision |
-| bottlerocket.limits.cpu | int | `50` | Maximum CPU that the provisioner can provision |
+| bottlerocket.limits | object | `{"cpu":"50","memory":"100Gi"}` | Total limits that the provisioner can provision |
+| bottlerocket.limits.cpu | string | `"50"` | Maximum CPU that the provisioner can provision |
 | bottlerocket.limits.memory | string | `"100Gi"` | Maximum memory that the provisioner can provision |
 | bottlerocket.requirements | list | `[]` | Requirement for the Bottlerocket provisioner |
 | clusterName | string | `"name"` | Name of the cluster karpenter is deployed to |

diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -34,7 +34,6 @@ Create chart name and version as used by the chart label.
 Common labels
 */}}
 {{- define "sulfoxide-krypton.labels" -}}
-helm.sh/chart: {{ include "sulfoxide-krypton.chart" . }}
 {{- range $k, $v := .Values.serviceTree }}
 "atomi.cloud/{{ $k }}": "{{ $v }}"
 {{- end }}

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -66,7 +66,7 @@ al2:
   # -- Total limits that the provisioner can provision
   limits:
     # -- Maximum CPU that the provisioner can provision
-    cpu: 50
+    cpu: "50"
     # -- Maximum memory that the provisioner can provision
     memory: 100Gi
   # -- Control how the provisioner handles disruptions
@@ -79,7 +79,7 @@ al2:
     expireAfter: 720h
     # -- Budgets to use for consolidating resources
     budgets:
-      - 20%
+      - nodes: 20%
 
 # -- Values to control Bottlerocket provisioners
 bottlerocket:
@@ -90,7 +90,7 @@ bottlerocket:
   # -- Total limits that the provisioner can provision
   limits:
     # -- Maximum CPU that the provisioner can provision
-    cpu: 50
+    cpu: "50"
     # -- Maximum memory that the provisioner can provision
     memory: 100Gi
   # -- Control how the provisioner handles disruptions
@@ -103,4 +103,4 @@ bottlerocket:
     expireAfter: 720h
     # -- Budgets to use for consolidating resources
     budgets:
-      - 20%
+      - nodes: 20%