Splitt datapakker soknar/fritekstAvslag nais.yaml i 2 filer

.github/actions/deploy/action.yml

@@ -12,10 +12,6 @@ inputs:
   resource:
     required: true
     description: 'path to nais.yml'
-  vars:
-    required: false
-    description: 'Optional, default empty, path to nais-dev.json/nais-prod.json'
-    default: ''
 
 runs:
   using: "composite"

.github/workflows/datapakker.yml

@@ -57,8 +57,7 @@ jobs:
     with:
       var: image=europe-north1-docker.pkg.dev/nais-management-233d/supstonad/su-se-bakover-datapakker-soknad-job:${{ github.sha }}
       cluster: dev-fss
-      vars: datapakker/soknad/nais-dev.json
-      resource: datapakker/soknad/nais.yml
+      resource: datapakker/soknad/.nais/dev.yaml
 
   deploy_to_dev_fritekstAvslag:
     name: Deploy to dev fritekstAvslag
@@ -70,8 +69,7 @@ jobs:
     with:
       var: image=europe-north1-docker.pkg.dev/nais-management-233d/supstonad/su-se-bakover-datapakker-fritekstavslag-job:${{ github.sha }}
       cluster: dev-fss
-      vars: datapakker/fritekstAvslag/nais-dev.json
-      resource: datapakker/fritekstAvslag/nais.yml
+      resource: datapakker/fritekstAvslag/.nais/dev.yaml
 
   deploy_to_prod_soknad:
     name: Deploy to prod
@@ -83,8 +81,7 @@ jobs:
     with:
       var: image=europe-north1-docker.pkg.dev/nais-management-233d/supstonad/su-se-bakover-datapakker-soknad-job:${{ github.sha }}
       cluster: prod-fss
-      vars: datapakker/soknad/nais-prod.json
-      resource: datapakker/soknad/nais.yml
+      resource: datapakker/soknad/.nais/prod.yaml
 
   deploy_to_prod_fritekstAvslag:
     name: Deploy to prod
@@ -96,5 +93,4 @@ jobs:
     with:
       var: image=europe-north1-docker.pkg.dev/nais-management-233d/supstonad/su-se-bakover-datapakker-fritekstavslag-job:${{ github.sha }}
       cluster: prod-fss
-      vars: datapakker/fritekstAvslag/nais-prod.json
-      resource: datapakker/fritekstAvslag/nais.yml
+      resource: datapakker/fritekstAvslag/.nais/prod.yaml

.github/workflows/reusable-deploy.yml

@@ -16,11 +16,6 @@ on:
         required: true
         description: 'Required. Path to nais.yml'
         type: string
-      vars:
-        required: false
-        description: 'Optional, default empty, path to nais-dev.json/nais-prod.json'
-        default: ''
-        type: string
 
 permissions: {}
 

.github/workflows/su-se-bakover-branch-deploy.yml

@@ -54,6 +54,5 @@ jobs:
     uses: navikt/su-se-bakover/.github/workflows/reusable-deploy.yml@master
     with:
       cluster: dev-fss
-      vars: nais-dev.json
       var: image=europe-north1-docker.pkg.dev/nais-management-233d/supstonad/su-se-bakover-app:${{ github.sha }}
       resource: .nais/dev.yaml

.github/workflows/su-se-bakover-master.yml

@@ -59,7 +59,6 @@ jobs:
     uses: navikt/su-se-bakover/.github/workflows/reusable-deploy.yml@master
     with:
       cluster: dev-fss
-      vars: nais-dev.json
       var: image=europe-north1-docker.pkg.dev/nais-management-233d/supstonad/su-se-bakover-app:${{ github.sha }}
       resource: .nais/dev.yaml
 

.github/workflows/su-se-bakover-prod-deploy.yml

@@ -16,5 +16,4 @@ jobs:
     with:
       var: image=europe-north1-docker.pkg.dev/nais-management-233d/supstonad/su-se-bakover-app:${{ github.sha }}
       cluster: prod-fss
-      vars: nais-prod.json
       resource: .nais/prod.yaml

README.md

@@ -255,12 +255,12 @@ prod: https://alertmanager.prod-fss.nav.cloud.nais.io/#/alerts
 
 Dersom man ønsker å inspisere meldingene i preprod-miljøet:
 
-* Via VmWare (utvikler image): http://a34drvw006.devillo.no:8000/ navn på hostname/lø ligger i `nais-dev.json`.
+* Via VmWare (utvikler image): http://a34drvw006.devillo.no:8000/ navn på hostname/lø ligger i `.nais/dev.yaml`.
 
 I preprod: Dersom man ønsker å slette/endre/legge til meldinger eller flytte fra backoff til hovedkø, kan man
 bruke https://github.com/jmstoolbox/jmstoolbox
 
