IS-2765: Bruke felles Aiven-cache

.nais/naiserator-dev.yaml

@@ -43,9 +43,11 @@ spec:
       claims:
         extra:
           - "NAVident"
+  redis:
+    - instance: cache
+      access: readwrite
   envFrom:
     - secret: syfooversikt-session-key
-    - secret: syfooversikt-redis-password
     - secret: syfooversikt-unleash-api-token
   accessPolicy:
     outbound:
@@ -57,7 +59,6 @@ spec:
         - application: syfooversiktsrv
         - application: syfoperson
         - application: syfoveileder
-        - application: syfooversikt-redis
         - application: flexjar-backend
           namespace: flex
         - application: modiacontextholder
@@ -72,8 +73,6 @@ spec:
       value: 'production'
     - name: AUTH_REDIRECT_URI
       value: "https://syfooversikt.intern.dev.nav.no/oauth2/callback"
-    - name: REDIS_HOST
-      value: "syfooversikt-redis"
     - name: EREG_HOST
       value: "https://ereg-services-q1.dev-fss-pub.nais.io"
     - name: SYFOOVERSIKTSRV_AAD_APP_CLIENT_ID

.nais/naiserator-prod.yaml

@@ -43,9 +43,11 @@ spec:
       claims:
         extra:
           - "NAVident"
+  redis:
+    - instance: cache
+      access: readwrite
   envFrom:
     - secret: syfooversikt-session-key
-    - secret: syfooversikt-redis-password
     - secret: syfooversikt-unleash-api-token
   accessPolicy:
     outbound:
@@ -57,7 +59,6 @@ spec:
         - application: syfooversiktsrv
         - application: syfoperson
         - application: syfoveileder
-        - application: syfooversikt-redis
         - application: flexjar-backend
           namespace: flex
         - application: modiacontextholder
@@ -71,8 +72,6 @@ spec:
       value: 'production'
     - name: AUTH_REDIRECT_URI
       value: "https://syfooversikt.intern.nav.no/oauth2/callback"
-    - name: REDIS_HOST
-      value: "syfooversikt-redis"
     - name: EREG_HOST
       value: "https://ereg-services.prod-fss-pub.nais.io"
     - name: SYFOOVERSIKTSRV_AAD_APP_CLIENT_ID

README.md

@@ -27,6 +27,4 @@ Se denne siden for [testdata](https://confluence.adeo.no/pages/viewpage.action?p
 
 ## Redis Cache
 
-Brukes for å cache bruker-sessions. Nais-oppsettet ligger i `.nais/redis.yaml`.
-Redis pod deployes automatisk ved endringer i workflow eller config i master,
-men kan også deployes manuelt til NAIS ved å kjøre følgdende kommando: `kubectl apply -f .nais/redis.yaml`.
+Bruker teamsykefravr sin felles Redis-cache på Aiven for å cache bruker-sessions.

server/config.ts

@@ -169,10 +169,8 @@ export const unleash: { serverApiUrl: string; serverApiToken: string } = {
 };
 
 export const redis = {
-  host: envVar({ name: 'REDIS_HOST', defaultValue: '' }),
-  port: Number.parseInt(envVar({ name: 'REDIS_PORT', defaultValue: '6379' })),
-  password: envVar({
-    name: 'REDIS_PASSWORD',
-    defaultValue: { dev: '', prod: '' },
-  }),
+  uri: envVar({ name: 'REDIS_URI_CACHE', defaultValue: '' }),
+  username: envVar({ name: 'REDIS_USERNAME_CACHE', defaultValue: '' }),
+  password: envVar({ name: 'REDIS_PASSWORD_CACHE', defaultValue: '' }),
+  database: 20,
 };

server/session.ts

@@ -9,20 +9,21 @@ const SESSION_MAX_AGE_MILLIS = 12 * 60 * 60 * 1000;
 
 const SESSION_MAX_AGE_SECONDS = SESSION_MAX_AGE_MILLIS / 1000;
 
-const getRedisStore = () => {
-  if (Config.isDev) return undefined;
-
-  const RedisStore = connectRedis(session);
-
+const getRedisClient = () => {
   const redisClient = redis.createClient({
-    host: Config.redis.host,
-    port: Config.redis.port,
-    password: Config.redis.password,
+    url: Config.redis.uri,
+    no_ready_check: true,
   });
-  redisClient.unref();
+  redisClient.auth(Config.redis.password, Config.redis.username);
+  redisClient.select(Config.redis.database);
+  return redisClient;
+};
 
+const getRedisStore = () => {
+  if (Config.isDev) return undefined;
+  const RedisStore = connectRedis(session);
   return new RedisStore({
-    client: redisClient,
+    client: getRedisClient(),
     ttl: SESSION_MAX_AGE_SECONDS,
     disableTouch: true,
   });