veilarblest-gcp (#1240)

* veilarblest gcp * veilarblest gcp --------- Co-authored-by: Hans Petter Simonsen <hans.petter.simonsen@nav.no>
navikt · Feb 1, 2024 · 59f8a11 · 59f8a11
1 parent e69b3c9
commit 59f8a11
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/nais/dev-ekstern.yaml b/nais/dev-ekstern.yaml
@@ -42,11 +42,12 @@ spec:
     outbound:
       rules:
         - application: pto-proxy
+        - application: veilarblest
+          namespace: dab
       external:
         - host: navtestb2c.b2clogin.com
         - host: veilarbdialog.dev-fss-pub.nais.io
         - host: veilarbaktivitet.dev-fss-pub.nais.io
-        - host: veilarblest.dev-fss-pub.nais.io
         - host: veilarbmalverk.dev-fss-pub.nais.io
         - host: veilarbperson.dev-fss-pub.nais.io
         - host: veilarboppfolging.dev-fss-pub.nais.io
@@ -88,7 +89,16 @@ spec:
           "fallbackStrategy": "SERVE_INDEX_HTML",
           "proxies": [
             { "fromPath": "/veilarbvedtakinfo", "toUrl": "https://veilarbvedtakinfo.dev-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarbvedtakinfo", "namespace": "pto", "cluster": "dev-fss" } },
-            { "fromPath": "/veilarblest", "toUrl": "https://veilarblest.dev-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarblest", "namespace": "pto", "cluster": "dev-fss" } },
+            {
+                      "fromPath": "/veilarblest",
+                      "toUrl": "http://veilarblest.dab.svc.cluster.local",
+                      "preserveFromPath": true,
+                      "toApp": {
+                        "name": "veilarblest",
+                        "namespace": "dab",
+                        "cluster": "dev-gcp"
+                      }
+            },
             { "fromPath": "/veilarboppfolging", "toUrl": "https://veilarboppfolging.dev-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarboppfolging", "namespace": "pto", "cluster": "dev-fss" } },
             { "fromPath": "/veilarbdialog", "toUrl": "https://veilarbdialog.dev-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarbdialog", "namespace": "pto", "cluster": "dev-fss" } },
             { "fromPath": "/veilarbaktivitet", "toUrl": "https://veilarbaktivitet.dev-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarbaktivitet", "namespace": "pto", "cluster": "dev-fss" } }

diff --git a/nais/prod-ekstern.yaml b/nais/prod-ekstern.yaml
@@ -43,14 +43,15 @@ spec:
     outbound:
       rules:
         - application: pto-proxy
+        - application: veilarblest
+          namespace: dab
       external:
         - host: navnob2c.b2clogin.com
         - host: veilarbmalverk.prod-fss-pub.nais.io
         - host: veilarbperson.prod-fss-pub.nais.io
         - host: veilarboppfolging.prod-fss-pub.nais.io
         - host: veilarbdialog.prod-fss-pub.nais.io
         - host: veilarbaktivitet.prod-fss-pub.nais.io
-        - host: veilarblest.prod-fss-pub.nais.io
         - host: veilarbveileder.prod-fss-pub.nais.io
   gcp:
     buckets:
@@ -89,7 +90,16 @@ spec:
           "fallbackStrategy": "SERVE_INDEX_HTML",
           "proxies": [
             { "fromPath": "/veilarbvedtakinfo", "toUrl": "https://veilarbvedtakinfo.prod-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarbvedtakinfo", "namespace": "pto", "cluster": "prod-fss" } },
-            { "fromPath": "/veilarblest", "toUrl": "https://veilarblest.prod-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarblest", "namespace": "pto", "cluster": "prod-fss" } },
+            {
+              "fromPath": "/veilarblest",
+              "toUrl": "http://veilarblest.dab.svc.cluster.local",
+              "preserveFromPath": true,
+              "toApp": {
+                "name": "veilarblest",
+                "namespace": "dab",
+                "cluster": "prod-gcp"
+              }
+            },
             { "fromPath": "/veilarboppfolging", "toUrl": "https://veilarboppfolging.prod-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarboppfolging", "namespace": "pto", "cluster": "prod-fss" } },
             { "fromPath": "/veilarbdialog", "toUrl": "https://veilarbdialog.prod-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarbdialog", "namespace": "pto", "cluster": "prod-fss" } },
             { "fromPath": "/veilarbaktivitet", "toUrl": "https://veilarbaktivitet.prod-fss-pub.nais.io", "preserveFromPath": true, "toApp": {"name": "veilarbaktivitet", "namespace": "pto", "cluster": "prod-fss" } }