From 2c8e1c5207a8efd7a46e3464954e597e4210ef0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20R=C3=B8ed=20Hestvik?= Date: Mon, 6 Nov 2023 14:44:02 +0100 Subject: [PATCH 1/2] Move nais config for fyllut --- .github/workflows/manual-deploy.yaml | 4 ++-- {packages/fyllut/.nais => .nais/fyllut}/config.yaml | 0 {packages/fyllut/.nais => .nais/fyllut}/dev-delingslenke.yaml | 0 {packages/fyllut/.nais => .nais/fyllut}/dev.yaml | 0 {packages/fyllut/.nais => .nais/fyllut}/preprod-alt.yaml | 0 {packages/fyllut/.nais => .nais/fyllut}/preprod.yaml | 0 {packages/fyllut/.nais => .nais/fyllut}/prod.yaml | 0 7 files changed, 2 insertions(+), 2 deletions(-) rename {packages/fyllut/.nais => .nais/fyllut}/config.yaml (100%) rename {packages/fyllut/.nais => .nais/fyllut}/dev-delingslenke.yaml (100%) rename {packages/fyllut/.nais => .nais/fyllut}/dev.yaml (100%) rename {packages/fyllut/.nais => .nais/fyllut}/preprod-alt.yaml (100%) rename {packages/fyllut/.nais => .nais/fyllut}/preprod.yaml (100%) rename {packages/fyllut/.nais => .nais/fyllut}/prod.yaml (100%) diff --git a/.github/workflows/manual-deploy.yaml b/.github/workflows/manual-deploy.yaml index e0d577b03..2e5de7306 100644 --- a/.github/workflows/manual-deploy.yaml +++ b/.github/workflows/manual-deploy.yaml @@ -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/fyllut/.nais/config.yaml b/.nais/fyllut/config.yaml similarity index 100% rename from packages/fyllut/.nais/config.yaml rename to .nais/fyllut/config.yaml diff --git a/packages/fyllut/.nais/dev-delingslenke.yaml b/.nais/fyllut/dev-delingslenke.yaml similarity index 100% rename from packages/fyllut/.nais/dev-delingslenke.yaml rename to .nais/fyllut/dev-delingslenke.yaml diff --git a/packages/fyllut/.nais/dev.yaml b/.nais/fyllut/dev.yaml similarity index 100% rename from packages/fyllut/.nais/dev.yaml rename to .nais/fyllut/dev.yaml diff --git a/packages/fyllut/.nais/preprod-alt.yaml b/.nais/fyllut/preprod-alt.yaml similarity index 100% rename from packages/fyllut/.nais/preprod-alt.yaml rename to .nais/fyllut/preprod-alt.yaml diff --git a/packages/fyllut/.nais/preprod.yaml b/.nais/fyllut/preprod.yaml similarity index 100% rename from packages/fyllut/.nais/preprod.yaml rename to .nais/fyllut/preprod.yaml diff --git a/packages/fyllut/.nais/prod.yaml b/.nais/fyllut/prod.yaml similarity index 100% rename from packages/fyllut/.nais/prod.yaml rename to .nais/fyllut/prod.yaml From 65dec267adcb1a65c7703709103cb2e797f71962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20R=C3=B8ed=20Hestvik?= Date: Mon, 6 Nov 2023 14:48:21 +0100 Subject: [PATCH 2/2] Move nais config for bygger --- .github/workflows/alert-deploy.yaml | 14 +++++++------- .github/workflows/build-and-test.yaml | 4 ++-- .github/workflows/manual-deploy.yaml | 4 ++-- .../bygger/.nais => .nais/bygger}/alerts.yaml | 0 {packages/bygger/.nais => .nais/bygger}/nais.yaml | 0 .../bygger/.nais => .nais/bygger}/preprod-alt.yaml | 0 .../bygger/.nais => .nais/bygger}/preprod.yaml | 0 {packages/bygger/.nais => .nais/bygger}/prod.yaml | 0 8 files changed, 11 insertions(+), 11 deletions(-) rename {packages/bygger/.nais => .nais/bygger}/alerts.yaml (100%) rename {packages/bygger/.nais => .nais/bygger}/nais.yaml (100%) rename {packages/bygger/.nais => .nais/bygger}/preprod-alt.yaml (100%) rename {packages/bygger/.nais => .nais/bygger}/preprod.yaml (100%) rename {packages/bygger/.nais => .nais/bygger}/prod.yaml (100%) diff --git a/.github/workflows/alert-deploy.yaml b/.github/workflows/alert-deploy.yaml index 109d994f9..aff77f8cb 100644 --- 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 index 224286b75..e5461ae9c 100644 --- 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 index 2e5de7306..740c3e0c6 100644 --- 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: diff --git a/packages/bygger/.nais/alerts.yaml b/.nais/bygger/alerts.yaml similarity index 100% rename from packages/bygger/.nais/alerts.yaml rename to .nais/bygger/alerts.yaml diff --git a/packages/bygger/.nais/nais.yaml b/.nais/bygger/nais.yaml similarity index 100% rename from packages/bygger/.nais/nais.yaml rename to .nais/bygger/nais.yaml diff --git a/packages/bygger/.nais/preprod-alt.yaml b/.nais/bygger/preprod-alt.yaml similarity index 100% rename from packages/bygger/.nais/preprod-alt.yaml rename to .nais/bygger/preprod-alt.yaml diff --git a/packages/bygger/.nais/preprod.yaml b/.nais/bygger/preprod.yaml similarity index 100% rename from packages/bygger/.nais/preprod.yaml rename to .nais/bygger/preprod.yaml diff --git a/packages/bygger/.nais/prod.yaml b/.nais/bygger/prod.yaml similarity index 100% rename from packages/bygger/.nais/prod.yaml rename to .nais/bygger/prod.yaml