Merge pull request #26 from Humanitec-DemoOrg/update-cpu-memory-limits

Fix `memory` and `cpu` ` limits` to avoid `CrashLoopBackOff`
Humanitec-DemoOrg · Jun 3, 2024 · 0e8f078 · 0e8f078
2 parents c5a9ff9 + fec35f4
commit 0e8f078
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,9 +9,9 @@ jobs:
     strategy:
       matrix:
         apps: ["cart", "checkout", "currency", "email", "frontend", "loadgenerator", "payment", "productcatalog", "recommendation", "shipping"]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
-      HUMCTL_VERSION: '0.24.0'
+      HUMCTL_VERSION: '0.25.0'
     steps:
       - name: checkout code
         uses: actions/checkout@v4
@@ -26,7 +26,7 @@ jobs:
               --org ${{ secrets.HUMANITEC_ORG }} \
               --strict
   score-compose:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       SCORE_COMPOSE_VERSION: 'latest'
     steps:

diff --git a/.github/workflows/close-pr.yaml b/.github/workflows/close-pr.yaml
@@ -5,10 +5,10 @@ on:
       - closed
 env:
   ENVIRONMENT_ID: pr-${{ github.event.number }}
-  HUMCTL_VERSION: '0.24.0'
+  HUMCTL_VERSION: '0.25.0'
 jobs:
   job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout humctl bin
         uses: actions/checkout@v4

diff --git a/.github/workflows/open-pr.yaml b/.github/workflows/open-pr.yaml
@@ -9,10 +9,10 @@ env:
   ENVIRONMENT_TYPE: 'development'
   ENVIRONMENT_ID: pr-${{ github.event.number }}
   ENVIRONMENT_NAME: PR-${{ github.event.number }}
-  HUMCTL_VERSION: '0.24.0'
+  HUMCTL_VERSION: '0.25.0'
 jobs:
   job:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/push-tag.yaml b/.github/workflows/push-tag.yaml
@@ -7,10 +7,10 @@ on:
       - 'v*'
 env:
   ENVIRONMENT_ID: development
-  HUMCTL_VERSION: '0.24.0'
+  HUMCTL_VERSION: '0.25.0'
 jobs:
   deploy-humanitec:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: install humctl

diff --git a/apps/ad/score.yaml b/apps/ad/score.yaml
@@ -8,11 +8,11 @@ containers:
       PORT: "9555"
     resources:
       limits:
-        memory: "100Mi"
-        cpu: "80m"
+        memory: "150Mi"
+        cpu: "280m"
       requests:
-        memory: "80Mi"
-        cpu: "60m"
+        memory: "120Mi"
+        cpu: "250m"
 service:
   ports:
     grpc:

diff --git a/apps/checkout/score.yaml b/apps/checkout/score.yaml
@@ -14,11 +14,11 @@ containers:
       SHIPPING_SERVICE_ADDR: "${resources.shippingservice.name}:50051"
     resources:
       limits:
-        memory: "40Mi"
-        cpu: "30m"
+        memory: "80Mi"
+        cpu: "60m"
       requests:
-        memory: "20Mi"
-        cpu: "10m"
+        memory: "60Mi"
+        cpu: "40m"
 resources:
   cartservice:
     type: service

diff --git a/apps/currency/score.yaml b/apps/currency/score.yaml
@@ -9,11 +9,11 @@ containers:
       PORT: "7000"
     resources:
       limits:
-        memory: "60Mi"
-        cpu: "40m"
+        memory: "90Mi"
+        cpu: "140m"
       requests:
-        memory: "40Mi"
-        cpu: "20m"
+        memory: "70Mi"
+        cpu: "120m"
 service:
   ports:
     grpc:

diff --git a/apps/email/score.yaml b/apps/email/score.yaml
@@ -10,10 +10,10 @@ containers:
     resources:
       limits:
         memory: "70Mi"
-        cpu: "30m"
+        cpu: "130m"
       requests:
         memory: "50Mi"
-        cpu: "10m"
+        cpu: "110m"
 service:
   ports:
     grpc:

diff --git a/apps/frontend/score.yaml b/apps/frontend/score.yaml
@@ -35,11 +35,11 @@ containers:
       ENABLE_ASSISTANT: "false"
     resources:
       limits:
-        memory: "128Mi"
-        cpu: "200m"
+        memory: "50Mi"
+        cpu: "50m"
       requests:
-        memory: "40Mi"
-        cpu: "40m"
+        memory: "30Mi"
+        cpu: "30m"
 resources:
   adservice:
     type: service

diff --git a/apps/loadgenerator/score.yaml b/apps/loadgenerator/score.yaml
@@ -10,10 +10,10 @@ containers:
     resources:
       limits:
         memory: "220Mi"
-        cpu: "30m"
+        cpu: "100m"
       requests:
         memory: "200Mi"
-        cpu: "10m"
+        cpu: "80m"
 resources:
   frontend:
     type: service