Merge branch 'master' into Tidslinjer

navikt · Aug 30, 2023 · 57b4778 · 57b4778
2 parents 8263b1f + 7645d75
commit 57b4778
Show file tree

Hide file tree

Showing 16 changed files with 411 additions and 166 deletions.
diff --git a/.github/workflows/bygg-branch.yml b/.github/workflows/bygg-branch.yml
@@ -13,15 +13,19 @@ jobs:
   bygg:
     name: Bygg branch
     runs-on: ubuntu-latest
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+      packages: 'write'
     steps:
       - name: Sjekk ut kode
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.14.2'
+          node-version: '18'
           registry-url: https://npm.pkg.github.com/
           cache: 'npm'
 
@@ -32,6 +36,8 @@ jobs:
       - run: npm run lint
 
       - run: npm run build
+        env:
+          PUBLIC_URL: https://cdn.nav.no/fager/min-side-arbeidsgiver/build/
 
       - uses: docker/login-action@v1
         with:
@@ -44,3 +50,10 @@ jobs:
           docker build --tag $IMAGE_BASE:$GITHUB_SHA .
           echo ${{ secrets.GITHUB_TOKEN }} | docker login docker.pkg.github.com -u $GITHUB_REPOSITORY --password-stdin
           docker push $IMAGE_BASE:$GITHUB_SHA
+
+      - id: upload
+        uses: navikt/frontend/actions/cdn-upload/v1@main
+        with:
+          cdn-team-name: fager
+          source: ./build/
+          destination: '/min-side-arbeidsgiver'
diff --git a/.github/workflows/bygg-og-deploy-master.yml b/.github/workflows/bygg-og-deploy-master.yml
@@ -35,13 +35,17 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
+    permissions:
+      contents: 'read'
+      id-token: 'write'
+      packages: 'write'
     steps:
       - name: Sjekk ut kode
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.14.2'
+          node-version: '18'
           registry-url: https://npm.pkg.github.com/
           cache: 'npm'
 
@@ -53,6 +57,8 @@ jobs:
       - run: npm run lint
 
       - run: npm run build
+        env:
+          PUBLIC_URL: https://cdn.nav.no/fager/min-side-arbeidsgiver/build/
 
       - uses: docker/login-action@v1
         with:
@@ -66,6 +72,13 @@ jobs:
           echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u $GITHUB_REPOSITORY --password-stdin
           docker push $IMAGE
 
+      - id: upload
+        uses: navikt/frontend/actions/cdn-upload/v1@main
+        with:
+          cdn-team-name: fager
+          source: ./build/
+          destination: '/min-side-arbeidsgiver'
+
       - name: Lag sentry release
         continue-on-error: true
         env:

diff --git a/nais/dev-gcp.yaml b/nais/dev-gcp.yaml
@@ -42,22 +42,23 @@ spec:
       value: http://notifikasjon-bruker-api.fager.svc.cluster.local
     - name: GIT_COMMIT
       value: {{commit}}
-    - name: SYKEFRAVAER_DOMAIN
-      value: https://sykefravarsstatistikk.intern.dev.nav.no
     - name: MILJO
       value: dev
   accessPolicy:
     outbound:
       external:
         - host: arbeidsgiver-gcp.dev.nav.no
-        - host: sykefravarsstatistikk.intern.dev.nav.no
         - host: arbeidsgiver.intern.dev.nav.no
         - host: tiltak-proxy.dev-fss-pub.nais.io
+        - host: aareg-innsyn-arbeidsgiver-api.dev-fss-pub.nais.io
       rules:
         - application: min-side-arbeidsgiver-api
         - application: notifikasjon-bruker-api
         - application: tiltak-proxy
           namespace: arbeidsgiver
           cluster: dev-fss
+        - application: aareg-innsyn-arbeidsgiver-api
+          namespace: arbeidsforhold
+          cluster: dev-fss
         - application: presenterte-kandidater-api
           namespace: toi
diff --git a/nais/experimental-labs-gcp.yaml b/nais/experimental-labs-gcp.yaml
@@ -36,8 +36,6 @@ spec:
       value: http://localhost:8081
     - name: GIT_COMMIT
       value: {{commit}}
-    - name: SYKEFRAVAER_DOMAIN
-      value: https://arbeidsgiver.labs.nav.no
     - name: MILJO
       value: demo
   accessPolicy:

diff --git a/nais/labs-gcp.yaml b/nais/labs-gcp.yaml
@@ -36,8 +36,6 @@ spec:
       value: http://localhost:8081
     - name: GIT_COMMIT
       value: {{commit}}
-    - name: SYKEFRAVAER_DOMAIN
-      value: https://arbeidsgiver.labs.nav.no
     - name: MILJO
       value: demo
   accessPolicy:

diff --git a/nais/prod-gcp.yaml b/nais/prod-gcp.yaml
@@ -42,20 +42,22 @@ spec:
       value: http://notifikasjon-bruker-api.fager.svc.cluster.local
     - name: GIT_COMMIT
       value: {{commit}}
-    - name: SYKEFRAVAER_DOMAIN
-      value: https://arbeidsgiver.nav.no
     - name: MILJO
       value: prod
   accessPolicy:
     outbound:
       external:
         - host: arbeidsgiver.nav.no
         - host: tiltak-proxy.prod-fss-pub.nais.io
+        - host: aareg-innsyn-arbeidsgiver-api.prod-fss-pub.nais.io
       rules:
         - application: min-side-arbeidsgiver-api
         - application: notifikasjon-bruker-api
         - application: tiltak-proxy
           namespace: arbeidsgiver
           cluster: prod-fss
+        - application: aareg-innsyn-arbeidsgiver-api
+          namespace: arbeidsforhold
+          cluster: prod-fss
         - application: presenterte-kandidater-api
           namespace: toi