Los app

.deploy/fp-avdelingsleder/dev-gcp-teamforeldrepenger.json

@@ -0,0 +1,25 @@
+{
+  "app": "fp-avdelingsleder",
+  "ingresses": ["https://fp-avdelingsleder.intern.dev.nav.no"],
+  "minReplicas": "1",
+  "maxReplicas": "2",
+  "env": "development",
+  "groups": [
+    "27e77109-fef2-48ce-a174-269074490353",
+    "8cddda87-0a22-4d35-9186-a2c32a6ab450",
+    "e6508a2a-2e74-450e-ad24-eb1b2b4625c6"
+  ],
+  "externals": ["fpsak-api.dev-fss-pub.nais.io", "fplos.dev-fss-pub.nais.io"],
+  "proxyRedirects": [
+    {
+      "path": "/fpsak/api",
+      "url": "https://fpsak-api.dev-fss-pub.nais.io",
+      "scope": "api://dev-fss.teamforeldrepenger.fpsak/.default"
+    },
+    {
+      "path": "/fplos/api",
+      "url": "https://fplos.dev-fss-pub.nais.io",
+      "scope": "api://dev-fss.teamforeldrepenger.fplos/.default"
+    }
+  ]
+}

.deploy/fp-avdelingsleder/prod-gcp-teamforeldrepenger.json

@@ -0,0 +1,25 @@
+{
+  "app": "fp-avdelingsleder",
+  "ingresses": ["https://fp-avdelingsleder.intern.nav.no"],
+  "minReplicas": "2",
+  "maxReplicas": "4",
+  "env": "production",
+  "groups": [
+    "73107205-17ec-4a07-a56e-e0a8542f90c9",
+    "77f05833-ebfd-45fb-8be7-88eca8e7418f",
+    "1a59da27-4c55-4a9d-8480-6abd1a856cd2"
+  ],
+  "externals": ["fpsak-api.prod-fss-pub.nais.io", "fplos.prod-fss-pub.nais.io"],
+  "proxyRedirects": [
+    {
+      "path": "/fpsak/api",
+      "url": "https://fpsak-api.prod-fss-pub.nais.io",
+      "scope": "api://prod-fss.teamforeldrepenger.fpsak/.default"
+    },
+    {
+      "path": "/fplos/api",
+      "url": "https://fplos.prod-fss-pub.nais.io",
+      "scope": "api://prod-fss.teamforeldrepenger.fplos/.default"
+    }
+  ]
+}

.deploy/dev-gcp-teamforeldrepenger.json → .deploy/fp-frontend-app/dev-gcp-teamforeldrepenger.json

@@ -1,4 +1,5 @@
 {
+  "app": "fp-frontend",
   "ingresses": ["https://fpsak.intern.dev.nav.no"],
   "minReplicas": "1",
   "maxReplicas": "2",
@@ -8,7 +9,12 @@
     "8cddda87-0a22-4d35-9186-a2c32a6ab450",
     "e6508a2a-2e74-450e-ad24-eb1b2b4625c6"
   ],
