Merge pull request #907 from navikt/move-nais-files-to-root

Move nais files to root
navikt · Nov 7, 2023 · e3bac87 · e3bac87
2 parents 2867032 + 65dec26
commit e3bac87
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/alert-deploy.yaml b/.github/workflows/alert-deploy.yaml
@@ -6,9 +6,9 @@ on:
     branches:
       - master
     paths:
-      - 'packages/bygger/.nais/alerts.yaml'
-      - 'packages/bygger/.nais/preprod.yaml'
-      - 'packages/bygger/.nais/prod.yaml'
+      - '.nais/bygger/alerts.yaml'
+      - '.nais/bygger/preprod.yaml'
+      - '.nais/bygger/prod.yaml'
       - '.github/workflows/alert-deploy.yaml'
 jobs:
   preprod-deploy:
@@ -22,8 +22,8 @@ jobs:
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
-          RESOURCE: './packages/bygger/.nais/alerts.yaml'
-          VARS: './packages/bygger/.nais/preprod.yaml'
+          RESOURCE: './.nais/bygger/alerts.yaml'
+          VARS: './.nais/bygger/preprod.yaml'
 
   prod-deploy:
     name: Deploy to prod
@@ -36,5 +36,5 @@ jobs:
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
-          RESOURCE: './packages/bygger/.nais/alerts.yaml'
-          VARS: './packages/bygger/.nais/prod.yaml'
+          RESOURCE: './.nais/bygger/alerts.yaml'
+          VARS: './.nais/bygger/prod.yaml'
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -136,8 +136,8 @@ jobs:
         env:
           APIKEY: '${{ secrets.NAIS_DEPLOY_APIKEY }}'
           CLUSTER: 'prod-gcp'
-          RESOURCE: './packages/bygger/.nais/nais.yaml'
-          VARS: './packages/bygger/.nais/prod.yaml'
+          RESOURCE: './.nais/bygger/nais.yaml'
+          VARS: './.nais/bygger/prod.yaml'
           VAR: 'image=${{ needs.package-and-push-bygger.outputs.image }}'
 
   trigger-deploy-fyllut-to-dev:

diff --git a/.github/workflows/manual-deploy.yaml b/.github/workflows/manual-deploy.yaml
@@ -65,8 +65,8 @@ jobs:
         env:
           APIKEY: '${{ secrets.NAIS_DEPLOY_APIKEY }}'
           CLUSTER: 'dev-gcp'
-          RESOURCE: './packages/bygger/.nais/nais.yaml'
-          VARS: './packages/bygger/.nais/${{ github.event.inputs.environment }}.yaml'
+          RESOURCE: './.nais/bygger/nais.yaml'
+          VARS: './.nais/bygger/${{ github.event.inputs.environment }}.yaml'
           VAR: image=${{ needs.package-and-push-bygger.outputs.image }}
 
   package-and-push-fyllut:
@@ -119,6 +119,6 @@ jobs:
         env:
           APIKEY: '${{ secrets.NAIS_DEPLOY_APIKEY }}'
           CLUSTER: 'dev-gcp'
-          RESOURCE: './packages/fyllut/.nais/config.yaml'
-          VARS: './packages/fyllut/.nais/${{ github.event.inputs.environment }}.yaml'
+          RESOURCE: './.nais/fyllut/config.yaml'
+          VARS: './.nais/fyllut/${{ github.event.inputs.environment }}.yaml'
           VAR: image=${{ needs.package-and-push-fyllut.outputs.image }}
diff --git a/packages/bygger/.nais/alerts.yaml → .nais/bygger/alerts.yaml b/packages/bygger/.nais/alerts.yaml → .nais/bygger/alerts.yaml
diff --git a/packages/bygger/.nais/nais.yaml → .nais/bygger/nais.yaml b/packages/bygger/.nais/nais.yaml → .nais/bygger/nais.yaml
diff --git a/packages/bygger/.nais/preprod-alt.yaml → .nais/bygger/preprod-alt.yaml b/packages/bygger/.nais/preprod-alt.yaml → .nais/bygger/preprod-alt.yaml
diff --git a/packages/bygger/.nais/preprod.yaml → .nais/bygger/preprod.yaml b/packages/bygger/.nais/preprod.yaml → .nais/bygger/preprod.yaml
diff --git a/packages/bygger/.nais/prod.yaml → .nais/bygger/prod.yaml b/packages/bygger/.nais/prod.yaml → .nais/bygger/prod.yaml
diff --git a/packages/fyllut/.nais/config.yaml → .nais/fyllut/config.yaml b/packages/fyllut/.nais/config.yaml → .nais/fyllut/config.yaml
diff --git a/packages/fyllut/.nais/dev-delingslenke.yaml → .nais/fyllut/dev-delingslenke.yaml b/packages/fyllut/.nais/dev-delingslenke.yaml → .nais/fyllut/dev-delingslenke.yaml
diff --git a/packages/fyllut/.nais/dev.yaml → .nais/fyllut/dev.yaml b/packages/fyllut/.nais/dev.yaml → .nais/fyllut/dev.yaml
diff --git a/packages/fyllut/.nais/preprod-alt.yaml → .nais/fyllut/preprod-alt.yaml b/packages/fyllut/.nais/preprod-alt.yaml → .nais/fyllut/preprod-alt.yaml
diff --git a/packages/fyllut/.nais/preprod.yaml → .nais/fyllut/preprod.yaml b/packages/fyllut/.nais/preprod.yaml → .nais/fyllut/preprod.yaml
diff --git a/packages/fyllut/.nais/prod.yaml → .nais/fyllut/prod.yaml b/packages/fyllut/.nais/prod.yaml → .nais/fyllut/prod.yaml