From 69ffc7534f472b8fbd403544f6ed25bc96615fc1 Mon Sep 17 00:00:00 2001 From: Stephan Feurer Date: Fri, 11 Oct 2024 15:47:28 +0200 Subject: [PATCH] Update default memory limit to 3Gi --- gitlab/commodore-compile.jsonnet | 4 ++-- gitlab/tests/golden/default.yml | 4 ++-- gitlab/tests/golden/external-catalog.yml | 12 ++++++------ gitlab/tests/golden/k8s-resources.yml | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gitlab/commodore-compile.jsonnet b/gitlab/commodore-compile.jsonnet index 93a46cc..5ce2bb2 100644 --- a/gitlab/commodore-compile.jsonnet +++ b/gitlab/commodore-compile.jsonnet @@ -54,7 +54,7 @@ local compile_job(cluster) = }, variables: { - KUBERNETES_MEMORY_LIMIT: std.get(memory_limits, cluster, '2Gi'), + KUBERNETES_MEMORY_LIMIT: std.get(memory_limits, cluster, '3Gi'), KUBERNETES_CPU_LIMIT: std.get(cpu_limits, cluster, '2'), KUBERNETES_CPU_REQUEST: std.get(cpu_requests, cluster, '800m'), }, @@ -88,7 +88,7 @@ local deploy_job(cluster) = stage: 'deploy', variables: { - KUBERNETES_MEMORY_LIMIT: std.get(memory_limits, cluster, default='2Gi'), + KUBERNETES_MEMORY_LIMIT: std.get(memory_limits, cluster, default='3Gi'), KUBERNETES_CPU_LIMIT: std.get(cpu_limits, cluster, default='2'), KUBERNETES_CPU_REQUEST: std.get(cpu_requests, cluster, default='800m'), }, diff --git a/gitlab/tests/golden/default.yml b/gitlab/tests/golden/default.yml index e1c776a..e146e93 100644 --- a/gitlab/tests/golden/default.yml +++ b/gitlab/tests/golden/default.yml @@ -29,7 +29,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } }, "c-cluster-id-1234_deploy": { @@ -55,7 +55,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } } } diff --git a/gitlab/tests/golden/external-catalog.yml b/gitlab/tests/golden/external-catalog.yml index e507c99..ed71d77 100644 --- a/gitlab/tests/golden/external-catalog.yml +++ b/gitlab/tests/golden/external-catalog.yml @@ -28,7 +28,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } }, "c-cluster-id-1111_deploy": { @@ -53,7 +53,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } }, "c-cluster-id-1234_compile": { @@ -86,7 +86,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } }, "c-cluster-id-1234_deploy": { @@ -112,7 +112,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } }, "c-cluster-id-5678_compile": { @@ -144,7 +144,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } }, "c-cluster-id-5678_deploy": { @@ -169,7 +169,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } } } diff --git a/gitlab/tests/golden/k8s-resources.yml b/gitlab/tests/golden/k8s-resources.yml index d8bcc5a..ba202bd 100644 --- a/gitlab/tests/golden/k8s-resources.yml +++ b/gitlab/tests/golden/k8s-resources.yml @@ -29,7 +29,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2500m", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } }, "c-cluster-id-0099_deploy": { @@ -55,7 +55,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2500m", "KUBERNETES_CPU_REQUEST": "800m", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } }, "c-cluster-id-1234_compile": { @@ -147,7 +147,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "2", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } }, "c-cluster-id-5678_deploy": { @@ -173,7 +173,7 @@ "variables": { "KUBERNETES_CPU_LIMIT": "2", "KUBERNETES_CPU_REQUEST": "2", - "KUBERNETES_MEMORY_LIMIT": "2Gi" + "KUBERNETES_MEMORY_LIMIT": "3Gi" } } }