diff --git a/.nais/default-vars.yml b/.nais/default-vars.yml index 5e6f9205..ac8fe43c 100644 --- a/.nais/default-vars.yml +++ b/.nais/default-vars.yml @@ -36,9 +36,9 @@ replicas: max: 2 limits: cpu: 400m - memory: 3Gi + memory: 2Gi requests: cpu: 200m - memory: 2Gi + memory: 1Gi envFrom: secret: security-token-service diff --git a/.nais/nais.yml b/.nais/nais.yml index 0424c67f..6c5caf1c 100644 --- a/.nais/nais.yml +++ b/.nais/nais.yml @@ -38,7 +38,6 @@ spec: requests: cpu: "{{requests.cpu}}" memory: {{requests.memory}} - cpuThresholdPercentage: 80 webproxy: true envFrom: - secret: "{{ envFrom.secret }}" diff --git a/.nais/prod-vars.yml b/.nais/prod-vars.yml index c2657e6a..6345b39e 100644 --- a/.nais/prod-vars.yml +++ b/.nais/prod-vars.yml @@ -34,10 +34,10 @@ replicas: min: 4 max: 6 limits: - cpu: "2" - memory: 4Gi + cpu: 1024Mi + memory: 2Gi requests: - cpu: "1" - memory: 3Gi + cpu: 300m + memory: 768Mi envFrom: secret: security-token-service diff --git a/.nais/t4-vars.yml b/.nais/t4-vars.yml index 33daa66c..338cff47 100644 --- a/.nais/t4-vars.yml +++ b/.nais/t4-vars.yml @@ -34,11 +34,11 @@ replicas: min: 2 max: 2 limits: - cpu: 400m - memory: 2Gi -requests: cpu: 200m memory: 1Gi +requests: + cpu: 100m + memory: 512Mi envFrom: secret: security-token-service-t4