From 2f9e643e0eadfba3a54c3a3159eb982b7fc81024 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Fri, 26 Jul 2024 17:26:23 +0000
Subject: [PATCH] fix: set proper attachement limits for EBS CSI driver

---
 .../jsonnet/jsonnetfile.lock.json             | 34 +++++++++----------
 charts/kubezero-storage/values.yaml           |  4 +++
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json b/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json
index 536b530b..468ee948 100644
--- a/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json
+++ b/charts/kubezero-storage/jsonnet/jsonnetfile.lock.json
@@ -18,7 +18,7 @@
           "subdir": "contrib/mixin"
         }
       },
-      "version": "e7f572914d79f0705b3dc8ca28d9a14b0f854d49",
+      "version": "9f59ef8ead097f836271f125d0e3774ddae4e71d",
       "sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
     },
     {
@@ -58,7 +58,7 @@
           "subdir": "gen/grafonnet-latest"
         }
       },
-      "version": "119d65363dff84a1976bba609f2ac3a8f450e760",
+      "version": "5a66b0f6a0f4f7caec754dd39a0e263b56a0f90a",
       "sum": "eyuJ0jOXeA4MrobbNgU4/v5a7ASDHslHZ0eS6hDdWoI="
     },
     {
@@ -68,7 +68,7 @@
           "subdir": "gen/grafonnet-v10.0.0"
         }
       },
-      "version": "119d65363dff84a1976bba609f2ac3a8f450e760",
+      "version": "5a66b0f6a0f4f7caec754dd39a0e263b56a0f90a",
       "sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
     },
     {
@@ -78,7 +78,7 @@
           "subdir": "gen/grafonnet-v11.0.0"
         }
       },
-      "version": "119d65363dff84a1976bba609f2ac3a8f450e760",
+      "version": "5a66b0f6a0f4f7caec754dd39a0e263b56a0f90a",
       "sum": "Fuo+qTZZzF+sHDBWX/8fkPsUmwW6qhH8hRVz45HznfI="
     },
     {
@@ -88,8 +88,8 @@
           "subdir": "grafana-builder"
         }
       },
-      "version": "ea6f2601969aa12c02dbca761ce4316aff036af2",
-      "sum": "udZaafkbKYMGodLqsFhEe+Oy/St2p0edrK7hiMPEey0="
+      "version": "3f0a5b0eeb2f5dc381a420b35d27198bd9b72e8c",
+      "sum": "yxqWcq/N3E/a/XreeU6EuE6X7kYPnG0AspAQFKOjASo="
     },
     {
       "source": {
@@ -118,8 +118,8 @@
           "subdir": ""
         }
       },
-      "version": "3dfa72d1d1ab31a686b1f52ec28bbf77c972bd23",
-      "sum": "7ufhpvzoDqAYLrfAsGkTAIRmu2yWQkmHukTE//jOsJU="
+      "version": "dd5c59ab4491159593ed370a344a553b57146a7d",
+      "sum": "2tFZyRtLw9nasUQdFn5LGGqJplJyAeJxd59u6mHU+mw="
     },
     {
       "source": {
@@ -128,8 +128,8 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "7104d579e93d672754c018a924d6c3f7ec23874e",
-      "sum": "pvInhJNQVDOcC3NGWRMKRIP954mAvLXCQpTlafIg7fA="
+      "version": "e96dfc0a39d8e2ae759a954a98d8bc9b29bf1a3e",
+      "sum": "h6H5AsU7JsCAWttnPgevTNituobj2eIr2ebxdkaABQo="
     },
     {
       "source": {
@@ -138,7 +138,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "7104d579e93d672754c018a924d6c3f7ec23874e",
+      "version": "e96dfc0a39d8e2ae759a954a98d8bc9b29bf1a3e",
       "sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
     },
     {
@@ -168,7 +168,7 @@
           "subdir": "jsonnet/mixin"
         }
       },
-      "version": "609424db53853b992277b7a9a0e5cf59f4cc24f3",
+      "version": "105b88afada91ecd4dab14b6d091b0933c749972",
       "sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
       "name": "prometheus-operator-mixin"
     },
@@ -179,8 +179,8 @@
           "subdir": "jsonnet/prometheus-operator"
         }
       },
-      "version": "609424db53853b992277b7a9a0e5cf59f4cc24f3",
-      "sum": "z2/5LjQpWC7snhT+n/mtQqoy5986uI95sTqcKQziwGU="
+      "version": "105b88afada91ecd4dab14b6d091b0933c749972",
+      "sum": "lTyttpFADJ40Zd7FuwgXcXswU+7grlQBeXms7gyabYc="
     },
     {
       "source": {
@@ -189,7 +189,7 @@
           "subdir": "doc/alertmanager-mixin"
         }
       },
-      "version": "eb8369ec510d76f63901379a8437c4b55885d6c5",
+      "version": "cad5fa580108431e6ed209f2a23a373aa50c098f",
       "sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
       "name": "alertmanager"
     },
@@ -210,7 +210,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "e9dec5fc537b1709f3a0e4c959043fb159b5d413",
+      "version": "d4f098ae80fb276153efc757e373c813163da0e8",
       "sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
       "name": "prometheus"
     },
@@ -232,7 +232,7 @@
           "subdir": "mixin"
         }
       },
-      "version": "35c0dbec856f97683a846e9c53f83156a3a44ff3",
+      "version": "639bf8f216494ad9c375ebaac45f5d15715065ba",
       "sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
       "name": "thanos-mixin"
     }
diff --git a/charts/kubezero-storage/values.yaml b/charts/kubezero-storage/values.yaml
index 0b3969f7..83f1fe78 100644
--- a/charts/kubezero-storage/values.yaml
+++ b/charts/kubezero-storage/values.yaml
@@ -155,6 +155,10 @@ aws-ebs-csi-driver:
     loggingFormat: json
     tolerateAllTaints: false
     priorityClassName: system-node-critical
+
+    # We have /var on additional volume: root + ENI + /var = 3
+    reservedVolumeAttachments: 3
+
     tolerations:
     - key: kubezero-workergroup
       effect: NoSchedule