From fe8dac3978b68812772e3887b7fa7872ccc57a57 Mon Sep 17 00:00:00 2001 From: Kirill Plis Date: Wed, 29 Jan 2025 14:58:06 +0100 Subject: [PATCH 1/4] feat: add conditional commit step for playground values --- .github/workflows/kubernetes.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kubernetes.yaml b/.github/workflows/kubernetes.yaml index b572fd2..b4f9d98 100644 --- a/.github/workflows/kubernetes.yaml +++ b/.github/workflows/kubernetes.yaml @@ -204,18 +204,23 @@ jobs: repository: ${{ inputs.deploymentRepoURL }} path: remote token: ${{ secrets.repoAccessToken }} - ref: main + ref: INF-2226/migrate-playground # Legacy - if: github.event.deployment.payload.schemaVersion != 'v2' name: Update ${{ github.event.deployment.payload.name }} version for ${{ github.event.deployment.environment }} values uses: mikefarah/yq@v4.30.8 with: cmd: yq '(.${{ github.event.deployment.payload.chart }}.image.tag = "${{ needs.initialize.outputs.version }}")' -i remote/${{ inputs.deploymentRepoPath }}/${{ github.event.deployment.payload.namespace }}/${{ github.event.deployment.payload.env }}/${{ github.event.deployment.payload.name }}/${{ inputs.versionFilePath }} - - if: github.event.deployment.payload.schemaVersion == 'v2' + - if: github.event.deployment.payload.schemaVersion == 'v2' && github.event.deployment.payload.env != "playground" name: Update ${{ github.event.deployment.payload.name }} version for ${{ github.event.deployment.environment }} values uses: mikefarah/yq@v4.30.8 with: cmd: yq '(.${{ github.event.deployment.payload.kubernetes.versionKey }} = "${{ needs.initialize.outputs.version }}")' -i remote/${{ inputs.deploymentRepoPath }}/${{ github.event.deployment.payload.kubernetes.namespace }}/${{ github.event.deployment.payload.env }}/${{ github.event.deployment.payload.name }}/${{ inputs.versionFilePath }} + - if: github.event.deployment.payload.schemaVersion == 'v2' && github.event.deployment.payload.env == "playground" + name: Update ${{ github.event.deployment.payload.name }} version for ${{ github.event.deployment.environment }} values + uses: mikefarah/yq@v4.30.8 + with: + cmd: yq '(.${{ github.event.deployment.payload.kubernetes.versionKey }} = "${{ needs.initialize.outputs.version }}")' -i remote/${{ inputs.deploymentRepoPath }}/${{ github.event.deployment.payload.kubernetes.namespace }}/prod/${{ github.event.deployment.payload.name }}/values.playground.yaml - name: Commit deployment file run: | cd remote From 87891cd996ed4e7918741241f3eb47a8a63b6fda Mon Sep 17 00:00:00 2001 From: Kirill Plis Date: Wed, 29 Jan 2025 15:05:10 +0100 Subject: [PATCH 2/4] use single quotes instead of a double --- .github/workflows/kubernetes.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kubernetes.yaml b/.github/workflows/kubernetes.yaml index b4f9d98..9921c57 100644 --- a/.github/workflows/kubernetes.yaml +++ b/.github/workflows/kubernetes.yaml @@ -211,12 +211,12 @@ jobs: uses: mikefarah/yq@v4.30.8 with: cmd: yq '(.${{ github.event.deployment.payload.chart }}.image.tag = "${{ needs.initialize.outputs.version }}")' -i remote/${{ inputs.deploymentRepoPath }}/${{ github.event.deployment.payload.namespace }}/${{ github.event.deployment.payload.env }}/${{ github.event.deployment.payload.name }}/${{ inputs.versionFilePath }} - - if: github.event.deployment.payload.schemaVersion == 'v2' && github.event.deployment.payload.env != "playground" + - if: github.event.deployment.payload.schemaVersion == 'v2' && github.event.deployment.payload.env != 'playground' name: Update ${{ github.event.deployment.payload.name }} version for ${{ github.event.deployment.environment }} values uses: mikefarah/yq@v4.30.8 with: cmd: yq '(.${{ github.event.deployment.payload.kubernetes.versionKey }} = "${{ needs.initialize.outputs.version }}")' -i remote/${{ inputs.deploymentRepoPath }}/${{ github.event.deployment.payload.kubernetes.namespace }}/${{ github.event.deployment.payload.env }}/${{ github.event.deployment.payload.name }}/${{ inputs.versionFilePath }} - - if: github.event.deployment.payload.schemaVersion == 'v2' && github.event.deployment.payload.env == "playground" + - if: github.event.deployment.payload.schemaVersion == 'v2' && github.event.deployment.payload.env == 'playground' name: Update ${{ github.event.deployment.payload.name }} version for ${{ github.event.deployment.environment }} values uses: mikefarah/yq@v4.30.8 with: From 636b6349149f54eecf4a2b15481fa066b9c1e183 Mon Sep 17 00:00:00 2001 From: Kirill Plis Date: Thu, 30 Jan 2025 12:19:22 +0100 Subject: [PATCH 3/4] set branch --- .github/workflows/kubernetes.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kubernetes.yaml b/.github/workflows/kubernetes.yaml index 9921c57..3fa5473 100644 --- a/.github/workflows/kubernetes.yaml +++ b/.github/workflows/kubernetes.yaml @@ -234,7 +234,7 @@ jobs: repository: ${{ inputs.deploymentRepoURL }} directory: remote github_token: ${{ secrets.repoAccessToken }} - branch: main + branch: INF-2226/migrate-playground force: true - if: success() name: Successful ${{ github.event.deployment.payload.name }} deployment From 0c48f126354f0c69553f2a7d7af78f12f9560acb Mon Sep 17 00:00:00 2001 From: Kirill Plis Date: Thu, 30 Jan 2025 12:39:25 +0100 Subject: [PATCH 4/4] set branches to main --- .github/workflows/kubernetes.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/kubernetes.yaml b/.github/workflows/kubernetes.yaml index 3fa5473..c7c90ef 100644 --- a/.github/workflows/kubernetes.yaml +++ b/.github/workflows/kubernetes.yaml @@ -204,7 +204,7 @@ jobs: repository: ${{ inputs.deploymentRepoURL }} path: remote token: ${{ secrets.repoAccessToken }} - ref: INF-2226/migrate-playground + ref: main # Legacy - if: github.event.deployment.payload.schemaVersion != 'v2' name: Update ${{ github.event.deployment.payload.name }} version for ${{ github.event.deployment.environment }} values @@ -234,7 +234,7 @@ jobs: repository: ${{ inputs.deploymentRepoURL }} directory: remote github_token: ${{ secrets.repoAccessToken }} - branch: INF-2226/migrate-playground + branch: main force: true - if: success() name: Successful ${{ github.event.deployment.payload.name }} deployment