Øk minne for hver app (#725)

navikt · Oct 24, 2024 · bc2c8a8 · bc2c8a8
1 parent d30da7b
commit bc2c8a8
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 34 deletions.
diff --git a/config/api/dev-gcp.yml b/config/api/dev-gcp.yml
@@ -1,6 +1,5 @@
 kafkaPool: nav-dev
 idportenEnabled: true
-sidecarEnabled: true
 azure:
   enabled: true
 ingress: https://helsearbeidsgiver-im-api.intern.dev.nav.no

diff --git a/config/api/prod-gcp.yml b/config/api/prod-gcp.yml
@@ -1,6 +1,5 @@
 kafkaPool: nav-prod
 idportenEnabled: true
-sidecarEnabled: true
 azure:
   enabled: true
 ingress: https://helsearbeidsgiver-im-api.intern.nav.no

diff --git a/config/nais.yml b/config/nais.yml
@@ -15,31 +15,36 @@ metadata:
     team: helsearbeidsgiver
 spec:
   image: {{ image }}
-  port: 8080
-  idporten:
-    enabled: {{#if idportenEnabled}}true{{else}}false{{/if}}
-    sidecar:
-      enabled: {{#if sidecarEnabled}}true{{else}}false{{/if}}
-  {{#if ingress}}
-  ingresses:
-    - {{ ingress }}
-  {{/if}}
-  liveness:
-    path: isalive
-    initialDelay: 5
-  readiness:
-    path: isready
-    initialDelay: 5
   resources:
-    limits:
-      memory: 512Mi
     requests:
       cpu: 50m
-      memory: 128Mi
+      memory: 512Mi
+    limits:
+      memory: 1024Mi
   replicas:
     min: {{#if replicasMin }}{{ replicasMin }}{{else}}1{{/if}}
     max: {{#if replicasMax }}{{ replicasMax }}{{else}}1{{/if}}
-    cpuThresholdPercentage: 75
+    scalingStrategy:
+      cpu:
+        thresholdPercentage: 75
+  liveness:
+    path: isalive
+    initialDelay: 10
+  readiness:
+    path: isready
+    initialDelay: 10
+  secureLogs:
+    enabled: true
+  observability:
+    autoInstrumentation:
+      enabled: true
+      runtime: java
+  prometheus:
+    enabled: true
+  {{#if ingress}}
+  ingresses:
+    - {{ ingress }}
+  {{/if}}
   {{#if kafkaPool}}
   kafka:
     pool: {{ kafkaPool }}
@@ -70,15 +75,6 @@ spec:
             value: "on"
         {{/if}}
   {{/if}}
-  observability:
-    autoInstrumentation:
-      enabled: true
-      runtime: java
-  prometheus:
-    enabled: true
-    path: /metrics
-  secureLogs:
-    enabled: true
   {{#if envFrom}}
   envFrom:
   {{# each envFrom as |item| }}
@@ -93,14 +89,21 @@ spec:
     - name: {{ item.name }}
       value: "{{ item.value }}"
     {{/each}}{{/if}}
-{{#if maskinporten}}
+  {{#if idportenEnabled}}
+  idporten:
+    enabled: true
+    sidecar:
+      enabled: true
+  {{/if}}
+  {{#if maskinporten}}
   maskinporten:
     enabled: true
     scopes:
-      consumes: {{#each maskinporten.consumes as |consume| }}
+      consumes:
+        {{#each maskinporten.consumes as |consume| }}
         - name: "{{ consume }}"
-  {{/each}}
-{{/if}}
+        {{/each}}
+  {{/if}}
   accessPolicy:
     outbound:
       external: