Merge pull request #181 from navikt/feature/PEK-851-feature-toggle-fo…

…r-spk-simulering Feature/pek 851 feature toggle for spk simulering
navikt · Dec 9, 2024 · 3c7cdf2 · 3c7cdf2
2 parents b378234 + 7d890cf
commit 3c7cdf2
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git a/.github/workflows/deploy_prod.yaml b/.github/workflows/deploy_prod.yaml
@@ -59,5 +59,5 @@ jobs:
         name: Deploy to prod
         env:
           CLUSTER: prod-gcp
-          RESOURCE: .nais/nais-prod-gcp.yaml
+          RESOURCE: .nais/nais-prod-gcp.yaml,unleash-apitoken-prod.yaml
           IMAGE: ${{ needs.build.outputs.image }}
diff --git a/.github/workflows/manual_deploy_dev.yaml b/.github/workflows/manual_deploy_dev.yaml
@@ -57,5 +57,5 @@ jobs:
       - uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: dev-gcp
-          RESOURCE: .nais/nais-dev-gcp.yaml
+          RESOURCE: .nais/nais-dev-gcp.yaml,.nais/unleash-apitoken-dev.yaml
           IMAGE: ${{ needs.build.outputs.image }}
diff --git a/.nais/nais-dev-gcp.yaml b/.nais/nais-dev-gcp.yaml
@@ -122,6 +122,8 @@ spec:
       value: api://dev-fss.pensjonselvbetjening.pensjon-selvbetjening-fss-gateway/.default
     - name: OTEL_RESOURCE_ATTRIBUTES
       value: deployment.environment.name=q2
+  envFrom:
+    - secret: tjenestepensjon-simulering-unleash-api-token
   prometheus:
     enabled: true
     path: actuator/prometheus

diff --git a/.nais/nais-prod-gcp.yaml b/.nais/nais-prod-gcp.yaml
@@ -96,6 +96,8 @@ spec:
       value: api://prod-fss.pensjonselvbetjening.pensjon-selvbetjening-fss-gateway/.default
     - name: OTEL_RESOURCE_ATTRIBUTES
       value: deployment.environment.name=p
+  envFrom:
+    - secret: tjenestepensjon-simulering-unleash-api-token
   prometheus:
     enabled: true
     path: actuator/prometheus

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: tjenestepensjon-simulering
+  namespace: pensjonskalkulator
+  labels:
+    team: pensjonskalkulator
+spec:
+  unleashInstance:
+    apiVersion: unleash.nais.io/v1
+    kind: RemoteUnleash
+    name: pensjonskalkulator
+  secretName: tjenestepensjon-simulering-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: tjenestepensjon-simulering
+  namespace: pensjonskalkulator
+  labels:
+    team: pensjonskalkulator
+spec:
+  unleashInstance:
+    apiVersion: unleash.nais.io/v1
+    kind: RemoteUnleash
+    name: pensjonskalkulator
+  secretName: tjenestepensjon-simulering-unleash-api-token
+  environment: production