From 74d90fcae6332638233fb3a959dd724b30d82989 Mon Sep 17 00:00:00 2001
From: Francesco Furlan <francesco.furlan@sysdig.com>
Date: Wed, 6 Dec 2023 11:28:36 +0100
Subject: [PATCH] fix(agent): ephemeral-storage on gke autopilot and slim
 enabled (#1519)

---
 charts/agent/Chart.yaml             | 2 +-
 charts/agent/templates/_helpers.tpl | 2 +-
 charts/agent/tests/gke_test.yaml    | 4 ----
 charts/sysdig-deploy/Chart.yaml     | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/charts/agent/Chart.yaml b/charts/agent/Chart.yaml
index 281156994..37e2e1e20 100644
--- a/charts/agent/Chart.yaml
+++ b/charts/agent/Chart.yaml
@@ -30,4 +30,4 @@ sources:
 - https://app.sysdigcloud.com/#/settings/user
 - https://github.com/draios/sysdig
 type: application
-version: 1.18.0
+version: 1.18.1
diff --git a/charts/agent/templates/_helpers.tpl b/charts/agent/templates/_helpers.tpl
index 6dc9820c4..25afc5a77 100644
--- a/charts/agent/templates/_helpers.tpl
+++ b/charts/agent/templates/_helpers.tpl
@@ -93,7 +93,7 @@ Sysdig Agent resources
     {{- toYaml .Values.resources -}}
 {{- else if not (hasKey $resourceProfiles .Values.resourceProfile) }}
     {{- fail (printf "Invalid value for resourceProfile provided: %s" .Values.resourceProfile) }}
-{{- else if and (include "agent.gke.autopilot" .) (not .Values.slim.enabled) }}
+{{- else if include "agent.gke.autopilot" . }}
     {{- toYaml (dict "requests" (dict "cpu" "250m"
                                       "ephemeral-storage" .Values.gke.ephemeralStorage
                                       "memory" "512Mi")
diff --git a/charts/agent/tests/gke_test.yaml b/charts/agent/tests/gke_test.yaml
index 22fd4e187..ce142f9f7 100644
--- a/charts/agent/tests/gke_test.yaml
+++ b/charts/agent/tests/gke_test.yaml
@@ -9,8 +9,6 @@ tests:
       gke:
         autopilot: true
         createPriorityClass: true
-      slim:
-        enabled: false
     asserts:
       - containsDocument:
           kind: DaemonSet
@@ -31,8 +29,6 @@ tests:
         autopilot: true
         createPriorityClass: true
         ephemeralStorage: 256Mi
-      slim:
-        enabled: false
     asserts:
       - equal:
           path: spec.template.spec.containers[0].resources.requests.ephemeral-storage
diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml
index 214379550..fa38d0a84 100644
--- a/charts/sysdig-deploy/Chart.yaml
+++ b/charts/sysdig-deploy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sysdig-deploy
 description: A chart with various Sysdig components for Kubernetes
 type: application
-version: 1.33.0
+version: 1.33.1
 maintainers:
   - name: AlbertoBarba
     email: alberto.barba@sysdig.com
@@ -26,7 +26,7 @@ dependencies:
   - name: agent
     # repository: https://charts.sysdig.com
     repository: file://../agent
-    version: ~1.18.0
+    version: ~1.18.1
     alias: agent
     condition: agent.enabled
   - name: common