feat: Changed resource limits in test (#267)

bcgov · Jan 24, 2024 · 0a711fb · 0a711fb
1 parent f5b32b8
commit 0a711fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml
@@ -73,11 +73,11 @@ jobs:
         run: |
           helm install ${{ github.event.repository.name }}-test-nats nats/nats \
             --set natsBox.enabled=false \
-            --set nats.resources.requests.cpu=50m \
-            --set nats.resources.limits.cpu=200m \
-            --set nats.resources.requests.memory=100Mi \
-            --set nats.resources.limits.memory=400Mi \
-            --set replicaCount=1
+            --set container.merge.resources.requests.cpu=100m \
+            --set container.merge.resources.limits.cpu=200m \
+            --set container.merge.resources.requests.memory=100Mi \
+            --set container.merge.resources.limits.memory=400Mi \
+            --set reloader.enabled=false \
   
       # Deploy other components using matrix strategy
       - name: Deploy Components

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -97,8 +97,6 @@ services:
       - NATS_USER=natsuser  # this is just for the developer instance of nats
       - NATS_PASSWORD=natspass  # this is just for the developer instance of nats
   webeoc:
-    env_file:
-        - ./webeoc/.env
     container_name: webeoc
     entrypoint:
       - "sh"

diff --git a/webeoc/openshift.deploy.yml b/webeoc/openshift.deploy.yml
@@ -28,10 +28,10 @@ parameters:
     value: "150Mi"
   - name: MIN_REPLICAS
     description: The minimum amount of replicas for the horizontal pod autoscaler.
-    value: "3"
+    value: "2"
   - name: MAX_REPLICAS
     description: The maximum amount of replicas for the horizontal pod autoscaler.
-    value: "5"
+    value: "3"
   - name: REGISTRY
     description: Container registry to import from (internal is image-registry.openshift-image-registry.svc:5000)
     value: ghcr.io