Merge branch 'main' into kollapse-brukertest-komponent

Author: taniaholst

.github/workflows/deploy-to-nais.yml

@@ -17,7 +17,7 @@ on:
       hpa_file:
         required: false
         type: string
-      deploy_redis:
+      deploy_valkey:
         required: false
         type: boolean
 
@@ -30,14 +30,14 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
-      - name: Deploy Redis
-        if: ${{ inputs.deploy_redis == true }}
+      - name: Deploy Valkey
+        if: ${{ inputs.deploy_valkey == true }}
         uses: nais/deploy/actions/deploy@v2
         timeout-minutes: 1
         continue-on-error: true
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: .nais/redis.yml
+          RESOURCE: .nais/valkey.yml
           VARS: .nais/vars/${{ inputs.vars_file }}
       - name: Deploy HPA
         if: ${{ inputs.hpa_file }}

.github/workflows/deploy.dev1.yml

@@ -48,4 +48,4 @@ jobs:
       vars_file: vars-dev1.yml
       config_file: config.yml
       hpa_file: hpa-dev1.yml
-      deploy_redis: true
+      deploy_valkey: true

.github/workflows/deploy.dev2.yml

@@ -48,4 +48,4 @@ jobs:
       vars_file: vars-dev2.yml
       config_file: config.yml
       hpa_file: hpa-dev2.yml
-      deploy_redis: true
+      deploy_valkey: true

.github/workflows/deploy.prod.yml

@@ -41,4 +41,4 @@ jobs:
       vars_file: vars-prod.yml
       config_file: config.yml
       hpa_file: hpa-prod.yml
-      deploy_redis: true
+      deploy_valkey: true

.nais/config.yml

@@ -27,8 +27,8 @@ spec:
   prometheus:
     enabled: true
     path: /internal/metrics
