compact

elastic · Oct 6, 2021 · 3e9ba00 · 3e9ba00
1 parent b91fb95
commit 3e9ba00
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 22 deletions.
diff --git a/dev-tools/buildlimits/buildlimits.go b/dev-tools/buildlimits/buildlimits.go
diff --git a/internal/pkg/config/defaults/1024_limits.yml b/internal/pkg/config/defaults/1024_limits.yml
@@ -1,5 +1,6 @@
-min_ram: 1024
-max_ram: 2048
+ram:
+  min: 1024
+  max: 2048
 cache_limits:
   num_counters: 20000
   max_cost: 20971520

diff --git a/internal/pkg/config/defaults/2048_limits.yml b/internal/pkg/config/defaults/2048_limits.yml
@@ -1,5 +1,6 @@
-min_ram: 2048
-max_ram: 4096
+ram:
+  min: 2048
+  max: 4096
 cache_limits:
   num_counters: 40000
   max_cost: 50971520

diff --git a/internal/pkg/config/defaults/4096_limits.yml b/internal/pkg/config/defaults/4096_limits.yml
@@ -1,5 +1,6 @@
-min_ram: 4096
-max_ram: 8192
+ram:
+  min: 4096
+  max: 8192
 cache_limits:
   num_counters: 80000
   max_cost: 104857600

diff --git a/internal/pkg/config/defaults/8192_limits.yml b/internal/pkg/config/defaults/8192_limits.yml
@@ -1,5 +1,6 @@
-min_ram: 8192
-max_ram: 16384
+ram:
+  min: 8192
+  max: 16384
 cache_limits:
   num_counters: 160000
   max_cost: 209715200

diff --git a/internal/pkg/config/defaults/base_limits.yml b/internal/pkg/config/defaults/base_limits.yml
@@ -1,4 +1,5 @@
-max_ram: 1024
+ram:
+  max: 1024
 cache_limits:
   num_counters: 2000
   max_cost: 2097152

diff --git a/internal/pkg/config/defaults/max_limits.yml b/internal/pkg/config/defaults/max_limits.yml
@@ -1,4 +1,5 @@
-min_ram: 16384
+ram:
+  min: 16384
 cache_limits:
   num_counters: 160000
   max_cost: 209715200

diff --git a/internal/pkg/config/env_defaults.go b/internal/pkg/config/env_defaults.go
diff --git a/internal/pkg/config/env_defaults_test.go b/internal/pkg/config/env_defaults_test.go