Skip to content

Commit

Permalink
Merge pull request #9 from projectsyn/fix/update-memory-limit
Browse files Browse the repository at this point in the history
Update default memory limit to 3Gi
  • Loading branch information
DebakelOrakel authored Oct 11, 2024
2 parents e255b11 + 69ffc75 commit 85a1630
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions gitlab/commodore-compile.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
},
Expand Down Expand Up @@ -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'),
},
Expand Down
4 changes: 2 additions & 2 deletions gitlab/tests/golden/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -55,7 +55,7 @@
"variables": {
"KUBERNETES_CPU_LIMIT": "2",
"KUBERNETES_CPU_REQUEST": "800m",
"KUBERNETES_MEMORY_LIMIT": "2Gi"
"KUBERNETES_MEMORY_LIMIT": "3Gi"
}
}
}
12 changes: 6 additions & 6 deletions gitlab/tests/golden/external-catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -169,7 +169,7 @@
"variables": {
"KUBERNETES_CPU_LIMIT": "2",
"KUBERNETES_CPU_REQUEST": "800m",
"KUBERNETES_MEMORY_LIMIT": "2Gi"
"KUBERNETES_MEMORY_LIMIT": "3Gi"
}
}
}
8 changes: 4 additions & 4 deletions gitlab/tests/golden/k8s-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -173,7 +173,7 @@
"variables": {
"KUBERNETES_CPU_LIMIT": "2",
"KUBERNETES_CPU_REQUEST": "2",
"KUBERNETES_MEMORY_LIMIT": "2Gi"
"KUBERNETES_MEMORY_LIMIT": "3Gi"
}
}
}

0 comments on commit 85a1630

Please sign in to comment.