Merge pull request #329 from navikt/tc-272-bytte-til-poao-frontend

TC-272 Bytte fra pto-frontend til poao-frontend
navikt · Jan 23, 2023 · 340f09d · 340f09d
2 parents 02d7122 + c6690c5
commit 340f09d
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 14 deletions.
diff --git a/.github/workflows/poao-frontend-container-dev.yaml b/.github/workflows/poao-frontend-container-dev.yaml
@@ -0,0 +1,29 @@
+name: paoa frontend container dev
+
+on:
+  push:
+    branches:
+      - 'master'
+    paths:
+      - '.github/workflows/poao-frontend-container-dev.yaml'
+      - '.nais/obo-nais-dev.yaml'
+  workflow_dispatch:
+
+concurrency:
+  group: poao_frontend_container_dev
+  cancel-in-progress: true
+
+env:
+  APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY_GCP }}
+
+jobs:
+  deploy-dev:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: deploy gcp dev
+        uses: nais/deploy/actions/deploy@v1
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: .nais/obo-nais-dev.yaml
diff --git a/.github/workflows/poao-frontend-container-prod.yaml b/.github/workflows/poao-frontend-container-prod.yaml
@@ -0,0 +1,29 @@
+name: paoa frontend container prod
+
+on:
+  push:
+    branches:
+      - 'master'
+    paths:
+      - '.github/workflows/poao-frontend-container-prod.yaml'
+      - '.nais/obo-nais-prod.yaml'
+  workflow_dispatch:
+
+concurrency:
+  group: poao_frontend_container_prod
+  cancel-in-progress: true
+
+env:
+  APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY_GCP }}
+
+jobs:
+  deploy-prod:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: deploy gcp prod
+        uses: nais/deploy/actions/deploy@v1
+        env:
+          CLUSTER: prod-gcp
+          RESOURCE: .nais/obo-nais-prod.yaml
diff --git a/nais-dev.yaml → .nais/obo-nais-dev.yaml b/nais-dev.yaml → .nais/obo-nais-dev.yaml
@@ -6,15 +6,15 @@ metadata:
   labels:
     team: pto
 spec:
-  image: ghcr.io/navikt/pto-frontend/pto-frontend:2023.01.13_08.11-4fff74d23073
+  image: ghcr.io/navikt/poao-frontend/poao-frontend:2023.01.13_08.09-36c09678654f
   port: 8080
   ingresses:
     - https://veilarbmaofs.dev.intern.nav.no
   liveness:
-    path: /internal/isAlive
+    path: /internal/alive
     initialDelay: 10
   readiness:
-    path: /internal/isReady
+    path: /internal/ready
     initialDelay: 10
   replicas:
     min: 1
@@ -32,7 +32,13 @@ spec:
       - name: veilarbmaofs-dev
         cascadingDelete: false
   env:
-    - name: GCS_BUCKET_NAME
-      value: veilarbmaofs-dev
-    - name: CORS_DOMAIN
-      value: "*"
+    - name: JSON_CONFIG
+      value: >
+        {
+          "cors": {
+            "origin": "https://veilarbpersonflate.dev.intern.nav.no"
+          },
+          "gcs": {
+            "bucketName": "veilarbmaofs-dev"
+          }
+        }
diff --git a/nais-prod.yaml → .nais/obo-nais-prod.yaml b/nais-prod.yaml → .nais/obo-nais-prod.yaml
@@ -6,15 +6,15 @@ metadata:
   labels:
     team: pto
 spec:
-  image: ghcr.io/navikt/pto-frontend/pto-frontend:2023.01.13_08.11-4fff74d23073
+  image: ghcr.io/navikt/poao-frontend/poao-frontend:2023.01.13_08.09-36c09678654f
   port: 8080
   ingresses:
     - https://veilarbmaofs.intern.nav.no
   liveness:
-    path: /internal/isAlive
+    path: /internal/alive
     initialDelay: 10
   readiness:
-    path: /internal/isReady
+    path: /internal/ready
     initialDelay: 10
   replicas:
     min: 2
@@ -32,7 +32,13 @@ spec:
       - name: veilarbmaofs-prod
         cascadingDelete: false
   env:
-    - name: GCS_BUCKET_NAME
-      value: veilarbmaofs-prod
-    - name: CORS_DOMAIN
-      value: "*"
+    - name: JSON_CONFIG
+      value: >
+        {
+          "cors": {
+            "origin": "https://veilarbpersonflate.intern.nav.no"
+          },
+          "gcs": {
+            "bucketName": "veilarbmaofs-prod"
+          }
+        }