-* Finn hostname/kø i `nais-dev.json`.
+* Finn hostname/kø i `.nais/dev.yaml`.
 * Ping hostname for å få IP `10.53.17.118`
 * Finn username/password i vault: https://vault.adeo.no/ui/vault/secrets/serviceuser/show/dev/srvsupstonad
 * Legg inn channel: `Q1_SU_SE_BAKOVER`
@@ -276,7 +276,7 @@ Denne vil opprette PRs en gang i uka på dependencies som ikke kjører siste ver
 ## Koble til database i preprod/prod
 
 1. Via naisdevice (fungerer kun med nav image) eller via vmware
-2. Finner settings i `nais-dev.json` og `nais-prod.json`.
+2. Finner settings i `.nais/dev.yaml` og `.nais/prod.yaml`.
 3. Hent brukernavn/passord på https://vault.adeo.no/ui/vault/secrets (login med oidc). Åpne konsollen og velg ønsket
    rolle:
     1. `vault read postgresql/preprod-fss/creds/supstonad-db-15-dev-readonly`

datapakker/fritekstAvslag/nais.yml → datapakker/fritekstAvslag/.nais/dev.yaml

@@ -14,10 +14,14 @@ spec:
     enabled: true
     paths:
       - mountPath: /var/run/secrets/nais.io/vault
-        kvPath: /secret/supstonad/{{ secret_env }}
+        kvPath: /secret/supstonad/dev
   webproxy: true
   env:
-     {{#each env}}
-      - name: {{@key}}
-        value: "{{this}}"
-     {{/each}}
+    - name: GCP_PROJECT
+      value: "supstonad-dev-0e48"
+    - name: VAULT_MOUNTPATH
+      value: "postgresql/preprod-fss/"
+    - name: DATABASE_NAME
+      value: "supstonad-db-15-dev"
+    - name: DATABASE_JDBC_URL
+      value: "jdbc:postgresql://b27dbvl030.preprod.local:5432/supstonad-db-15-dev"

datapakker/fritekstAvslag/.nais/prod.yaml

@@ -0,0 +1,26 @@
+apiVersion: nais.io/v1
+kind: Naisjob
+metadata:
+  labels:
+    team: supstonad
+  name: su-datapakke-soknad
+  namespace: supstonad
+spec:
+  schedule: '1 1 * * *'
+  image: {{ image }}
+  concurrencyPolicy: Replace
+  vault:
+    enabled: true
+    paths:
+      - mountPath: /var/run/secrets/nais.io/vault
+        kvPath: /secret/supstonad/prod
+  webproxy: true
+  env:
+    - name: GCP_PROJECT
+      value: "supstonad-prod-9599"
+    - name: VAULT_MOUNTPATH
+      value: "postgresql/prod-fss/"
+    - name: DATABASE_NAME
+      value: "supstonad-db-15-prod"
+    - name: DATABASE_JDBC_URL
+      value: "jdbc:postgresql://A01DBVL036.adeo.no:5432/supstonad-db-15-prod"

datapakker/soknad/.nais/dev.yaml

@@ -0,0 +1,27 @@
+apiVersion: nais.io/v1
+kind: Naisjob
+metadata:
+  labels:
+    team: supstonad
+  name: su-datapakke-fritekst
+  namespace: supstonad
+spec:
+  # Run every 1st day of the month at 00:15
+  schedule: '15 0 1 * *'
+  image: {{ image }}
+  concurrencyPolicy: Replace
+  vault:
+    enabled: true
+    paths:
+      - mountPath: /var/run/secrets/nais.io/vault
+        kvPath: /secret/supstonad/dev
+  webproxy: true
+  env:
+    - name: GCP_PROJECT
+      value: "supstonad-dev-0e48"
+    - name: VAULT_MOUNTPATH
+      value: "postgresql/preprod-fss/"
+    - name: DATABASE_NAME
+      value: "supstonad-db-15-dev"
+    - name: DATABASE_JDBC_URL
+      value: "jdbc:postgresql://b27dbvl030.preprod.local:5432/supstonad-db-15-dev"

datapakker/soknad/.nais/prod.yaml

@@ -0,0 +1,26 @@
+apiVersion: nais.io/v1
+kind: Naisjob
+metadata:
+  labels:
+    team: supstonad
+  name: su-datapakke-soknad
+  namespace: supstonad
+spec:
+  schedule: '1 1 * * *'
+  image: {{ image }}
+  concurrencyPolicy: Replace
+  vault:
+    enabled: true
+    paths:
+      - mountPath: /var/run/secrets/nais.io/vault
+        kvPath: /secret/supstonad/prod
+  webproxy: true
+  env:
+    - name: GCP_PROJECT
+      value: "supstonad-prod-9599"
+    - name: VAULT_MOUNTPATH
+      value: "postgresql/prod-fss/"
+    - name: DATABASE_NAME
+      value: "supstonad-db-15-prod"
+    - name: DATABASE_JDBC_URL
+      value: "jdbc:postgresql://A01DBVL036.adeo.no:5432/supstonad-db-15-prod"