Skip to content

Commit f029651

Browse files
committed
feat: Add konflux-kargo-bot ability to automerge kargo app in stage
Signed-off-by: flacatus <flacatus@redhat.com>
1 parent 02bb91a commit f029651

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

components/kargo/OWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,9 @@ approvers:
55
- psturc
66
- p8r-the-gr8
77
- flacatus
8+
9+
reviewers:
10+
11+
- psturc
12+
- p8r-the-gr8
13+
- flacatus

components/kargo/internal-production/projects/kargo-infra-common/base/stage-ring-1-staging.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,20 @@ spec:
8181
- staging
8282
- automated-promotion
8383
- component/${{ vars.component }}
84-
- uses: git-wait-for-pr
84+
- uses: git-merge-pr
8585
if: ${{ status('open-pr') != 'Errored' }}
86-
as: wait-for-pr
86+
as: merge-pr
8787
config:
8888
repoURL: ${{ vars.repoURL }}
8989
prNumber: ${{ outputs['open-pr'].pr.id }}
90+
wait: true
9091
- uses: argocd-update
92+
if: ${{ status('open-pr') != 'Errored' }}
9193
as: argocd-update
9294
config:
9395
apps:
9496
- name: ${{ vars.component }}-in-cluster
9597
namespace: argocd-local
9698
sources:
9799
- repoURL: ${{ vars.repoURL }}
98-
desiredRevision: ${{ outputs['wait-for-pr'].commit }}
100+
desiredRevision: ${{ outputs['merge-pr'].commit }}

components/kargo/internal-production/projects/kargo-infra-common/base/stage-ring-2-production.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ spec:
7878
repoURL: ${{ vars.repoURL }}
7979
prNumber: ${{ outputs['open-pr'].pr.id }}
8080
- uses: argocd-update
81+
if: ${{ status('open-pr') != 'Errored' }}
8182
as: argocd-update
8283
config:
8384
apps:

0 commit comments

Comments
 (0)