From 924489019b1a67d2b427f84733655df8b7088666 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Steffensen Date: Fri, 10 May 2024 08:11:30 +0200 Subject: [PATCH] auto merge the pr as well --- .github/workflows/auto-approve.yml | 7 ++++++- README.md | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 00d9d5a..0a93d73 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -14,8 +14,13 @@ jobs: uses: dependabot/fetch-metadata@v2 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - - name: Approve a PR + - name: Approve PR run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GH_TOKEN: ${{secrets.GITHUB_TOKEN}} + - name: Merge PR + run: gh pr merge "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file diff --git a/README.md b/README.md index 796ab79..e6dc60f 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Points to the mounted whitelist file. ### Whitelist format -``` +```txt name1=ip1 name2=ip2 ... @@ -50,8 +50,8 @@ The `deploy/` folder contains all resources to get up and running except the sec `./setup-kind` prepares a cluster where the functionality can be tested by running: -``` +```bash kubectl apply -f deploy/admission-webhook.yaml && kubectl apply -f deploy/test/ingress-blue.yaml ``` -and then inspecting the ingress resource afterwards. \ No newline at end of file +and then inspecting the ingress resource afterwards.