Deployer parallelle server-instanser med versjonering

.github/workflows/build-and-deploy.yml

@@ -48,9 +48,17 @@ jobs:
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           image_suffix: ${{ inputs.DEPLOY_INSTANCE }}
-      - uses: nais/deploy/actions/deploy@v2
+      - name: Deploy external app
+        uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: ${{ inputs.CLUSTER }}
           RESOURCE: .nais/config.yml
-          VAR: image=${{ steps.docker-push.outputs.image }}
+          VAR: image=${{ steps.docker-push.outputs.image }},versionId=${{ github.sha }}
+          VARS: .nais/vars/${{ inputs.DEPLOY_INSTANCE }}.yml
+      - name: Deploy internal versioned app
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: ${{ inputs.CLUSTER }}
+          RESOURCE: .nais/config-internal.yml
+          VAR: image=${{ steps.docker-push.outputs.image }},versionId=${{ github.sha }}
           VARS: .nais/vars/${{ inputs.DEPLOY_INSTANCE }}.yml

.github/workflows/deploy-internal-app.yml

@@ -0,0 +1,39 @@
+name: Deploy intern app-versjon
+on:
+  workflow_dispatch:
+    inputs:
+      image:
+        description: "Image version (last segment of GAR tag)"
+        required: true
+        type: string
+      versionId:
+        description: "App version id"
+        required: true
+        type: string
+      deployInstance:
+        description: 'Deploy instance'
+        required: true
+        type: choice
+        options:
+          - dev-beta-navno
+          - dev-stable
+          - prod
+
+jobs:
+  deploy_internal:
+    name: Deploy intern app-versjon
+    runs-on: ubuntu-latest
+    environment: ${{ inputs.DEPLOY_INSTANCE }}
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Deploy internal versioned app
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: ${{ inputs.deployInstance == 'prod' && 'prod-gcp' || 'dev-gcp' }}
+          RESOURCE: .nais/config-internal.yml
+          VAR: image=europe-north1-docker.pkg.dev/nais-management-233d/personbruker/${{ inputs.image }},versionId=${{ inputs.versionId }}
+          VARS: .nais/vars/${{ inputs.deployInstance }}.yml

.github/workflows/deploy.prod.yml

@@ -46,6 +46,25 @@ jobs:
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
 
+  deploy-network-policy:
+    runs-on: ubuntu-latest
+    needs: build-and-test
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - name: Deploy to prod
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: prod-gcp
+          RESOURCE: .nais/network-policy.yml
+      - name: Deploy to dev
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: .nais/network-policy.yml
+
   deploy-dev:
     runs-on: ubuntu-latest
     needs: build-and-test
@@ -58,7 +77,7 @@ jobs:
         env:
           CLUSTER: dev-gcp
           RESOURCE: .nais/config.yml
-          VAR: image=${{ needs.build-and-test.outputs.image }}
+          VAR: image=${{ needs.build-and-test.outputs.image }},versionId=${{ github.sha }}
           VARS: .nais/vars/dev-stable.yml
 
   deploy-beta-navno:
@@ -73,10 +92,10 @@ jobs:
         env:
           CLUSTER: dev-gcp
           RESOURCE: .nais/config.yml
-          VAR: image=${{ needs.build-and-test.outputs.image }}
+          VAR: image=${{ needs.build-and-test.outputs.image }},versionId=${{ github.sha }}
           VARS: .nais/vars/dev-beta-navno.yml
 
-  deploy-prod-next:
+  deploy-prod-internal:
     runs-on: ubuntu-latest
     needs: build-and-test
     permissions:
@@ -87,9 +106,9 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: prod-gcp
-          RESOURCE: .nais/config.yml
-          VAR: image=${{ needs.build-and-test.outputs.image }}
-          VARS: .nais/vars/prod-next.yml
+          RESOURCE: .nais/config-internal.yml
+          VAR: image=${{ needs.build-and-test.outputs.image }},versionId=${{ github.sha }}
+          VARS: .nais/vars/prod.yml
 
   deploy-prod:
     runs-on: ubuntu-latest
