diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml index bfcb69af5..bf6154967 100644 --- a/backend/openshift.deploy.yml +++ b/backend/openshift.deploy.yml @@ -35,13 +35,13 @@ parameters: - name: FORESTCLIENTAPI_ADDRESS value: "https://nr-forest-client-api-prod.api.gov.bc.ca/api" - name: CPU_REQUEST - value: 100m + value: 15m - name: CPU_LIMIT - value: 300m + value: 60m - name: MEMORY_REQUEST - value: 100Mi + value: 150Mi - name: MEMORY_LIMIT - value: 500Mi + value: 450Mi - name: MIN_REPLICAS description: The minimum amount of replicas for the horizontal pod autoscaler. value: "3" @@ -204,3 +204,9 @@ objects: target: type: Utilization averageUtilization: 80 + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: 80 diff --git a/database/openshift.deploy.yml b/database/openshift.deploy.yml index 9daa3e99a..50221107c 100644 --- a/database/openshift.deploy.yml +++ b/database/openshift.deploy.yml @@ -25,13 +25,13 @@ parameters: description: Where to mount the PVC, subpath (e.g. data/) value: /var/lib/postgresql - name: CPU_REQUEST - value: 50m + value: 25m - name: CPU_LIMIT - value: 115m + value: 75m - name: MEMORY_REQUEST - value: 150Mi + value: 100Mi - name: MEMORY_LIMIT - value: 250Mi + value: 200Mi - name: DB_PVC_SIZE description: Volume space available for data, e.g. 512Mi, 2Gi. displayName: Database Volume Capacity diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml index c65a94039..ea4094dec 100644 --- a/frontend/openshift.deploy.yml +++ b/frontend/openshift.deploy.yml @@ -31,9 +31,9 @@ parameters: - name: CPU_LIMIT value: 30m - name: MEMORY_REQUEST - value: 30Mi + value: 20Mi - name: MEMORY_LIMIT - value: 50Mi + value: 40Mi - name: MIN_REPLICAS description: The minimum amount of replicas for the horizontal pod autoscaler. value: "3" @@ -166,6 +166,12 @@ objects: target: type: Utilization averageUtilization: 80 + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: 80 - apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: diff --git a/oracle-api/openshift.deploy.yml b/oracle-api/openshift.deploy.yml index a6033b7e6..fabf4de54 100644 --- a/oracle-api/openshift.deploy.yml +++ b/oracle-api/openshift.deploy.yml @@ -24,13 +24,13 @@ parameters: - name: DOMAIN value: apps.silver.devops.gov.bc.ca - name: CPU_REQUEST - value: 100m + value: 15m - name: CPU_LIMIT - value: 500m + value: 50m - name: MEMORY_REQUEST - value: 300Mi + value: 150Mi - name: MEMORY_LIMIT - value: 500Mi + value: 225Mi - name: ALLOWED_ORIGINS description: Sets all the allowed request origins value: "http://localhost:300*,https://*.apps.silver.devops.gov.bc.ca,https://*.nrs.gov.bc.ca" @@ -236,3 +236,9 @@ objects: target: type: Utilization averageUtilization: 80 + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: 80