From 0818c0245fc1100ce751c1ca93548bfbf62c7d96 Mon Sep 17 00:00:00 2001 From: stakater-nordmart-bot Date: Fri, 6 Sep 2024 16:18:24 +0200 Subject: [PATCH 1/5] Add labels in backup CR --- application/templates/backup.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/templates/backup.yaml b/application/templates/backup.yaml index 76b93ad2..3fcdb05d 100644 --- a/application/templates/backup.yaml +++ b/application/templates/backup.yaml @@ -4,6 +4,8 @@ kind: Backup metadata: name: {{ printf "%s-backup" .Values.applicationName | trunc 63 | quote }} namespace: {{ .Values.backup.namespace | default ( include "application.namespace" . ) | quote }} + labels: + {{- include "application.labels" . | nindent 4 }} spec: labelSelector: matchLabels: From ab8021d2972024e7b42a3296e64d18c95fc14a57 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn Date: Fri, 6 Sep 2024 19:34:34 +0200 Subject: [PATCH 2/5] update --- .github/workflows/push.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 41d8291c..9265d7ca 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -1,6 +1,6 @@ name: Push -concurrency: +concurrency: group: push_on_master cancel-in-progress: false @@ -10,7 +10,7 @@ on: - master paths-ignore: - 'README.md' - - 'LICENSE' + - 'LICENSE' env: CHART_NAME: "application" @@ -20,7 +20,7 @@ jobs: name: helm-dry-run if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')" runs-on: stakater-nonprod - + steps: - name: Check out code uses: actions/checkout@v4 @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-latest needs: - helm-dry-run - + steps: - name: Check out code uses: actions/checkout@v4 @@ -118,11 +118,11 @@ jobs: branch: master repository: stakater-charts target_dir: docs - token: ${{ secrets.STAKATER_GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} charts_dir: . charts_url: https://stakater.github.io/stakater-charts owner: stakater - linting: off + linting: off commit_username: stakater-user commit_email: stakater@gmail.com @@ -131,21 +131,21 @@ jobs: run: | git config --local user.email "stakater@gmail.com" git config --local user.name "stakater-user" - git status + git status git add application/Chart.yaml - git commit -m "[skip-ci] Update artifacts" + git commit -m "[skip-ci] Update artifacts" # Push Chart.yaml with Updated Version - name: Push changes uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.STAKATER_GITHUB_TOKEN }} + github_token: ${{ secrets.GITHUB_TOKEN }} branch: ${{ inputs.RELEASE_BRANCH }} - + - name: Push Latest Tag uses: anothrNick/github-tag-action@1.70.0 env: - GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} WITH_V: true DEFAULT_BUMP: patch From 41cd03fc26cc647c07b0a9be77b23b70e392cd23 Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn <6355577+karl-johan-grahn@users.noreply.github.com> Date: Sun, 8 Sep 2024 23:28:28 +0200 Subject: [PATCH 3/5] Update token (#345) --- .github/workflows/push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 9265d7ca..a7e00940 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -118,7 +118,7 @@ jobs: branch: master repository: stakater-charts target_dir: docs - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.PUBLISH_TOKEN }} charts_dir: . charts_url: https://stakater.github.io/stakater-charts owner: stakater From 4f068659c68fa619f18204b2cba8552837515ffc Mon Sep 17 00:00:00 2001 From: Karl Johan Grahn <6355577+karl-johan-grahn@users.noreply.github.com> Date: Sun, 8 Sep 2024 23:45:28 +0200 Subject: [PATCH 4/5] Update push steps to another token with the required permissions (#346) --- .github/workflows/push.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index a7e00940..756a347d 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -139,13 +139,13 @@ jobs: - name: Push changes uses: ad-m/github-push-action@master with: - github_token: ${{ secrets.GITHUB_TOKEN }} + github_token: ${{ secrets.PUBLISH_TOKEN }} branch: ${{ inputs.RELEASE_BRANCH }} - name: Push Latest Tag uses: anothrNick/github-tag-action@1.70.0 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }} WITH_V: true DEFAULT_BUMP: patch From fa451260afc659232450342ce5652bb866e83476 Mon Sep 17 00:00:00 2001 From: stakater-user Date: Sun, 8 Sep 2024 21:46:48 +0000 Subject: [PATCH 5/5] [skip-ci] Update artifacts --- application/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Chart.yaml b/application/Chart.yaml index 1d4bf919..cef6bc25 100644 --- a/application/Chart.yaml +++ b/application/Chart.yaml @@ -6,7 +6,7 @@ type: application # Helm chart Version -version: 4.2.6 +version: 4.2.7 keywords: