From 8683b9e1f3507223be8e629e29b2d551322e6a04 Mon Sep 17 00:00:00 2001 From: savil <676452+savil@users.noreply.github.com> Date: Thu, 31 Aug 2023 08:57:03 -0700 Subject: [PATCH] =?UTF-8?q?Revert=20"[Ephemeral=20Storage]=20Add=20request?= =?UTF-8?q?=20for=20minimum=20size=20of=20ephemeral=E2=80=A6=20(#57)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … storage… (#56)" This reverts commit 1c7247e6fa176e36d7b18866cf4ca907556b0618. ## Summary This PR reverts the change, since AFAIK Greg couldn't successfully deploy with this change. He found another workaround for his service (using a compact DB). ## How was it tested? compiles. Did `git revert ` ## Is this change backwards-compatible? yes --- devbox.lock | 18 +++++++++--------- padcli/helm/helm.go | 7 ------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/devbox.lock b/devbox.lock index 532aed7..4d4a75b 100644 --- a/devbox.lock +++ b/devbox.lock @@ -2,22 +2,22 @@ "lockfile_version": "1", "packages": { "buf@latest": { - "last_modified": "2023-08-10T15:58:45Z", - "resolved": "github:NixOS/nixpkgs/4d2389b927696ef8da4ef76b03f2d306faf87929#buf", + "last_modified": "2023-06-29T16:20:38Z", + "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#buf", "source": "devbox-search", - "version": "1.26.1" + "version": "1.21.0" }, "go@latest": { - "last_modified": "2023-08-22T06:04:29Z", - "resolved": "github:NixOS/nixpkgs/9d757ec498666cc1dcc6f2be26db4fd3e1e9ab37#go_1_21", + "last_modified": "2023-06-29T16:20:38Z", + "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#go", "source": "devbox-search", - "version": "1.21.0" + "version": "1.20.5" }, "golangci-lint@latest": { - "last_modified": "2023-08-22T06:04:29Z", - "resolved": "github:NixOS/nixpkgs/9d757ec498666cc1dcc6f2be26db4fd3e1e9ab37#golangci-lint", + "last_modified": "2023-06-29T16:20:38Z", + "resolved": "github:NixOS/nixpkgs/3c614fbc76fc152f3e1bc4b2263da6d90adf80fb#golangci-lint", "source": "devbox-search", - "version": "1.54.2" + "version": "1.53.3" } } } diff --git a/padcli/helm/helm.go b/padcli/helm/helm.go index b944a36..3facfba 100644 --- a/padcli/helm/helm.go +++ b/padcli/helm/helm.go @@ -146,13 +146,6 @@ func (hvc *ValueComputer) Compute(ctx context.Context) error { websvc.GetInstanceType().Memory(), ) - if *websvc.GetInstanceType() == jetconfig.InstanceType_MEDIUM_PLUS { - setNestedFieldPath( - hvc.appValues, - []string{"resources", "requests", "ephemeral-storage"}, - "10Gi", - ) - } hvc.appValues["podPort"] = websvc.GetPort() } else { // This logic will change once we allow multiple services