Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add override for proxy_intercept_errors when using Custom HTTP Errors #9411

Closed
wants to merge 60 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
6f9b17d
added proxy-intercept-errors config option
chriss-de Dec 14, 2022
3ab85e6
Merge branch 'kubernetes:main' into pie
chriss-de Dec 14, 2022
651b846
Bump github.com/onsi/ginkgo/v2 from 2.5.1 to 2.6.0 (#9398)
dependabot[bot] Dec 17, 2022
a0dbbd2
Bump github.com/onsi/ginkgo/v2 from 2.5.1 to 2.6.0 (#9408)
SaumyaBhushan Dec 17, 2022
17d8266
Bump github.com/prometheus/common from 0.37.0 to 0.39.0 (#9416)
dependabot[bot] Dec 17, 2022
e3e0d9c
start upgrade to golang 1.19.4 and alpine 3.17.0 (#9417)
strongjz Dec 19, 2022
690969b
patch otel docker file
Dec 20, 2022
58948ac
gcloud build is timing out
Dec 20, 2022
1889131
Merge pull request #9429 from strongjz/update-timeouts
strongjz Dec 20, 2022
81d40b7
Merge pull request #9428 from strongjz/patch-otel
strongjz Dec 20, 2022
6070c8b
Bump ossf/scorecard-action from 2.0.6 to 2.1.0 (#9422)
dependabot[bot] Dec 20, 2022
07db499
Bump actions/dependency-review-action from 3.0.1 to 3.0.2 (#9424)
dependabot[bot] Dec 20, 2022
bd283b6
Bump goreleaser/goreleaser-action from 3.2.0 to 4.1.0 (#9426)
dependabot[bot] Dec 20, 2022
87146d6
Bump actions/checkout from 3.1.0 to 3.2.0 (#9425)
dependabot[bot] Dec 20, 2022
787ea74
cleanup: remove ioutil for new go version (#9427)
my-git9 Dec 20, 2022
7ef5e1a
Bump github/codeql-action from 2.1.36 to 2.1.37 (#9423)
dependabot[bot] Dec 20, 2022
cd80cb6
Bump github.com/onsi/ginkgo/v2 from 2.6.0 to 2.6.1 (#9421)
dependabot[bot] Dec 20, 2022
c648595
update the nginx run container for alpine:3.17.0 (#9430)
strongjz Dec 21, 2022
6ffaef3
Bump github.com/onsi/ginkgo/v2 from 2.6.0 to 2.6.1 (#9432)
SaumyaBhushan Dec 21, 2022
a667c93
Bump golang.org/x/crypto from 0.3.0 to 0.4.0 (#9397)
dependabot[bot] Dec 21, 2022
6ed6a76
HPA: Add `controller.autoscaling.annotations` to `values.yaml`. (#9253)
Gacko Dec 21, 2022
f685c9b
force rebuild for curl cve
Dec 21, 2022
21aa7f5
Merge pull request #9434 from strongjz/go-1.19.4
strongjz Dec 21, 2022
bb60e02
CI updates (#9440)
cpanato Dec 22, 2022
7206f48
avoid builds and tests for non-code changes (#9392)
SaumyaBhushan Dec 22, 2022
30d6f7e
test the new e2e test images (#9444)
strongjz Dec 24, 2022
c50a9e9
upgrade nginx base image (#9436)
strongjz Dec 24, 2022
336f252
start release 1.5.2 (#9445)
strongjz Dec 24, 2022
26507e0
with chroot now it can take longer than 30 mins
Dec 24, 2022
9c73dfb
Merge pull request #9446 from strongjz/update-build
strongjz Dec 24, 2022
d2ba8e6
Reset tag to restart 1.5.2 release
strongjz Dec 26, 2022
69b3e7e
Update command line arguments documentation (#9224)
alebsys Dec 26, 2022
e0733c7
restart 1.5.2 release process (#9450)
strongjz Dec 26, 2022
a8f4f29
updated the link in RELEASE.md file (#9456)
SaumyaBhushan Dec 28, 2022
fe2bf5c
Add sslpassthrough tests (#9457)
rikatz Dec 28, 2022
2db8552
Automated Release Controller 1.5.2 (#9455)
strongjz Dec 29, 2022
3916f7b
move tests to gh actions (#9461)
rikatz Dec 29, 2022
8b5a25f
fix change images (#9463)
strongjz Dec 29, 2022
11e21bf
rollback tag
Dec 30, 2022
6f9c65a
revert 1.5.2
Dec 30, 2022
a6badc4
roll helm chart forward
Dec 30, 2022
2ea0109
Merge pull request #9469 from strongjz/rollback-1.5.2
strongjz Dec 30, 2022
5bfd3e2
Optional podman support (#9294)
kirs Jan 6, 2023
96b3d21
bump OpenTelemetry (#9489)
esigo Jan 7, 2023
490e872
update OpenTelemetry image (#9491)
esigo Jan 8, 2023
5b04033
Admission Webhooks/Job: Add `NetworkPolicy`. (#9218)
Gacko Jan 8, 2023
f82e29a
add github actions stale bot (#9439)
cpanato Jan 8, 2023
0b34a03
Update monitoring.md (#9269)
naseemkullah Jan 8, 2023
9926f1d
Fix indentation on serviceAccount annotation (#9129)
jp Jan 8, 2023
bbf7c79
Add update updateStrategy and minReadySeconds for defaultBackend (#8506)
yutachaos Jan 8, 2023
8ed3a27
Adding ipdenylist annotation (#8795)
philnichol Jan 8, 2023
424cc86
fix: disable auth access logs (#9049)
johanneswuerbach Jan 8, 2023
275d5e1
Add buildResolvers to the stream module (#9184)
jackivanov Jan 9, 2023
54dd88a
Bump golang.org/x/crypto from 0.4.0 to 0.5.0 (#9494)
dependabot[bot] Jan 9, 2023
e7bee53
added option to disable sync event creation (#8528)
AverageMarcus Jan 9, 2023
b8e9b55
added proxy-intercept-errors config option
chriss-de Dec 14, 2022
f12540f
Merge branch 'pie' of https://github.com/chriss-de/ingress-nginx into…
chriss-de Jan 10, 2023
e470148
added proxy-intercept-errors config option
chriss-de Dec 14, 2022
bfe7474
added proxy-intercept-errors config option
chriss-de Dec 14, 2022
d024ae5
Merge remote-tracking branch 'origin/pie' into pie
chriss-de Jan 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@ updates:
directory: "/"
schedule:
interval: "weekly"
labels:
- "area/dependency"
- "release-note-none"
- "ok-to-test"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
interval: "weekly"
labels:
- "area/dependency"
- "release-note-none"
- "ok-to-test"
157 changes: 112 additions & 45 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ on:
pull_request:
branches:
- "*"
paths-ignore:
- 'docs/**'
- 'deploy/**'

push:
branches:
- main
paths-ignore:
- 'docs/**'
- 'deploy/**'

workflow_dispatch:
inputs:
Expand All @@ -33,9 +39,9 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.10.2
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: filter
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -59,41 +65,97 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- name: Run Gosec Security Scanner
uses: securego/gosec@1af1d5bb49259b62e45c505db397dd2ada5d74f8 # master
uses: securego/gosec@1af1d5bb49259b62e45c505db397dd2ada5d74f8 # v2.14.0
with:
# G601 for zz_generated.deepcopy.go
# G306 TODO: Expect WriteFile permissions to be 0600 or less
# G307 TODO: Deferring unsafe method "Close"
args: -exclude=G109,G601,G104,G204,G304,G306,G307 -tests=false -exclude-dir=test -exclude-dir=images/ -exclude-dir=docs/ ./...

build:
name: Build
lint:
runs-on: ubuntu-latest
needs: changes
if: |
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true') || ${{ inputs.run_e2e }}
(needs.changes.outputs.go == 'true')
steps:
- name: Checkout
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- name: Set up Go
id: go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with:
go-version: '1.19'
check-latest: true

- name: Run Lint
run: ./hack/verify-golint.sh

gofmt:
runs-on: ubuntu-latest
needs: changes
if: |
(needs.changes.outputs.go == 'true')
steps:
- name: Checkout
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- name: Set up Go
id: go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with:
go-version: '1.19'
check-latest: true

- name: Run go-fmt
run: ./hack/verify-gofmt.sh

test-go:
runs-on: ubuntu-latest
needs: changes
if: |
(needs.changes.outputs.go == 'true')
steps:
- name: Checkout
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- name: Set up Go
id: go
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with:
go-version: '1.19'
check-latest: true

- name: Run test
run: make test

build:
name: Build
runs-on: ubuntu-latest
needs: changes
if: |
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true') || ${{ inputs.run_e2e }}

steps:
- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- name: Set up Go 1.19.2
- name: Set up Go
id: go
uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 # v3.2.0
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with:
go-version: '1.19.2'
go-version: '1.19'
check-latest: true

- name: Set up QEMU
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 #v2.0.0
uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 # v2.1.0

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.0.0
uses: docker/setup-buildx-action@8c0edbc76e98fa90f69d9a2c020dcb50019dc325 # v2.2.1
with:
version: latest

Expand All @@ -104,7 +166,7 @@ jobs:
run: |
sudo apt-get -qq update || true
sudo apt-get install -y pigz
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.25.5/bin/linux/amd64/kubectl
chmod +x ./kubectl
sudo mv ./kubectl /usr/local/bin/kubectl

Expand Down Expand Up @@ -138,24 +200,24 @@ jobs:
- changes
- build
if: |
(needs.changes.outputs.charts == 'true') || ${{ inputs.run_e2e }}
(needs.changes.outputs.charts == 'true') || ${{ inputs.run_e2e }}

strategy:
matrix:
k8s: [v1.23.13, v1.24.7, v1.25.3]
k8s: [v1.23.13, v1.24.7, v1.25.3, v1.26.0]

steps:

- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- name: Setup Go
uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 # v3.2.0
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with:
go-version: '1.19.2'
go-version: '1.19'
check-latest: true

- name: cache
uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3
uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
with:
name: docker.tar.gz

Expand Down Expand Up @@ -192,7 +254,7 @@ jobs:
run: |
kind create cluster --image=kindest/node:${{ matrix.k8s }}

- uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af # v1
- uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af # v2.0.0
with:
name: docker.tar.gz
failOnError: false
Expand All @@ -211,27 +273,25 @@ jobs:
kind get kubeconfig > $HOME/.kube/kind-config-kind
make kind-e2e-chart-tests


kubernetes:
name: Kubernetes
runs-on: ubuntu-latest
needs:
- changes
- build
if: |
(needs.changes.outputs.go == 'true') || ${{ inputs.run_e2e }}
(needs.changes.outputs.go == 'true') || ${{ inputs.run_e2e }}

strategy:
matrix:
k8s: [v1.23.13, v1.24.7, v1.25.3]
k8s: [v1.23.13, v1.24.7, v1.25.3, v1.26.0]

steps:

- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- name: cache
uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v2
uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
with:
name: docker.tar.gz

Expand All @@ -240,7 +300,7 @@ jobs:
run: |
kind create cluster --image=kindest/node:${{ matrix.k8s }} --config test/e2e/kind.yaml

- uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af # v1
- uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af # v2.0.0
with:
name: docker.tar.gz
failOnError: false
Expand All @@ -260,7 +320,7 @@ jobs:
make kind-e2e-test

- name: Uplaod e2e junit-reports
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
if: success() || failure()
with:
name: e2e-test-reports-${{ matrix.k8s }}
Expand All @@ -273,19 +333,19 @@ jobs:
- changes
- build
if: |
(needs.changes.outputs.go == 'true') || ${{ inputs.run_e2e }}
(needs.changes.outputs.go == 'true') || ${{ inputs.run_e2e }}

strategy:
matrix:
k8s: [v1.23.13, v1.24.7, v1.25.3]
k8s: [v1.23.13, v1.24.7, v1.25.3, v1.26.0]

steps:

- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- name: cache
uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7
uses: actions/download-artifact@9782bd6a9848b53b110e712e20e42d89988822b7 # v3.0.1
with:
name: docker.tar.gz

Expand All @@ -294,7 +354,7 @@ jobs:
run: |
kind create cluster --image=kindest/node:${{ matrix.k8s }} --config test/e2e/kind.yaml

- uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af
- uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af # v2.0.0
with:
name: docker.tar.gz
failOnError: false
Expand All @@ -313,9 +373,9 @@ jobs:
run: |
kind get kubeconfig > $HOME/.kube/kind-config-kind
make kind-e2e-test

- name: Uplaod e2e junit-reports
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
if: success() || failure()
with:
name: e2e-test-reports-chroot-${{ matrix.k8s }}
Expand All @@ -331,9 +391,9 @@ jobs:
PLATFORMS: linux/amd64,linux/arm64
steps:
- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.10.2
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: filter-images
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -388,19 +448,25 @@ jobs:
run: |
cd images/ext-auth-example-authsvc && make build


test-image:
permissions:
contents: read # for dorny/paths-filter to fetch a list of changed files
pull-requests: read # for dorny/paths-filter to read pull requests

runs-on: ubuntu-latest

env:
PLATFORMS: linux/amd64

strategy:
matrix:
k8s: [v1.23.13, v1.24.7, v1.25.3, v1.26.0]

steps:
- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.10.2
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: filter-images
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -414,12 +480,13 @@ jobs:
run: |
kind create cluster --image=kindest/node:${{ matrix.k8s }}

- name: Set up Go 1.19.2
- name: Set up Go
id: go
if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}
uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 # v3.2.0
uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
with:
go-version: '1.19.2'
go-version: '1.19'
check-latest: true

- name: kube-webhook-certgen image build
if: ${{ steps.filter-images.outputs.kube-webhook-certgen == 'true' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/depreview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0
- name: 'Dependency Review'
uses: actions/dependency-review-action@11310527b429536e263dc6cc47873e608189ba21 #v2.0.2
uses: actions/dependency-review-action@0ff3da6f81b812d4ec3cf37a04e2308c7a723730 # v3.0.2
10 changes: 4 additions & 6 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ jobs:
charts: ${{ steps.filter.outputs.charts }}

steps:

- name: Checkout
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.10.2
- uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1
id: filter
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -47,11 +46,10 @@ jobs:
contents: write # needed to write releases

steps:

- name: Checkout master
uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 #v3.0.2
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b # v3.2.0

- name: Deploy
uses: ./.github/actions/mkdocs
env:
PERSONAL_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
PERSONAL_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
Loading