-  redis:
-    - instance: {{ redis.instance }}
+  valkey:
+    - instance: {{ valkey.instance }}
       access: readwrite
   ingresses:
     {{#each ingresses as |url|}}

.nais/redis.yml .nais/valkey.yml

@@ -1,29 +1,29 @@
 apiVersion: aiven.io/v1alpha1
-kind: Redis
+kind: Valkey
 metadata:
   labels:
     app: nav-enonicxp-frontend
     team: personbruker
-  name: redis-personbruker-{{ redis.instance }}
+  name: valkey-personbruker-{{ valkey.instance }}
   namespace: personbruker
 spec:
-  plan: {{ redis.plan }}
-  project: {{ redis.project }}
+  plan: {{ valkey.plan }}
+  project: {{ valkey.project }}
   maintenanceWindowDow: saturday
   maintenanceWindowTime: 20:00:00
   userConfig:
-    redis_maxmemory_policy: allkeys-lru
+    valkey_maxmemory_policy: allkeys-lru
 
 ---
 apiVersion: aiven.io/v1alpha1
 kind: ServiceIntegration
 metadata:
   labels:
     team: personbruker
-  name: redis-personbruker-{{ redis.instance }}
+  name: valkey-personbruker-{{ valkey.instance }}
   namespace: personbruker
 spec:
-  project: {{ redis.project }}
+  project: {{ valkey.project }}
   integrationType: prometheus
-  destinationEndpointId: {{ redis.endpointId }}
-  sourceServiceName: redis-personbruker-{{ redis.instance }}
+  destinationEndpointId: {{ valkey.endpointId }}
+  sourceServiceName: valkey-personbruker-{{ valkey.instance }}

.nais/vars/vars-dev1.yml

@@ -15,7 +15,7 @@ resources:
     memory: 1000Mi
   limits:
     memory: 2000Mi
-redis:
+valkey:
   plan: hobbyist
   project: nav-dev
   instance: pagecache

.nais/vars/vars-dev2.yml

@@ -16,7 +16,7 @@ resources:
     memory: 500Mi
   limits:
     memory: 1000Mi
-redis:
+valkey:
   plan: hobbyist
   project: nav-dev
   instance: pagecache

.nais/vars/vars-prod.yml

@@ -13,7 +13,7 @@ resources:
     memory: 2048Mi
   limits:
     memory: 4096Mi
-redis:
+valkey:
   plan: startup-4
   project: nav-prod
   instance: pagecache

docker-compose.yml

@@ -7,7 +7,7 @@ services:
       - '3002:3002'
     environment:
       SERVICE_SECRET: 'dummyToken'
-      NO_REDIS: true
+      NO_VALKEY: true
 
   dekoratoren:
     container_name: dekoratoren-xpfrontend

nodeenv.d.ts

@@ -20,9 +20,9 @@ declare global {
             ASSET_PREFIX: string;
             TELEMETRY_URL: string;
             NEXT_PHASE: string;
-            REDIS_URI_PAGECACHE: string;
-            REDIS_USERNAME_PAGECACHE: string;
-            REDIS_PASSWORD_PAGECACHE: string;
+            VALKEY_URI_PAGECACHE: string;
+            VALKEY_USERNAME_PAGECACHE: string;
+            VALKEY_PASSWORD_PAGECACHE: string;
             DECORATOR_NOCACHE?: 'true' | 'false';
         }
     }

src/components/_page-warnings/page-warning/PageWarning.tsx

@@ -12,10 +12,10 @@ type Props = {
 
 export const PageWarning = ({ whiteBg, size = 'small', children }: Props) => {
     return (
-        <div className={classNames(style.container, whiteBg && style.whiteBg)}>
+        <section className={classNames(style.container, whiteBg && style.whiteBg)}>
             <AlertBox variant={'warning'} size={size} className={style.warning}>
                 {children}
             </AlertBox>
-        </div>
+        </section>
     );
 };

srcCommon/redis.ts

@@ -10,16 +10,16 @@ type XpResponseProps = Record<string, any>;
 
 const clientOptions: RedisClientOptions = {
     url: process.env.REDIS_URI_PAGECACHE,
-    username: process.env.REDIS_USERNAME_PAGECACHE,
-    password: process.env.REDIS_PASSWORD_PAGECACHE,
+    username: process.env.VALKEY_USERNAME_PAGECACHE,
+    password: process.env.VALKEY_PASSWORD_PAGECACHE,
     socket: { keepAlive: 5000, connectTimeout: 10000 },
 } as const;
 
 const validateClientOptions = () => {
     const isValid = !!(clientOptions.url && clientOptions.username && clientOptions.password);
 
     if (!isValid) {
-        logger.error(`Client options for Redis has missing parameters!`);
+        logger.error(`Client options for Valkey has missing parameters!`);
     }
 
     return isValid;
@@ -37,21 +37,23 @@ class RedisCacheImpl {
     private renderCacheKeyPrefix = '';
 
     constructor() {
+        logger.info(clientOptions.url);
+        logger.info(clientOptions.username);
         this.client = createClient(clientOptions)
             .on('connect', () => {
-                logger.info('Redis client connected');
+                logger.info('Valkey client connected');
             })
             .on('ready', () => {
-                logger.info('Redis client ready');
+                logger.info('Valkey client ready');
             })
             .on('end', () => {
-                logger.info('Redis client connection closed');
+                logger.info('Valkey client connection closed');
             })
             .on('reconnecting', () => {
-                logger.info('Redis client reconnecting');
+                logger.info('Valkey client reconnecting');
             })
             .on('error', (err) => {
-                logger.error(`Redis client error: ${err}`);
+                logger.error(`Valkey client error: ${err}`);
             });
     }
 
@@ -61,7 +63,7 @@ class RedisCacheImpl {
 
         return this.client.connect().then(() => {
             logger.info(
-                `Initialized redis client with url ${clientOptions.url} - Render key prefix: ${this.renderCacheKeyPrefix} - Response key prefix: ${this.responseCacheKeyPrefix}`
+                `Initialized valkey client with url ${clientOptions.url} - Render key prefix: ${this.renderCacheKeyPrefix} - Response key prefix: ${this.responseCacheKeyPrefix}`
             );
             return this;
         });