Merge pull request bcgov#223 from i5okie/i5okie/agent-cpu-limit-adjust

Adjust CPU limit to reduce throttling, workflow fix
WadeBarnes · Jul 26, 2024 · c90ac32 · c90ac32
2 parents 312cf11 + 2db517d
commit c90ac32
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 23 deletions.
diff --git a/.github/workflows/gitops_sync.yaml b/.github/workflows/gitops_sync.yaml
@@ -6,24 +6,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  changed_files:
-    runs-on: ubuntu-latest
-    name: Check for file changes
-    outputs:
-      any_changed: ${{ steps.gitops-changes.outputs.any_changed }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Scan services directory
-        id: gitops-changes
-        uses: tj-actions/changed-files@v44
-        with:
-          files: services/*.*
-
   sync_changes:
     runs-on: ubuntu-latest
-    needs:
-      - changed_files
-    if: needs.changed_files.outputs.any_changed == 'true' && (github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch')
     steps:
     - uses: actions/checkout@v4
 

diff --git a/helm-values/vc-authn-oidc/dev.yaml b/helm-values/vc-authn-oidc/dev.yaml
@@ -111,3 +111,8 @@ mongodb:
   livenessProbe:
     enabled: true
     timeoutSeconds: 10
+postgresql:
+  primary:
+    resources:
+      limits:
+        cpu: 800m
diff --git a/helm-values/vc-authn-oidc/prod.yaml b/helm-values/vc-authn-oidc/prod.yaml
@@ -94,14 +94,23 @@ acapy:
 mongodb:
   resources:
     limits:
-      cpu: 1
+      cpu: 1600
       memory: 1000Mi
     requests:
       cpu: 400m
       memory: 450Mi
+  metrics:
+    enabled: true
   readinessProbe:
     enabled: true
     timeoutSeconds: 10
   livenessProbe:
     enabled: true
     timeoutSeconds: 10
+
+postgresql:
+  primary:
+    resources:
+      limits:
+        cpu: 700m
+        memory: 2600Mi
diff --git a/openshift/templates/issuer-agent/issuer-agent-deploy.a2a.param b/openshift/templates/issuer-agent/issuer-agent-deploy.a2a.param
@@ -54,6 +54,6 @@ ACAPY_TAILS_SERVER_BASE_URL=https://tails-dev.vonx.io
 MIN_REPLICAS=1
 MAX_REPLICAS=2
 CPU_REQUEST=10m
-CPU_LIMIT=500m
+CPU_LIMIT=800m
 MEMORY_REQUEST=10Mi
 MEMORY_LIMIT=512Mi
diff --git a/services/traction/charts/dev/values.yaml b/services/traction/charts/dev/values.yaml
@@ -75,7 +75,7 @@ traction:
           network.openshift.io/policy-group: ingress
     resources:
       limits:
-        cpu: 500m
+        cpu: 800m
   tenant_proxy:
     image:
       tag: sha-982815a

diff --git a/services/traction/charts/prod/values.yaml b/services/traction/charts/prod/values.yaml
@@ -38,10 +38,10 @@ traction:
           network.openshift.io/policy-group: ingress
     resources:
       limits:
-        cpu: 400m
+        cpu: 1
         memory: 500Mi
       requests:
-        cpu: 120m
+        cpu: 250m
         memory: 250Mi
     autoscaling:
       enabled: true

diff --git a/services/traction/charts/test/values.yaml b/services/traction/charts/test/values.yaml
@@ -62,6 +62,9 @@ traction:
       maxReplicas: 5
       targetCPUUtilizationPercentage: 80
       targetMemoryUtilizationPercentage: 80
+    resources:
+      limits:
+        cpu: 800m
   tenant_proxy:
     image:
       pullPolicy: Always

diff --git a/services/vc-authn-oidc/charts/dev/values.yaml b/services/vc-authn-oidc/charts/dev/values.yaml
@@ -138,3 +138,6 @@ vc-authn-oidc:
     primary:
       persistence:
         size: 5Gi
+      resources:
+        limits:
+          cpu: 800m
diff --git a/services/vc-authn-oidc/charts/prod/values.yaml b/services/vc-authn-oidc/charts/prod/values.yaml
@@ -112,11 +112,13 @@ vc-authn-oidc:
       existingSecret: "vc-authn-oidc-mongodb"
     resources:
       limits:
-        cpu: 1
+        cpu: 1600
         memory: 1000Mi
       requests:
         cpu: 400m
         memory: 450Mi
+    metrics:
+      enabled: true
     readinessProbe:
       enabled: true
       timeoutSeconds: 10
@@ -130,3 +132,7 @@ vc-authn-oidc:
     primary:
       persistence:
         size: 5Gi
+      resources:
+        limits:
+          cpu: 700m
+          memory: 2600Mi
diff --git a/services/vc-authn-oidc/charts/test/values.yaml b/services/vc-authn-oidc/charts/test/values.yaml
@@ -4,7 +4,6 @@ vc-authn-oidc:
   image:
     repository: ghcr.io/bcgov/vc-authn-oidc
     pullPolicy: IfNotPresent
-    tag: sha-46e31f6
 
   acapyTenancyMode: single
   setNonRevoked: true
@@ -137,6 +136,9 @@ vc-authn-oidc:
     auth:
       existingSecret: "vc-authn-oidc-postgresql"
     primary:
+      resources:
+        limits:
+          cpu: 600m
       persistence:
         size: 5Gi
     metrics: