Redis deploy tweaks

Author: anders-nom

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

@@ -37,14 +37,17 @@ jobs:
           CLUSTER: ${{ inputs.cluster }}
           RESOURCE: .nais/redis.yml
           VARS: .nais/vars/${{ inputs.vars_file }}
-      - name: Set HPA resource if specified
+      - name: Deploy HPA
         if: ${{ inputs.hpa_file }}
-        run: |
-          echo "HPA_RESOURCE=,.nais/hpa/${{inputs.hpa_file}}" >> $GITHUB_ENV
-      - name: Deploy to nais
         uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: .nais/${{ inputs.config_file }}${{env.HPA_RESOURCE}}
+          RESOURCE: .nais/hpa/${{inputs.hpa_file}}
+          VARS: .nais/vars/${{ inputs.vars_file }}
+      - name: Deploy application
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: ${{ inputs.cluster }}
+          RESOURCE: .nais/${{ inputs.config_file }}
           VAR: image=${{ inputs.image }}
           VARS: .nais/vars/${{ inputs.vars_file }}

.nais/config.yml

@@ -27,10 +27,12 @@ spec:
   prometheus:
     enabled: true
     path: /internal/metrics
-  redis:
-    - instance: {{ redisInstance }}
-      access: readwrite
   leaderElection: true
+  {{#with redis}}
+    redis:
+      - instance: {{ instance }}
+        access: readwrite
+  {{/with}}
   ingresses:
     {{#each ingresses as |url|}}
     - {{url}}

.nais/redis.yml

@@ -4,8 +4,8 @@ metadata:
   labels:
     app: nav-enonicxp-frontend
     team: personbruker
-  name: redis-personbruker-{{ redisInstance }}
+  name: redis-personbruker-{{ redis.instance }}
   namespace: personbruker
 spec:
-  plan: {{ redisPlan }}
-  project: {{ redisProject }}
+  plan: {{ redis.plan }}
+  project: {{ redis.project }}

.nais/vars/vars-prod.yml

@@ -15,4 +15,8 @@ resources:
     memory: 2500Mi
 replicas:
   min: 3
-  max: 3
+  max: 3
+redis:
+  plan: startup-4
+  project: nav-prod
+  instance: pagecache

server/cache/redis.ts

@@ -14,11 +14,6 @@ const clientOptions: { [key in AppEnv]?: RedisClientOptions } = {
         username: process.env.REDIS_USERNAME_PAGECACHE_DEV1,
         password: process.env.REDIS_PASSWORD_PAGECACHE_DEV1,
     },
-    dev2: {
-        url: process.env.REDIS_URI_PAGECACHE_DEV2,
-        username: process.env.REDIS_USERNAME_PAGECACHE_DEV2,
-        password: process.env.REDIS_PASSWORD_PAGECACHE_DEV2,
-    },
     prod: {
         url: process.env.REDIS_URI_PAGECACHE,
         username: process.env.REDIS_USERNAME_PAGECACHE,

server/leader.ts

@@ -12,14 +12,13 @@ export const isLeaderPod = async (): Promise<boolean> => {
             if (res.ok) {
                 return res.json();
             }
+            console.error(
+                `Error fetching leader, assuming I'm leader - ${res.status} ${res.statusText}`
+            );
+            return true;
         })
         .then((json) => {
-            const hostname = os.hostname();
-            console.log(
-                `Leader election result, comparing with my hostname: ${hostname} `,
-                json
-            );
-            return json.name === hostname;
+            return json.name === os.hostname();
         })
         .catch((e) => {
             console.error(