IS-1488: Fix url for unleash api

navikt · Aug 21, 2023 · f79d119 · f79d119
1 parent b61b607
commit f79d119
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 8 deletions.
diff --git a/.github/workflows/unleash-apitoken.yaml b/.github/workflows/unleash-apitoken.yaml
@@ -0,0 +1,37 @@
+name: Unleash api-tokens
+
+on:
+  merge_group:
+  pull_request:
+    paths:
+      - .github/workflows/unleash-apitoken.yaml
+      - .nais//unleash/unleash-apitoken-dev.yaml
+      - .nais//unleash/unleash-apitoken-prod.yaml
+  push:
+    branches:
+      - main
+    paths:
+      - .github/workflows/unleash-apitoken.yaml
+      - .nais//unleash/unleash-apitoken-dev.yaml
+      - .nais/unleash/unleash-apitoken-dev.yaml
+
+jobs:
+  apply-apitoken-unleash:
+    name: Apply ApiToken for Unleash to cluster
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && github.ref_name == 'main'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: deploy to dev
+        uses: nais/deploy/actions/deploy@v1
+        env:
+          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
+          CLUSTER: dev-gcp
+          RESOURCE: .nais/unleash/unleash-apitoken-dev.yaml
+      - name: deploy to prod
+        uses: nais/deploy/actions/deploy@v1
+        env:
+          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
+          CLUSTER: prod-gcp
+          RESOURCE: .nais/unleash/unleash-apitoken-prod.yaml
diff --git a/.nais/naiserator-dev.yaml b/.nais/naiserator-dev.yaml
@@ -48,7 +48,7 @@ spec:
       external:
         - host: "login.microsoftonline.com"
         - host: "unleash.nais.io"
-        - host: "https://teamsykefravr-unleash-api.nav.cloud.nais.io/api"
+        - host: "teamsykefravr-unleash-api.nav.cloud.nais.io"
         - host: "internarbeidsflatedecorator-q1.dev-fss-pub.nais.io"
         - host: "modiacontextholder-q1.dev-fss-pub.nais.io"
         - host: "ereg-services-q1.dev-fss-pub.nais.io"

diff --git a/.nais/naiserator-prod.yaml b/.nais/naiserator-prod.yaml
@@ -48,7 +48,7 @@ spec:
       external:
         - host: "login.microsoftonline.com"
         - host: "unleash.nais.io"
-        - host: "https://teamsykefravr-unleash-api.nav.cloud.nais.io/api"
+        - host: "teamsykefravr-unleash-api.nav.cloud.nais.io"
         - host: "internarbeidsflatedecorator.prod-fss-pub.nais.io"
         - host: "modiacontextholder.prod-fss-pub.nais.io"
         - host: "ereg-services.prod-fss-pub.nais.io"
@@ -79,6 +79,7 @@ spec:
   envFrom:
     - secret: syfomodiaperson-session-key
     - secret: syfomodiaperson-redis-password
+    - secret: syfomodiaperson-unleash-api-token
   ingresses:
     - "https://syfomodiaperson.intern.nav.no"
   env:

diff --git a/.nais/unleash/unleash-apitoken-dev.yaml b/.nais/unleash/unleash-apitoken-dev.yaml
@@ -11,7 +11,4 @@ spec:
     kind: RemoteUnleash
     name: teamsykefravr
   secretName: syfomodiaperson-unleash-api-token
-
-  # Specify which environment the API token should be created for.
-  # Can be one of: development, or production.
   environment: development
diff --git a/.nais/unleash/unleash-apitoken-prod.yaml b/.nais/unleash/unleash-apitoken-prod.yaml
@@ -11,7 +11,4 @@ spec:
     kind: RemoteUnleash
     name: teamsykefravr
   secretName: syfomodiaperson-unleash-api-token
-
-  # Specify which environment the API token should be created for.
-  # Can be one of: development, or production.
   environment: production
diff --git a/server/routes/unleashNext.ts b/server/routes/unleashNext.ts