Skip to content

Commit a1df970

Browse files
Merge branch 'kubernetes:main' into autobump
2 parents a77c4de + 4b601a4 commit a1df970

12 files changed

Lines changed: 216 additions & 500 deletions

File tree

.github/workflows/argocd-diff.yaml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: Argo CD Diff Preview
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- 'kubernetes/**' # All Kubernetes manifests owned by ArgoCD live here
7+
branches:
8+
- main
9+
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
with:
19+
path: pull-request
20+
21+
- uses: actions/checkout@v4
22+
with:
23+
ref: main
24+
path: main
25+
26+
- name: Generate Diff
27+
run: |
28+
docker run \
29+
--network=host \
30+
-v /var/run/docker.sock:/var/run/docker.sock \
31+
-v $(pwd)/main:/base-branch \
32+
-v $(pwd)/pull-request:/target-branch \
33+
-v $(pwd)/output:/output \
34+
-e TARGET_BRANCH=refs/pull/${{ github.event.number }}/merge \
35+
-e REPO=${{ github.repository }} \
36+
dagandersen/argocd-diff-preview:v0.1.19
37+
38+
- name: Post diff as comment
39+
env:
40+
GH_TOKEN: ${{ secrets.K8S_INFRA_CI_BOT_PR_TOKEN }}
41+
run: |
42+
gh pr comment ${{ github.event.number }} --repo ${{ github.repository }} --body-file output/diff.md --edit-last || \
43+
gh pr comment ${{ github.event.number }} --repo ${{ github.repository }} --body-file output/diff.md

infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources/kubernetes-external-secrets/kubernetes-external-secrets-serviceaccounts.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources/kubernetes-external-secrets/kubernetes-external-secrets.yaml

Lines changed: 0 additions & 60 deletions
This file was deleted.

infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources/kubernetes-external-secrets/kubernetes-external-secrets_crd.yaml

Lines changed: 0 additions & 206 deletions
This file was deleted.

infra/gcp/terraform/k8s-infra-prow-build/prow-build/resources/kubernetes-external-secrets/kubernetes-external-secrets_rbac.yaml

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)