-  "externals": ["fpsak-api.dev-fss-pub.nais.io", "fplos.dev-fss-pub.nais.io", "fptilbake.dev-fss-pub.nais.io", "fpfordel.dev-fss-pub.nais.io"],
+  "externals": [
+    "fpsak-api.dev-fss-pub.nais.io",
+    "fplos.dev-fss-pub.nais.io",
+    "fptilbake.dev-fss-pub.nais.io",
+    "fpfordel.dev-fss-pub.nais.io"
+  ],
   "proxyRedirects": [
     {
       "path": "/fpsak/api",

.deploy/prod-gcp-teamforeldrepenger.json → .deploy/fp-frontend-app/prod-gcp-teamforeldrepenger.json

@@ -1,4 +1,5 @@
 {
+  "app": "fp-frontend",
   "ingresses": ["https://fpsak.intern.nav.no"],
   "minReplicas": "2",
   "maxReplicas": "4",
@@ -8,7 +9,12 @@
     "77f05833-ebfd-45fb-8be7-88eca8e7418f",
     "1a59da27-4c55-4a9d-8480-6abd1a856cd2"
   ],
-  "externals": ["fpsak-api.prod-fss-pub.nais.io", "fplos.prod-fss-pub.nais.io", "fptilbake.prod-fss-pub.nais.io", "fpfordel.prod-fss-pub.nais.io"],
+  "externals": [
+    "fpsak-api.prod-fss-pub.nais.io",
+    "fplos.prod-fss-pub.nais.io",
+    "fptilbake.prod-fss-pub.nais.io",
+    "fpfordel.prod-fss-pub.nais.io"
+  ],
   "proxyRedirects": [
     {
       "path": "/fpsak/api",

.deploy/naiserator.yaml

@@ -1,7 +1,7 @@
 apiVersion: "nais.io/v1alpha1"
 kind: "Application"
 metadata:
-  name: fp-frontend
+  name: {{app}}
   namespace: teamforeldrepenger
   labels:
     team: teamforeldrepenger

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

@@ -6,6 +6,13 @@ on:
         description: 'Branch name'
         type: string
         required: true
+      app:
+        required: true
+        type: choice
+        description: 'Applikasjon som skal deployes fra branch'
+        options:
+          - fp-frontend
+          - fp-avdelingsleder
 
 jobs:
   build-app:
@@ -20,6 +27,7 @@ jobs:
       node-version: '22.17.1'
       push-image: true
       branch: ${{ inputs.branch }}
+      bake-target: ${{ inputs.app }}
       run-knip: true
     secrets: inherit
 
@@ -31,6 +39,9 @@ jobs:
     uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
     with:
       gar: true
+      branch: ${{ inputs.branch }}
       image: ${{ needs.build-app.outputs.build-version }}
       cluster: dev-gcp
+      image_suffix: '/${{ inputs.app }}'
+      deploy_context: '/${{ inputs.app }}'
     secrets: inherit

.github/workflows/build-fp-avdelingsleder.yml

@@ -0,0 +1,56 @@
+name: Bygg og deploy fp-avdelingsleder
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'apps/fp-avdelingsleder/**'
+      - 'packages/**'
+      - 'server/**'
+      - '.deploy/fp-avdelingsleder/**'
+      - '.deploy/naiserator.yaml'
+      - '.github/workflows/build-fp-avdelingsleder.yml'
+      - 'Dockerfile'
+      - 'yarn.lock'
+
+jobs:
+  build-app:
+    name: Build
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    uses: navikt/fp-frontend/.github/workflows/build.yml@los-app # midlertidig til vi er på master
+    with:
+      runs-on: 'ubuntu-latest-8-cores'
+      node-version: '22.17.1'
+      build-image: ${{ github.ref_name == 'master' }} # default: true
+      push-image: ${{ github.ref_name == 'master' }} # default: false
+      run-knip: true
+      app: fp-avdelingsleder
+    secrets: inherit
+
+  deploy-dev:
+    name: Deploy dev
+    permissions:
+      id-token: write
+    if: github.ref_name == 'master'
+    needs: build-app
+    uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
+    with:
+      gar: true
+      image: ${{ needs.build-app.outputs.build-version }}
+      cluster: dev-gcp
+    secrets: inherit
+
+  deploy-prod:
+    name: Deploy prod
+    permissions:
+      id-token: write
+    if: github.ref_name == 'master'
+    needs: [build-app, deploy-dev]
+    uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
+    with:
+      gar: true
+      image: ${{ needs.build-app.outputs.build-version }}
+      cluster: prod-gcp
+    secrets: inherit

.github/workflows/build-fp-frontend.yml

@@ -0,0 +1,54 @@
+name: Bygg og deploy fp-frontend
+on:
+  push:
+    branches:
+      - '**'
+    paths-ignore:
+      - '**.md'
+      - '**.MD'
+      - '.gitignore'
+      - '.editorconfig'
+      - 'LICENCE'
+      - 'CODEOWNERS'
+
+jobs:
+  build-app:
+    name: Build
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    uses: navikt/fp-gha-workflows/.github/workflows/build-app-frontend-yarn.yml@main
+    with:
+      runs-on: 'ubuntu-latest-8-cores'
+      node-version: '22.17.1'
+      build-image: ${{ github.ref_name == 'master' }} # default: true
+      push-image: ${{ github.ref_name == 'master' }} # default: false
+      run-knip: true
+    secrets: inherit
+
+  deploy-dev:
+    name: Deploy dev
+    permissions:
+      id-token: write
+    if: github.ref_name == 'master'
+    needs: build-app
+    uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
+    with:
+      gar: true
+      image: ${{ needs.build-app.outputs.build-version }}
+      cluster: dev-gcp
+    secrets: inherit
+
+  deploy-prod:
+    name: Deploy prod
+    permissions:
+      id-token: write
+    if: github.ref_name == 'master'
+    needs: [build-app, deploy-dev]
+    uses: navikt/fp-gha-workflows/.github/workflows/deploy.yml@main
+    with:
+      gar: true
+      image: ${{ needs.build-app.outputs.build-version }}
+      cluster: prod-gcp
+    secrets: inherit