Oppdaterte nais-yaml

navikt · Feb 25, 2022 · 79a008a · 79a008a
1 parent 31324ac
commit 79a008a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/.nais/nais-dev.yaml b/.nais/nais-dev.yaml
@@ -6,15 +6,15 @@ metadata:
   labels:
     team: amt
 spec:
-  image: ghcr.io/navikt/pto-frontend/pto-frontend:2021.06.22_08.34-3e18671c9b52
+  image: ghcr.io/navikt/poao-frontend/poao-frontend:2022.02.25_08.04-6f896bb4dffe
   port: 8080
   ingresses:
     - https://amt-tiltaksansvarlig-flate.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
@@ -27,24 +27,27 @@ spec:
     requests:
       cpu: 250m
       memory: 256Mi
+  azure:
+    sidecar:
+      enabled: true
+    application:
+      enabled: true
+      claims:
+        groups:
+          - id: ace70121-3382-47b0-a91d-f20a6b481a70
   gcp:
     buckets:
       - name: amt-tiltaksansvarlig-flate-dev
         cascadingDelete: false
-  accessPolicy:
-    outbound:
-      rules:
-        - application: amt-tiltaksansvarlig-flate-auth-proxy
   env:
-    - name: GCS_BUCKET_NAME
-      value: amt-tiltaksansvarlig-flate-dev
-    - name: CORS_DOMAIN
-      value: "*"
     - name: JSON_CONFIG
       value: >
         {
-          "proxies": [
-            { "from": "/auth-proxy", "to": "http://amt-tiltaksansvarlig-flate-auth-proxy" },
-            { "from": "/amt-tiltak", "to": "http://amt-tiltaksansvarlig-flate-auth-proxy/proxy/amt-tiltak" }
-          ]
-        }
+          "fallbackStrategy": "SERVE_INDEX_HTML",
+          "gcs": {
+            "bucketName": "amt-tiltaksansvarlig-flate-dev"
+          },
+          "auth": {
+            "loginProvider": "AZURE_AD"
+          }
+        }
diff --git a/src/component/page/login/LoginPage.tsx b/src/component/page/login/LoginPage.tsx
@@ -3,11 +3,11 @@ import cls from 'classnames'
 import React from 'react'
 
 import globalStyles from '../../../globals.module.scss'
+import { appUrl } from '../../../utils/url-utils'
 import styles from './LoginPage.module.scss'
 
 export const LoginPage = (): React.ReactElement => {
-	const currentLocation = window.location.href
-	const loginUrl = `/auth-proxy/oauth2/login?redirect_uri=${currentLocation}`
+	const loginUrl = appUrl(`/oauth2/login?redirect=${window.location.href}`)
 
 	return (
 		<main className={styles.loginPage}>