From 8a9b491a983574d14fc338844c3b29b23af7e2c3 Mon Sep 17 00:00:00 2001
From: LarsOttoHaugen <lars.otto.haugen@nav.no>
Date: Fri, 22 Dec 2023 10:48:57 +0100
Subject: [PATCH] Diverse fikser

---
 .github/dependabot.yml |  6 ++---
 .nais/nais.yaml        |  2 +-
 .nais/prod.yaml        | 56 ++++++++++--------------------------------
 3 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 561b432..0317a26 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,9 +2,9 @@ version: 2
 registries:
   maven-github:
     type: maven-repository
-    url: https://maven.pkg.github.com/navikt/bidrag-beregn-barnebidrag-rest
+    url: https://github-package-registry-mirror.gc.nav.no/cached/maven-release
     username: x-access-token
-    password: ${{secrets.GITHUB_TOKEN}}
+    password: no-secret-required
 updates:
   - package-ecosystem: "maven"
     directory: "/"
@@ -34,4 +34,4 @@ updates:
       time: "06:00"
       timezone: "Europe/Oslo"
     commit-message:
-      prefix: "[github-actions] "
+      prefix: "[github-actions] "
\ No newline at end of file
diff --git a/.nais/nais.yaml b/.nais/nais.yaml
index 997e69c..67f584f 100644
--- a/.nais/nais.yaml
+++ b/.nais/nais.yaml
@@ -47,6 +47,6 @@ spec:
     {{/each}}
   env:
     - name: BIDRAGSJABLON_URL
-      value: https://{{ unsecured.bidragsjablon_url }}
+      value: https://{{ unsecured.bidragsjablon_url }}/bidrag-sjablon
     - name: BIDRAGSJABLON_SCOPE
       value: {{ unsecured.bidragsjablon_scope }}
diff --git a/.nais/prod.yaml b/.nais/prod.yaml
index a725d16..0dc7b32 100644
--- a/.nais/prod.yaml
+++ b/.nais/prod.yaml
@@ -1,43 +1,13 @@
-apiVersion: "nais.io/v1alpha1"
-kind: "Application"
-metadata:
-  name: bidrag-beregn-barnebidrag-rest
-  namespace: bidrag
-  labels:
-    team: bidrag
-spec:
-  azure:
-    application:
-      enabled: true
-  accessPolicy:
-    outbound:
-      external:
-        - host: bidrag-sjablon.prod-fss-pub.nais.io
-  image: {{ image }}
-  liveness:
-    path: /actuator/health
-    initialDelay: 20
-    timeout: 1
-    periodSeconds: 5
-    failureThreshold: 10
-  readiness:
-    path: /actuator/health
-    initialDelay: 20
-    timeout: 1
-  prometheus:
-    enabled: true
-    path: /actuator/prometheus
-  resources:
-    limits:
-      cpu: 1000m
-      memory: 1024Mi
-    requests:
-      cpu: 500m
-      memory: 512Mi
-  ingresses:
-    - https://bidrag-beregn-barnebidrag-rest.intern.nav.no
-  env:
-    - name: BIDRAGSJABLON_URL
-      value: https://bidrag-sjablon.prod-fss-pub.nais.io
-    - name: BIDRAGSJABLON_SCOPE
-      value: prod-fss.bidrag.bidrag-sjablon
+name: bidrag-beregn-barnebidrag-rest
+ingresses:
+  - https://bidrag-beregn-barnebidrag-rest.intern.nav.no
+azure_access_inbound:
+  - application: bidrag-cucumber-cloud
+    namespace: bidrag
+    cluster: prod-gcp
+  - application: bidrag-simuler-beregning
+    namespace: bidrag
+    cluster: prod-gcp
+unsecured:
+  bidragsjablon_url: bidrag-sjablon.prod-fss-pub.nais.io
+  bidragsjablon_scope: prod-fss.bidrag.bidrag-sjablon