From 9b6800a3be02862178be3864d1aab11498efc3bc Mon Sep 17 00:00:00 2001
From: Ken Gullaksen <ken.gullaksen@nav.no>
Date: Wed, 6 Sep 2023 21:29:48 +0200
Subject: [PATCH] sett lavere grace period. Hadde ikke noen effekt

---
 nais/dev-gcp.yaml  | 1 -
 nais/prod-gcp.yaml | 1 -
 server/server.js   | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/nais/dev-gcp.yaml b/nais/dev-gcp.yaml
index 22ddcd4c3..2f96478bb 100644
--- a/nais/dev-gcp.yaml
+++ b/nais/dev-gcp.yaml
@@ -15,7 +15,6 @@ spec:
   readiness:
     path: /min-side-arbeidsgiver/internal/isReady
     initialDelay: 20
-  terminationGracePeriodSeconds: 60
   prometheus:
     enabled: true
     path: /min-side-arbeidsgiver/internal/metrics
diff --git a/nais/prod-gcp.yaml b/nais/prod-gcp.yaml
index 9ab9fe732..1d0e74770 100644
--- a/nais/prod-gcp.yaml
+++ b/nais/prod-gcp.yaml
@@ -15,7 +15,6 @@ spec:
   readiness:
     path: /min-side-arbeidsgiver/internal/isReady
     initialDelay: 20
-  terminationGracePeriodSeconds: 60
   prometheus:
     enabled: true
     path: /min-side-arbeidsgiver/internal/metrics
diff --git a/server/server.js b/server/server.js
index 627810777..bded31f6b 100644
--- a/server/server.js
+++ b/server/server.js
@@ -275,7 +275,7 @@ const main = async () => {
 
     const terminator = createHttpTerminator({
         server,
-        gracefulTerminationTimeout: 30_000, // defaults: terminator=5s, k8s=30s
+        gracefulTerminationTimeout: 15_000, // defaults: terminator=5s, k8s=30s
     });
 
     process.on('SIGTERM', () => {