Nais preStop hook gir større margin for slengere fra lastbalanserer +…

… graceful shutdown (#2655)

.deploy/naiserator.yaml

@@ -43,6 +43,9 @@ spec:
   readiness:
     path: /internal/actuator/health/readiness
     initialDelay: 15
+  preStopHook:
+    http:
+      path: /internal/preStop
   prometheus:
     enabled: true
     path: /internal/actuator/prometheus

domene/src/main/java/no/nav/foreldrepenger/selvbetjening/http/PreStopHookController.java

@@ -0,0 +1,24 @@
+package no.nav.foreldrepenger.selvbetjening.http;
+
+import no.nav.security.token.support.core.api.Unprotected;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.Duration;
+
+@RestController
+public class PreStopHookController {
+    private static final Logger LOG = LoggerFactory.getLogger(PreStopHookController.class);
+
+    @Unprotected
+    @GetMapping("/internal/preStop")
+    public ResponseEntity<String> preStop() throws InterruptedException {
+        LOG.info("Mottok kall på /internal/preStop, sover 6 sekunder");
+        Thread.sleep(Duration.ofSeconds(6));
+        return ResponseEntity.ok().build();
+    }
+}

domene/src/main/resources/application.yml

@@ -52,6 +52,7 @@ server:
   servlet:
     context-path: /
   forward-headers-strategy: native
+  shutdown: graceful
 spring:
   cloud.discovery.enabled: false
   cache:

domene/src/test/java/no/nav/foreldrepenger/selvbetjening/http/RestApiSikredeEndepunktTest.java

@@ -15,8 +15,8 @@
 
 class RestApiSikredeEndepunktTest extends RestApiTestUtil {
 
-    private static final List<Class<?>> UNNTATT_RESTCONTROLLER = List.of(UttakController.class);
-    private static final String ENDEPUNKT_SOM_KAN_VÆRE_UNPROTECTED = "ping";
+    private static final List<Class<?>> UNNTATT_RESTCONTROLLER = List.of(UttakController.class, PreStopHookController.class);
+    private static final List<String> ENDEPUNKT_SOM_KAN_VÆRE_UNPROTECTED = List.of("ping", "preStop");
 
     @Test
     void sjekkAtProtectedRestControllerIkkeHarUbeskyttetAnnotering() {
@@ -59,7 +59,7 @@ private boolean erRestControllerUbeskyttet(Class<?> klasse) {
     }
 
     private boolean erEndepunktUnprotected(Method metode) {
-        if (metode.isAnnotationPresent(ConditionalOnNotProd.class) || metode.getName().equalsIgnoreCase(ENDEPUNKT_SOM_KAN_VÆRE_UNPROTECTED)) {
+        if (metode.isAnnotationPresent(ConditionalOnNotProd.class) || ENDEPUNKT_SOM_KAN_VÆRE_UNPROTECTED.stream().anyMatch(ep -> ep.equalsIgnoreCase(metode.getName()))) {
             return false;
         }
         return metode.isAnnotationPresent(Unprotected.class);