@@ -103,5 +122,5 @@ jobs:
         env:
           CLUSTER: prod-gcp
           RESOURCE: .nais/config.yml
-          VAR: image=${{ needs.build-and-test.outputs.image }}
+          VAR: image=${{ needs.build-and-test.outputs.image }},versionId=${{ github.sha }}
           VARS: .nais/vars/prod.yml

.nais/config-internal.yml

@@ -0,0 +1,71 @@
+---
+apiVersion: nais.io/v1alpha1
+kind: Application
+metadata:
+  name: {{appName}}-{{versionId}}
+  namespace: personbruker
+  labels:
+    team: personbruker
+    dekoratorenType: internal
+  annotations:
+      nginx.ingress.kubernetes.io/proxy-body-size: "256M"
+      nginx.ingress.kubernetes.io/proxy-buffer-size: "16k"
+      nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
+spec:
+  image: {{image}}
+  port: 8089
+  ttl: {{ttlInternal}}
+  liveness:
+    path: /api/isAlive
+    initialDelay: 10
+  readiness:
+    path: /api/isReady
+    initialDelay: 10
+  prometheus:
+    enabled: true
+    path: /metrics
+  accessPolicy:
+    outbound:
+      rules:
+        - application: nav-dekoratoren-api
+        - application: navno-search-api
+        - application: tms-varsel-api
+          namespace: min-side
+      external:
+        {{#each outboundHosts as |host|}}
+        - host: {{host}}
+        {{/each}}
+    inbound:
+      rules:
+        - application: {{appName}}
+          namespace: personbruker
+  env:
+    - name: APP_NAME
+      value: {{appName}}
+    - name: VERSION_ID
+      value: {{versionId}}
+    - name: IS_INTERNAL_APP
+      value: "true"
+  {{#each env as |var|}}
+    - name: {{var.name}}
+      value: {{var.value}}
+  {{/each}}
+  envFrom:
+    - secret: nav-dekoratoren
+    - secret: nav-dekoratoren-unleash-api-token
+  filesFrom:
+    - configmap: dekoratoren-config
+      mountPath: /app/config
+  replicas:
+  {{#with replicas}}
+    min: 1
+    max: {{max}}
+  {{/with}}
+  resources:
+  {{#with resources}}
+    requests:
+      cpu: {{requests.cpu}}
+      memory: {{requests.memory}}
+    limits:
+      memory: {{limits.memory}}
+  {{/with}}

.nais/config.yml

@@ -6,6 +6,7 @@ metadata:
   namespace: personbruker
   labels:
     team: personbruker
+    dekoratorenType: external
   annotations:
       nginx.ingress.kubernetes.io/proxy-body-size: "256M"
       nginx.ingress.kubernetes.io/proxy-buffer-size: "16k"
@@ -42,6 +43,10 @@ spec:
         - application: "*"
           namespace: "*"
   env:
+    - name: APP_NAME
+      value: {{appName}}
+    - name: VERSION_ID
+      value: {{versionId}}
   {{#each env as |var|}}
     - name: {{var.name}}
       value: {{var.value}}

.nais/network-policy.yml

@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: nav-dekoratoren-internal
+  namespace: personbruker
+  labels:
+    team: personbruker
+spec:
+  podSelector:
+    matchLabels:
+      dekoratorenType: external
+  policyTypes:
+    - Egress
+  egress:
+    - to:
+      - podSelector:
+          matchLabels:
+            dekoratorenType: internal

.nais/vars/dev-beta-navno.yml

@@ -5,6 +5,7 @@ ingresses:
 outboundHosts:
   - www.nav.no
   - www.intern.dev.nav.no
+  - dekoratoren-beta.intern.dev.nav.no
   - www-q6.nav.no
   - navno-unleash-api.nav.cloud.nais.io
   - tokendings.dev-gcp.nais.io
@@ -41,6 +42,7 @@ env:
     value: "navtest"
   - name: PUZZEL_CUSTOMER_ID
     value: C1302192-8BEC-4EA2-84AB-F4EDE8AC6230
+ttlInternal: 1h
 replicas:
   min: 1
   max: 1

.nais/vars/dev-beta-tms.yml

@@ -40,6 +40,7 @@ env:
     value: "navtest"
   - name: PUZZEL_CUSTOMER_ID
     value: C1302192-8BEC-4EA2-84AB-F4EDE8AC6230
+ttlInternal: 1h
 replicas:
   min: 1
   max: 1

.nais/vars/dev-stable.yml

@@ -42,6 +42,7 @@ env:
     value: "navtest"
   - name: PUZZEL_CUSTOMER_ID
     value: 83BD7664-B38B-4EEE-8D99-200669A32551
+ttlInternal: 1h
 replicas:
   min: 1
   max: 4

.nais/vars/prod.yml

@@ -40,6 +40,7 @@ env:
     value: "nav"
   - name: PUZZEL_CUSTOMER_ID
     value: 83BD7664-B38B-4EEE-8D99-200669A32551
+ttlInternal: 1w
 replicas:
   min: 2
   max: 40

packages/client/src/helpers/urls.test.ts

@@ -9,6 +9,7 @@ describe("Endpoint urls", () => {
             },
             env: {
                 APP_URL: "http://localhost:3000",
+                VERSION_ID: "1234",
             },
         } as typeof window.__DECORATOR_DATA__;
 
@@ -19,7 +20,7 @@ describe("Endpoint urls", () => {
         });
 
         expect(url).toBe(
-            "http://localhost:3000/user-menu?simple=true&feedback=true",
+            "http://localhost:3000/user-menu?simple=true&feedback=true&version-id=1234",
         );
     });
 });

packages/client/src/helpers/urls.ts

@@ -1,6 +1,7 @@
 import { Params } from "decorator-shared/params";
 import { formatParams } from "decorator-shared/json";
 import { env } from "../params";
+import { VERSION_ID_PARAM } from "decorator-shared/constants";
 
 export const endpointUrlWithParams = (
     endpointUrl: `/${string}`,
@@ -11,7 +12,7 @@ export const endpointUrlWithParams = (
         ...params,
     });
 
-    return `${env("APP_URL")}${endpointUrl}?${formattedParams}`;
+    return `${env("APP_URL")}${endpointUrl}?${formattedParams}&${VERSION_ID_PARAM}=${env("VERSION_ID")}`;
 };
 
 export const cdnUrl = (url: string) => `${env("CDN_URL")}${url}`;

packages/client/src/main.ts

@@ -1,5 +1,4 @@
 /// <reference types="./client.d.ts" />
-import { formatParams } from "decorator-shared/json";
 import { type Context, type ParamKey } from "decorator-shared/params";
 import Cookies from "js-cookie";
 import "vite/modulepreload-polyfill";
@@ -13,7 +12,7 @@ import { env, param, updateDecoratorParams } from "./params";
 import { useLoadIfActiveSession } from "./screensharing";
 import { getHeadAssetsProps } from "decorator-shared/head";
 import { buildHtmlElement } from "./helpers/html-element-builder";
-import { cdnUrl } from "./helpers/urls";
+import { cdnUrl, endpointUrlWithParams } from "./helpers/urls";
 
 import.meta.glob("./styles/*.css", { eager: true });
 import.meta.glob(["./views/**/*.ts", "!./views/**/*.test.ts"], { eager: true });
@@ -24,9 +23,9 @@ window.addEventListener("paramsupdated", (e) => {
     if (e.detail.params.language) {
         Promise.all(
             ["header", "footer"].map((key) =>
-                fetch(
-                    `${env("APP_URL")}/${key}?${formatParams(window.__DECORATOR_DATA__.params)}`,
-                ).then((res) => res.text()),
+                fetch(endpointUrlWithParams(`/${key}`)).then((res) =>
+                    res.text(),
+                ),
             ),
         ).then(([header, footer]) => {
             const headerEl = document.getElementById("decorator-header");