Legger til unleash-apitoken workflow

navikt · Dec 1, 2023 · 120e1ad · 120e1ad
1 parent d864920
commit 120e1ad
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 4 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -73,3 +73,23 @@ jobs:
           RESOURCE: nais/nais-prod-gcp.yaml,nais/connector.yaml
           REF: ${{ env.COMMIT }}
           VAR: image=${{ needs.build.outputs.image }},topic=arbeidssoker-profilert-v2,kafka=prod-gcp,project=paw-prod-7151
+
+  apply-apitoken-unleash:
+    name: Legger til ApiToken for Unleash
+    runs-on: ubuntu-latest
+    needs: [build]
+    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-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-apitoken-prod.yaml
diff --git a/nais/nais-dev-gcp.yaml b/nais/nais-dev-gcp.yaml
@@ -27,6 +27,8 @@ spec:
   prometheus:
     enabled: true
     path: /internal/metrics
+  envFrom:
+    - secret: paw-arbeidssoker-profilering-unleash-api-token
   env:
     - name: KAFKA_CONSUMER_ARBEIDSSOKER_REGISTERING_TOPIC
       value: paw.arbeidssoker-registrert-v2
@@ -40,8 +42,8 @@ spec:
       value: https://aareg-services-q1.dev-fss-pub.nais.io/api/v1/arbeidstaker/arbeidsforhold
     - name: AAREG_SCOPE
       value: api://dev-fss.arbeidsforhold.aareg-services-nais-q1/.default
-    - name: UNLEASH_URL
-      value: https://unleash.nais.io/api/
+    - name: UNLEASH_SERVER_API_URL
+      value: https://paw-unleash-api.nav.cloud.nais.io/api
   resources:
     limits:
       cpu: '3'
@@ -61,6 +63,7 @@ spec:
               cluster: dev-fss
           external:
             - host: aareg-services-q1.dev-fss-pub.nais.io
+            - host: paw-unleash-api.nav.cloud.nais.io
   gcp:
     sqlInstances:
       - type: POSTGRES_14

diff --git a/nais/nais-prod-gcp.yaml b/nais/nais-prod-gcp.yaml
@@ -27,6 +27,8 @@ spec:
   prometheus:
     enabled: true
     path: /internal/metrics
+  envFrom:
+    - secret: paw-arbeidssoker-profilering-unleash-api-token
   env:
     - name: KAFKA_CONSUMER_ARBEIDSSOKER_REGISTERING_TOPIC
       value: paw.arbeidssoker-registrert-v2
@@ -40,8 +42,8 @@ spec:
       value: https://aareg-services.prod-fss-pub.nais.io/api/v1/arbeidstaker/arbeidsforhold
     - name: AAREG_SCOPE
       value: api://prod-fss.arbeidsforhold.aareg-services-nais/.default
-    - name: UNLEASH_URL
-      value: https://unleash.nais.io/api/
+    - name: UNLEASH_SERVER_API_URL
+      value: https://paw-unleash-api.nav.cloud.nais.io/api
   resources:
     limits:
       cpu: '3'

diff --git a/nais/unleash-apitoken-dev.yaml b/nais/unleash-apitoken-dev.yaml
@@ -0,0 +1,14 @@
+apiVersion: unleash.nais.io/v1
+kind: ApiToken
+metadata:
+  name: paw-arbeidssoker-profilering-unleash
+  namespace: paw
+  labels:
+    "team": "paw"
+spec:
+    unleashInstance:
+      apiVersion: unleash.nais.io/v1
+      kind: RemoteUnleash
+      name: paw
+    secretName: paw-arbeidssoker-profilering-unleash-api-token
+    environment: development
diff --git a/nais/unleash-apitoken-prod.yaml b/nais/unleash-apitoken-prod.yaml
@@ -0,0 +1,14 @@
+apiVersion: unleash.nais.io/v1
+kind: ApiToken
+metadata:
+  name: paw-arbeidssoker-profilering-unleash
+  namespace: paw
+  labels:
+    "team": "paw"
+spec:
+    unleashInstance:
+      apiVersion: unleash.nais.io/v1
+      kind: RemoteUnleash
+      name: paw
+    secretName: paw-arbeidssoker-profilering-unleash-api-token
+    environment: production