wip

.github/workflows/deploy-redis.yaml

@@ -0,0 +1,29 @@
+name: Deploy Redis
+
+on:
+  push:
+    paths: ['nais/redis-dev.yaml', 'nais/redis-prod.yaml']
+  workflow_dispatch:
+
+jobs:
+  deploy-redis-dev-gcp:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: nais/deploy/actions/deploy@v1
+        env:
+          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
+          CLUSTER: dev-gcp
+          RESOURCE: nais/redis-dev-gcp.yaml
+
+  deploy-redis-prod-gcp:
+    if: github.ref == 'refs/heads/main'
+    needs: deploy-redis-dev-gcp
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: nais/deploy/actions/deploy@v1
+        env:
+          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
+          CLUSTER: prod-gcp
+          RESOURCE: nais/redis-prod-gcp.yaml

nais/redis-dev.yaml

@@ -0,0 +1,11 @@
+apiVersion: aiven.io/v1alpha1
+kind: Redis
+metadata:
+  labels:
+    app: oppfolgingsplan-backend-redis
+    team: team-esyfo
+  name: redis-team-esyfo-oppfolgingsplan-backend
+  namespace: team-esyfo
+spec:
+  plan: startup-4
+  project: nav-dev

nais/redis-prod.yaml

@@ -0,0 +1,11 @@
+apiVersion: aiven.io/v1alpha1
+kind: Redis
+metadata:
+  labels:
+    app: oppfolgingsplan-backend-redis
+    team: team-esyfo
+  name: redis-team-esyfo-oppfolgingsplan-backend
+  namespace: team-esyfo
+spec:
+  plan: startup-4
+  project: nav-prod

src/main/kotlin/no/nav/syfo/kontaktinfo/KrrClient.kt

@@ -1,7 +1,6 @@
 package no.nav.syfo.kontaktinfo
 
 import no.nav.syfo.auth.azure.AzureAdTokenClient
-import no.nav.syfo.config.CacheConfig
 import no.nav.syfo.metric.Metrikk
 import no.nav.syfo.util.NAV_CALL_ID_HEADER
 import no.nav.syfo.util.NAV_PERSONIDENT_HEADER
@@ -26,7 +25,7 @@ class KrrClient @Autowired constructor(
     @Value("\${krr.scope}") private val krrScope: String,
     @Value("\${krr.url}") val krrUrl: String,
 ) {
-    @Cacheable(cacheNames = [CacheConfig.CACHENAME_DKIF_FNR], key = "#fnr", condition = "#fnr != null")
+    @Cacheable(cacheNames = ["krr_fnr"], key = "#fnr", condition = "#fnr != null")
     fun kontaktinformasjon(fnr: String): DigitalKontaktinfo {
         val accessToken = "Bearer ${azureAdTokenConsumer.getSystemToken(krrScope)}"
         val response = RestTemplate().exchange(

src/main/resources/application.yaml

@@ -18,6 +18,22 @@ spring:
     hikari:
       minimum-idle: 1
       maximum-pool-size: 5
+  data:
+    redis:
+      url: ${REDIS_URI_OPPFOLGINGSPLAN:}
+      username: ${REDIS_USERNAME_OPPFOLGINGSPLAN:}
+      password: ${REDIS_PASSWORD_OPPFOLGINGSPLAN:}
+      timeout: 2000
+      lettuce:
+        pool:
+          max-active: 16
+          min-idle: 8
+          enabled: true
+          time-between-eviction-runs: 10000
+  cache:
+    redis:
+      time-to-live: 3600
+      enable-statistics: true
 
 management:
   endpoint: