Flytte applikasjon over til pia (#187)

* Flytte applikasjon over til 'pia' namespace --------- Co-authored-by: Thomas Dufourd <[email protected]>
navikt · Feb 5, 2024 · 82e4c6d · 82e4c6d
1 parent 4a10ff8
commit 82e4c6d
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 24 deletions.
diff --git a/.github/workflows/build-deploy.yaml b/.github/workflows/build-deploy.yaml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - main
-      - samesite
+      - flytte-applikasjon-over-til-pia
     paths-ignore:
       - "**.md"
       - "**/**.md"
@@ -44,7 +44,7 @@ jobs:
         uses: nais/docker-build-push@v0
         id: docker-push
         with:
-          team: teamia
+          team: pia
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           salsa: false

diff --git a/.github/workflows/deploy-alerts.yaml b/.github/workflows/deploy-alerts.yaml
@@ -6,22 +6,24 @@ on:
     paths:
       - '.nais/alerts.yaml'
       - '.github/workflows/deploy-alerts.yaml'
+
+permissions:
+  id-token: write
+
 jobs:
   apply-alerts:
     name: Apply alerts to clusters
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: deploy to dev-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .nais/alerts.yaml
       - name: deploy to prod-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .nais/alerts.yaml
diff --git a/.github/workflows/deploy-redirect-dev.yaml b/.github/workflows/deploy-redirect-dev.yaml
@@ -6,16 +6,19 @@ on:
       - ".github/workflows/deploy-redirect-dev.yaml"
       - ".nais/redirect-sykefravarsstatistikk-dev.yaml"
       - ".nais/redirect-forebyggingsplan-dev.yaml"
+
+permissions:
+  id-token: write
+
 jobs:
   deploy:
     name: Deploy redirect ingresses to dev-gcp
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Deploy sykefravarsstatistikk redirect ingress to dev
-        uses: nais/deploy/actions/deploy@master
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: "\
             .nais/redirect-sykefravarsstatistikk-dev.yaml,\

diff --git a/.github/workflows/deploy-redirect-prod.yaml b/.github/workflows/deploy-redirect-prod.yaml
@@ -3,22 +3,25 @@ run-name: Deploy ingresses to prod | ${{ github.event.head_commit.message }}
 on:
   push:
     branches:
-      - 'main'
+      - main
     paths:
       - '.nais/redirect-sykefravarsstatistikk-prod.yaml'
       - '.github/workflows/deploy-redirect-prod.yaml'
       - '.nais/redirect-forebyggingsplan-prod.yaml'
       - '.nais/redirect-samtalestotte-prod.yaml'
+
+permissions:
+  id-token: write
+
 jobs:
   deploy:
     name: Deploy redirect ingresses to prod-gcp
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Deploy redirect ingresses to prod
-        uses: nais/deploy/actions/deploy@master
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: "\
             .nais/redirect-sykefravarsstatistikk-prod.yaml,\

diff --git a/.nais/dev.yaml b/.nais/dev.yaml
@@ -2,9 +2,9 @@ apiVersion: nais.io/v1alpha1
 kind: Application
 metadata:
   name: min-ia
-  namespace: teamia
+  namespace: pia
   labels:
-    team: teamia
+    team: pia
 spec:
   image: {{image}}
   port: 3000
@@ -85,6 +85,7 @@ spec:
         - application: fia-arbeidsgiver
           namespace: pia
         - application: forebyggingsplan
+          namespace: teamia
       external:
         - host: arbeidsgiver.intern.dev.nav.no
         - host: dekoratoren.dev.nav.no

diff --git a/.nais/ekstern-dev.yaml b/.nais/ekstern-dev.yaml
@@ -2,9 +2,9 @@ apiVersion: nais.io/v1alpha1
 kind: Application
 metadata:
   name: min-ia-mock
-  namespace: teamia
+  namespace: pia
   labels:
-    team: teamia
+    team: pia
 spec:
   image: {{image}}
   port: 3000

diff --git a/.nais/prod.yaml b/.nais/prod.yaml
@@ -2,9 +2,9 @@ apiVersion: nais.io/v1alpha1
 kind: Application
 metadata:
   name: min-ia
-  namespace: teamia
+  namespace: pia
   labels:
-    team: teamia
+    team: pia
 spec:
   image: {{image}}
   port: 3000
@@ -87,6 +87,7 @@ spec:
         - application: fia-arbeidsgiver
           namespace: pia
         - application: forebyggingsplan
+          namespace: teamia
       external:
         - host: www.nav.no
         - host: arbeidsgiver.nav.no

diff --git a/.nais/redirect-forebyggingsplan-dev.yaml b/.nais/redirect-forebyggingsplan-dev.yaml
@@ -7,9 +7,9 @@ metadata:
     prometheus.io/scrape: "false"
   labels:
     app: min-ia
-    team: teamia
+    team: pia
   name: dev-redirect-forebyggingsplan-to-forebygge-fravar
-  namespace: teamia
+  namespace: pia
 spec:
   ingressClassName: nais-ingress
   rules:

diff --git a/.nais/redirect-sykefravarsstatistikk-dev.yaml b/.nais/redirect-sykefravarsstatistikk-dev.yaml
@@ -7,9 +7,9 @@ metadata:
     prometheus.io/scrape: "false"
   labels:
     app: min-ia
-    team: teamia
+    team: pia
   name: dev-redirect-sykefravarsstatistikk-to-forebygge-fravar
-  namespace: teamia
+  namespace: pia
 spec:
   ingressClassName: nais-ingress
   rules: