Compare commits
34 commits
main
...
helm-chart
| Author | SHA1 | Date | |
|---|---|---|---|
|
7b37df8f38 | ||
|
|
7c44f99201 | ||
|
|
863df7da09 | ||
|
|
b5673e957d | ||
|
|
34820545ea | ||
|
|
325f889616 | ||
|
|
c3a5c8d333 | ||
|
|
ba90d2534c | ||
|
|
eefd069cab | ||
|
|
7d7e632e51 | ||
|
|
a3af2999c2 | ||
|
|
812c47f029 | ||
|
|
72f934b56e | ||
|
|
4f53d1d6c7 | ||
|
|
53fd0cb5ae | ||
|
|
5fe6890dd2 | ||
|
|
025839dd8b | ||
|
|
d5ddfdaf67 | ||
|
|
1b93fe0ac5 | ||
|
|
2ea8594299 | ||
|
|
40d444d2ab | ||
|
|
0b58e5f590 | ||
|
|
75f8768e45 | ||
|
|
96dea883d6 | ||
|
|
6feeb5a549 | ||
|
|
7d77bca047 | ||
|
|
f67052c054 | ||
|
|
66fc612ad3 | ||
|
|
9bcf45bd9a | ||
|
|
d493fb9e39 | ||
|
|
29aea6afe4 | ||
|
|
d1e27b516a | ||
|
|
0377536928 | ||
|
|
52f89fa1be |
84 changed files with 2966 additions and 1957 deletions
38
.github/workflows/ci.yaml
vendored
38
.github/workflows/ci.yaml
vendored
|
|
@ -74,7 +74,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: changes
|
needs: changes
|
||||||
if: |
|
if: |
|
||||||
(needs.changes.outputs.go == 'true')
|
(needs.changes.outputs.go == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
|
|
@ -84,7 +84,7 @@ jobs:
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
id: go
|
id: go
|
||||||
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
|
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
|
||||||
with:
|
with:
|
||||||
go-version: ${{ env.GOLANG_VERSION }}
|
go-version: ${{ env.GOLANG_VERSION }}
|
||||||
check-latest: true
|
check-latest: true
|
||||||
|
|
@ -99,7 +99,7 @@ jobs:
|
||||||
outputs:
|
outputs:
|
||||||
golangversion: ${{ steps.golangversion.outputs.version }}
|
golangversion: ${{ steps.golangversion.outputs.version }}
|
||||||
if: |
|
if: |
|
||||||
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true')
|
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
|
||||||
|
|
||||||
env:
|
env:
|
||||||
PLATFORMS: linux/amd64
|
PLATFORMS: linux/amd64
|
||||||
|
|
@ -114,17 +114,17 @@ jobs:
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
id: go
|
id: go
|
||||||
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
|
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
|
||||||
with:
|
with:
|
||||||
go-version: ${{ steps.golangversion.outputs.version }}
|
go-version: ${{ steps.golangversion.outputs.version }}
|
||||||
check-latest: true
|
check-latest: true
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
|
uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
id: buildx
|
id: buildx
|
||||||
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
|
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
|
||||||
with:
|
with:
|
||||||
version: latest
|
version: latest
|
||||||
|
|
||||||
|
|
@ -163,7 +163,7 @@ jobs:
|
||||||
| gzip > docker.tar.gz
|
| gzip > docker.tar.gz
|
||||||
|
|
||||||
- name: cache
|
- name: cache
|
||||||
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
|
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
|
||||||
with:
|
with:
|
||||||
name: docker.tar.gz
|
name: docker.tar.gz
|
||||||
path: docker.tar.gz
|
path: docker.tar.gz
|
||||||
|
|
@ -175,7 +175,7 @@ jobs:
|
||||||
needs:
|
needs:
|
||||||
- changes
|
- changes
|
||||||
if: |
|
if: |
|
||||||
(needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true')
|
(needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
|
|
@ -186,7 +186,7 @@ jobs:
|
||||||
- name: Set up Helm
|
- name: Set up Helm
|
||||||
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
|
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
|
||||||
|
|
||||||
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
|
- uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
|
||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.x'
|
||||||
|
|
||||||
|
|
@ -231,24 +231,24 @@ jobs:
|
||||||
- build
|
- build
|
||||||
- helm-lint
|
- helm-lint
|
||||||
if: |
|
if: |
|
||||||
(needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true')
|
(needs.changes.outputs.charts == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
|
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
|
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
|
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
|
||||||
with:
|
with:
|
||||||
go-version: ${{ needs.build.outputs.golangversion }}
|
go-version: ${{ needs.build.outputs.golangversion }}
|
||||||
check-latest: true
|
check-latest: true
|
||||||
|
|
||||||
- name: cache
|
- name: cache
|
||||||
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
|
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
|
||||||
with:
|
with:
|
||||||
name: docker.tar.gz
|
name: docker.tar.gz
|
||||||
|
|
||||||
|
|
@ -283,10 +283,10 @@ jobs:
|
||||||
- changes
|
- changes
|
||||||
- build
|
- build
|
||||||
if: |
|
if: |
|
||||||
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true')
|
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
|
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
|
||||||
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
|
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
|
||||||
with:
|
with:
|
||||||
k8s-version: ${{ matrix.k8s }}
|
k8s-version: ${{ matrix.k8s }}
|
||||||
|
|
@ -297,10 +297,10 @@ jobs:
|
||||||
- changes
|
- changes
|
||||||
- build
|
- build
|
||||||
if: |
|
if: |
|
||||||
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true')
|
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
|
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
|
||||||
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
|
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
|
||||||
with:
|
with:
|
||||||
k8s-version: ${{ matrix.k8s }}
|
k8s-version: ${{ matrix.k8s }}
|
||||||
|
|
@ -312,10 +312,10 @@ jobs:
|
||||||
- changes
|
- changes
|
||||||
- build
|
- build
|
||||||
if: |
|
if: |
|
||||||
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true')
|
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.baseimage == 'true') || ${{ github.event.workflow_dispatch.run_e2e == 'true' }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
|
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
|
||||||
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
|
uses: ./.github/workflows/zz-tmpl-k8s-e2e.yaml
|
||||||
with:
|
with:
|
||||||
k8s-version: ${{ matrix.k8s }}
|
k8s-version: ${{ matrix.k8s }}
|
||||||
|
|
|
||||||
2
.github/workflows/depreview.yaml
vendored
2
.github/workflows/depreview.yaml
vendored
|
|
@ -11,4 +11,4 @@ jobs:
|
||||||
- name: 'Checkout Repository'
|
- name: 'Checkout Repository'
|
||||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
- name: 'Dependency Review'
|
- name: 'Dependency Review'
|
||||||
uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # v4.3.3
|
uses: actions/dependency-review-action@5a2ce3f5b92ee19cbb1541a4984c76d921601d7c # v4.3.4
|
||||||
|
|
|
||||||
2
.github/workflows/golangci-lint.yml
vendored
2
.github/workflows/golangci-lint.yml
vendored
|
|
@ -22,7 +22,7 @@ jobs:
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
id: go
|
id: go
|
||||||
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
|
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
|
||||||
with:
|
with:
|
||||||
go-version: ${{ env.GOLANG_VERSION }}
|
go-version: ${{ env.GOLANG_VERSION }}
|
||||||
check-latest: true
|
check-latest: true
|
||||||
|
|
|
||||||
8
.github/workflows/images.yaml
vendored
8
.github/workflows/images.yaml
vendored
|
|
@ -141,7 +141,7 @@ jobs:
|
||||||
(needs.changes.outputs.kube-webhook-certgen == 'true')
|
(needs.changes.outputs.kube-webhook-certgen == 'true')
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
k8s: [v1.26.14, v1.27.11, v1.28.7, v1.29.2]
|
k8s: [v1.26.15, v1.27.13, v1.28.9, v1.29.4, v1.30.0]
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
|
|
@ -151,7 +151,7 @@ jobs:
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
id: go
|
id: go
|
||||||
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
|
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
|
||||||
with:
|
with:
|
||||||
go-version: ${{ env.GOLANG_VERSION }}
|
go-version: ${{ env.GOLANG_VERSION }}
|
||||||
check-latest: true
|
check-latest: true
|
||||||
|
|
@ -197,10 +197,10 @@ jobs:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
|
uses: docker/setup-qemu-action@5927c834f5b4fdf503fca6f4c7eccda82949e1ee # v3.1.0
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
id: buildx
|
id: buildx
|
||||||
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
|
uses: docker/setup-buildx-action@4fd812986e6c8c2a69e18311145f9371337f27d4 # v3.4.0
|
||||||
with:
|
with:
|
||||||
version: latest
|
version: latest
|
||||||
platforms: ${{ env.PLATFORMS }}
|
platforms: ${{ env.PLATFORMS }}
|
||||||
|
|
|
||||||
2
.github/workflows/plugin.yaml
vendored
2
.github/workflows/plugin.yaml
vendored
|
|
@ -20,7 +20,7 @@ jobs:
|
||||||
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
|
run: echo "GOLANG_VERSION=$(cat GOLANG_VERSION)" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Set up Go
|
- name: Set up Go
|
||||||
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
|
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
|
||||||
with:
|
with:
|
||||||
go-version: ${{ env.GOLANG_VERSION }}
|
go-version: ${{ env.GOLANG_VERSION }}
|
||||||
check-latest: true
|
check-latest: true
|
||||||
|
|
|
||||||
4
.github/workflows/scorecards.yml
vendored
4
.github/workflows/scorecards.yml
vendored
|
|
@ -51,7 +51,7 @@ jobs:
|
||||||
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
|
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
|
||||||
# format to the repository Actions tab.
|
# format to the repository Actions tab.
|
||||||
- name: "Upload artifact"
|
- name: "Upload artifact"
|
||||||
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
|
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
|
||||||
with:
|
with:
|
||||||
name: SARIF file
|
name: SARIF file
|
||||||
path: results.sarif
|
path: results.sarif
|
||||||
|
|
@ -59,6 +59,6 @@ jobs:
|
||||||
|
|
||||||
# Upload the results to GitHub's code scanning dashboard.
|
# Upload the results to GitHub's code scanning dashboard.
|
||||||
- name: "Upload to code-scanning"
|
- name: "Upload to code-scanning"
|
||||||
uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
|
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
|
||||||
with:
|
with:
|
||||||
sarif_file: results.sarif
|
sarif_file: results.sarif
|
||||||
|
|
|
||||||
4
.github/workflows/vulnerability-scans.yaml
vendored
4
.github/workflows/vulnerability-scans.yaml
vendored
|
|
@ -60,7 +60,7 @@ jobs:
|
||||||
|
|
||||||
- name: Scan image with AquaSec/Trivy
|
- name: Scan image with AquaSec/Trivy
|
||||||
id: scan
|
id: scan
|
||||||
uses: aquasecurity/trivy-action@7c2007bcb556501da015201bcba5aa14069b74e2 # v0.23.0
|
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.24.0
|
||||||
with:
|
with:
|
||||||
image-ref: registry.k8s.io/ingress-nginx/controller:${{ matrix.versions }}
|
image-ref: registry.k8s.io/ingress-nginx/controller:${{ matrix.versions }}
|
||||||
format: 'sarif'
|
format: 'sarif'
|
||||||
|
|
@ -75,7 +75,7 @@ jobs:
|
||||||
|
|
||||||
# This step checks out a copy of your repository.
|
# This step checks out a copy of your repository.
|
||||||
- name: Upload SARIF file
|
- name: Upload SARIF file
|
||||||
uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
|
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
|
||||||
with:
|
with:
|
||||||
token: ${{ github.token }}
|
token: ${{ github.token }}
|
||||||
# Path to SARIF file relative to the root of the repository
|
# Path to SARIF file relative to the root of the repository
|
||||||
|
|
|
||||||
4
.github/workflows/zz-tmpl-k8s-e2e.yaml
vendored
4
.github/workflows/zz-tmpl-k8s-e2e.yaml
vendored
|
|
@ -23,7 +23,7 @@ jobs:
|
||||||
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
|
||||||
|
|
||||||
- name: cache
|
- name: cache
|
||||||
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
|
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
|
||||||
with:
|
with:
|
||||||
name: docker.tar.gz
|
name: docker.tar.gz
|
||||||
|
|
||||||
|
|
@ -50,7 +50,7 @@ jobs:
|
||||||
make kind-e2e-test
|
make kind-e2e-test
|
||||||
|
|
||||||
- name: Upload e2e junit-reports ${{ inputs.variation }}
|
- name: Upload e2e junit-reports ${{ inputs.variation }}
|
||||||
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
|
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
|
||||||
if: success() || failure()
|
if: success() || failure()
|
||||||
with:
|
with:
|
||||||
name: e2e-test-reports-${{ inputs.k8s-version }}${{ inputs.variation }}
|
name: e2e-test-reports-${{ inputs.k8s-version }}${{ inputs.variation }}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
registry.k8s.io/ingress-nginx/nginx-1.25:v0.0.6@sha256:b3e027ab191eb9461a9bcf25092eabb1d547cba164992dbd722c1aa2b4a936ee
|
registry.k8s.io/ingress-nginx/nginx-1.25:v0.0.10@sha256:1686f4cd2e16f09a1e7d27529d21eb74a8b551dc06ef86189ac837d3d6548725
|
||||||
|
|
|
||||||
31
README.md
31
README.md
|
|
@ -37,20 +37,23 @@ the versions listed. Ingress-Nginx versions **may** work on older versions, but
|
||||||
|
|
||||||
| Supported | Ingress-NGINX version | k8s supported version | Alpine Version | Nginx Version | Helm Chart Version |
|
| Supported | Ingress-NGINX version | k8s supported version | Alpine Version | Nginx Version | Helm Chart Version |
|
||||||
| :-------: | --------------------- | ----------------------------- | -------------- | ------------- | ------------------ |
|
| :-------: | --------------------- | ----------------------------- | -------------- | ------------- | ------------------ |
|
||||||
| 🔄 | **v1.10.1** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.1* |
|
| 🔄 | **v1.11.1** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.11.1 |
|
||||||
| 🔄 | **v1.10.0** | 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.0* |
|
| 🔄 | **v1.11.0** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.11.0 |
|
||||||
| 🔄 | **v1.9.6** | 1.29, 1.28, 1.27, 1.26, 1.25 | 3.19.0 | 1.21.6 | 4.9.1* |
|
| 🔄 | **v1.10.2** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.20.0 | 1.25.5 | 4.10.2 |
|
||||||
| 🔄 | **v1.9.5** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.9.0* |
|
| 🔄 | **v1.10.1** | 1.30, 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.1 |
|
||||||
| 🔄 | **v1.9.4** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.3 |
|
| 🔄 | **v1.10.0** | 1.29, 1.28, 1.27, 1.26 | 3.19.1 | 1.25.3 | 4.10.0 |
|
||||||
| 🔄 | **v1.9.3** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
|
| | v1.9.6 | 1.29, 1.28, 1.27, 1.26, 1.25 | 3.19.0 | 1.21.6 | 4.9.1 |
|
||||||
| 🔄 | **v1.9.1** | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
|
| | v1.9.5 | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.9.0 |
|
||||||
| 🔄 | **v1.9.0** | 1.28, 1.27, 1.26, 1.25 | 3.18.2 | 1.21.6 | 4.8.* |
|
| | v1.9.4 | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.3 |
|
||||||
| | v1.8.4 | 1.27, 1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
|
| | v1.9.3 | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
|
||||||
| | v1.7.1 | 1.27, 1.26, 1.25, 1.24 | 3.17.2 | 1.21.6 | 4.6.* |
|
| | v1.9.1 | 1.28, 1.27, 1.26, 1.25 | 3.18.4 | 1.21.6 | 4.8.* |
|
||||||
| | v1.6.4 | 1.26, 1.25, 1.24, 1.23 | 3.17.0 | 1.21.6 | 4.5.* |
|
| | v1.9.0 | 1.28, 1.27, 1.26, 1.25 | 3.18.2 | 1.21.6 | 4.8.* |
|
||||||
| | v1.5.1 | 1.25, 1.24, 1.23 | 3.16.2 | 1.21.6 | 4.4.* |
|
| | v1.8.4 | 1.27, 1.26, 1.25, 1.24 | 3.18.2 | 1.21.6 | 4.7.* |
|
||||||
| | v1.4.0 | 1.25, 1.24, 1.23, 1.22 | 3.16.2 | 1.19.10† | 4.3.0 |
|
| | v1.7.1 | 1.27, 1.26, 1.25, 1.24 | 3.17.2 | 1.21.6 | 4.6.* |
|
||||||
| | v1.3.1 | 1.24, 1.23, 1.22, 1.21, 1.20 | 3.16.2 | 1.19.10† | 4.2.5 |
|
| | v1.6.4 | 1.26, 1.25, 1.24, 1.23 | 3.17.0 | 1.21.6 | 4.5.* |
|
||||||
|
| | v1.5.1 | 1.25, 1.24, 1.23 | 3.16.2 | 1.21.6 | 4.4.* |
|
||||||
|
| | v1.4.0 | 1.25, 1.24, 1.23, 1.22 | 3.16.2 | 1.19.10† | 4.3.0 |
|
||||||
|
| | v1.3.1 | 1.24, 1.23, 1.22, 1.21, 1.20 | 3.16.2 | 1.19.10† | 4.2.5 |
|
||||||
|
|
||||||
See [this article](https://kubernetes.io/blog/2021/07/26/update-with-ingress-nginx/) if you want upgrade to the stable
|
See [this article](https://kubernetes.io/blog/2021/07/26/update-with-ingress-nginx/) if you want upgrade to the stable
|
||||||
Ingress API.
|
Ingress API.
|
||||||
|
|
|
||||||
1
TAG
Normal file
1
TAG
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
v1.11.1
|
||||||
|
|
@ -44,7 +44,7 @@ function cleanup {
|
||||||
}
|
}
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
|
|
||||||
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20240404-436df3e4@sha256:6bcba53b14d396177414e01f20e9111f1c009ac3b476a9b7668bb98d12bd5e85}
|
E2E_IMAGE=${E2E_IMAGE:-registry.k8s.io/ingress-nginx/e2e-test-runner:v20240717-1fe74b5f@sha256:fce2ca5e683708cf76c6ba759f351fd7a592c5a56841491cf2d08784154ebf75}
|
||||||
|
|
||||||
if [[ "$RUNTIME" == podman ]]; then
|
if [[ "$RUNTIME" == podman ]]; then
|
||||||
# Podman does not support both tag and digest
|
# Podman does not support both tag and digest
|
||||||
|
|
|
||||||
130
changelog/controller-1.10.2.md
Normal file
130
changelog/controller-1.10.2.md
Normal file
|
|
@ -0,0 +1,130 @@
|
||||||
|
# Changelog
|
||||||
|
|
||||||
|
### controller-v1.10.2
|
||||||
|
|
||||||
|
Images:
|
||||||
|
|
||||||
|
* registry.k8s.io/ingress-nginx/controller:v1.10.2@sha256:e3311b3d9671bc52d90572bcbfb7ee5b71c985d6d6cffd445c241f1e2703363c
|
||||||
|
* registry.k8s.io/ingress-nginx/controller-chroot:v1.10.2@sha256:c4395cba98f9721e3381d3c06e7994371bae20f5ab30e457cd7debe44a8c8c54
|
||||||
|
|
||||||
|
### All changes:
|
||||||
|
|
||||||
|
* update test runner to latest build (#11557)
|
||||||
|
* add k8s 1.30 to ci build (#11553)
|
||||||
|
* update test runner go base to 3.20 (#11550)
|
||||||
|
* tag new test runner image with new nginx base 0.0.8 (#11549)
|
||||||
|
* bump NGINX_BASE to v0.0.8 (#11543)
|
||||||
|
* trigger build for NGINX-1.25 v0.0.8 (#11542)
|
||||||
|
* Upgrade OWASP_MODSECURITY_CRS_VERSION 3.3.5 to 4.4.0 and update docs (#11548)
|
||||||
|
* [feature] bump nginx to 1.25.5 and add http3 module (#11541)
|
||||||
|
* add ssl patches to nginx-1.25 image for coroutines to work in lua client hello and cert ssl blocks (#11534)
|
||||||
|
* bump alpine version to 3.20 to custom-error-pages (#11537)
|
||||||
|
* fix: Ensure changes in MatchCN annotation are detected (#11528)
|
||||||
|
* Docs: Add information about HTTP/3 support. (#11525)
|
||||||
|
* Docs: Specify `ingressClass` for multi-controller setup. (#11520)
|
||||||
|
* Docs: Improve default certificate usage. (#11519)
|
||||||
|
* docs: Update Ingress-NGINX v1.10.1 compatibility with Kubernetes v1.30 (#11500)
|
||||||
|
* Update getting-started.md with new prerequisites (#11487)
|
||||||
|
* Fix boolean configuration (#11484)
|
||||||
|
* Chores: Align security contacts & chart maintainers to actual owners. (#11480)
|
||||||
|
* CI: Bump forgotten Ginkgo versions. (#11469)
|
||||||
|
* Tests: Replace deprecated `grpc.Dial` by `grpc.NewClient`. (#11468)
|
||||||
|
* Owners: Promote Gacko to admin. (#11464)
|
||||||
|
* fixed fastcgi userguide (#11455)
|
||||||
|
* Remove unnecessary space character (#11451)
|
||||||
|
* fix for docs issue 11432 (#11446)
|
||||||
|
* Update index.md (#11445)
|
||||||
|
* upgrade to alpine 3.20 (#11438)
|
||||||
|
* update golang to 1.22.4 (#11431)
|
||||||
|
* Adapt dashboards for Grafana 11 compatibility (#11414)
|
||||||
|
* Rename variable to fix typo (#11413)
|
||||||
|
* Fix helm install on cloud provider admonition block (#11412)
|
||||||
|
* edited helm-install tips (#11411)
|
||||||
|
* added info for aws helm install (#11410)
|
||||||
|
* added multiplecontrollers-howto to faq (#11409)
|
||||||
|
* removed tlsv1 & tlsv1.1 (#11408)
|
||||||
|
* Docs: Remove opentracing and zipkin from docs (#11405)
|
||||||
|
* Go: Sync modules from `main`. (#11398)
|
||||||
|
* add workflow to helm release and update ct for branch (#11317)
|
||||||
|
* Merge pull request #11277 from strongjz/chart-1.10.1 (#11314)
|
||||||
|
* Release Helm Chart on branch update (#11306)
|
||||||
|
* Release controller 1.10.1 (#11298)
|
||||||
|
* fix path in file changed detected message (#11286)
|
||||||
|
* chore: fix function names in comment (#11281)
|
||||||
|
* fix: update kube version requirement to 1.21 (#11279)
|
||||||
|
* release helm chart from release branch (#11278)
|
||||||
|
* start 1.10.1 build (#11246)
|
||||||
|
* force nginx rebuild (#11245)
|
||||||
|
* update k8s version to latest kind release (#11241)
|
||||||
|
* remove _ssl_expire_time_seconds metric by identifier (#11239)
|
||||||
|
* update post submit helm ci and clean up (#11221)
|
||||||
|
* Chart: Add unit tests for default backend & topology spread constraints. (#11219)
|
||||||
|
* sort default backend hpa metrics (#11217)
|
||||||
|
* updated certgen image shatag (#11216)
|
||||||
|
* changed testrunner image sha (#11211)
|
||||||
|
* bumped certgeimage tag (#11213)
|
||||||
|
* updated baseimage & deleted a useless file (#11209)
|
||||||
|
* bump ginkgo to 2-17-1 in testrunner (#11204)
|
||||||
|
* chunking related faq update (#11205)
|
||||||
|
* Fix-semver (#11199)
|
||||||
|
* refactor helm ci tests part I (#11188)
|
||||||
|
* Proposal: e2e tests for regex patterns (#11185)
|
||||||
|
* bump ginkgo to v2.17.1 (#11186)
|
||||||
|
* fixes brotli build issue (#11187)
|
||||||
|
* fix geoip2 configuration docs (#11151)
|
||||||
|
* Fix typos in OTel doc (#11081) (#11129)
|
||||||
|
* Chart: Render `controller.ingressClassResource.parameters` natively. (#11126)
|
||||||
|
* Fix admission controller logging of `admissionTime` and `testedConfigurationSize` (#11114)
|
||||||
|
* Chart: Align HPA & KEDA conditions. (#11113)
|
||||||
|
* Chart: Improve IngressClass documentation. (#11111)
|
||||||
|
* Chart: Add Gacko to maintainers. Again. (#11112)
|
||||||
|
* Chart: Deploy `PodDisruptionBudget` with KEDA. (#11105)
|
||||||
|
* Chores: Pick patches from main. (#11103)
|
||||||
|
* Start the release of v1.10.0 (#11038)
|
||||||
|
|
||||||
|
### Dependency updates:
|
||||||
|
|
||||||
|
* Bump the all group with 2 updates (#11524)
|
||||||
|
* Bump k8s.io/klog/v2 from 2.130.0 to 2.130.1 in the all group (#11521)
|
||||||
|
* Bump aquasecurity/trivy-action from 0.22.0 to 0.23.0 in the all group (#11501)
|
||||||
|
* Bump k8s.io/klog/v2 from 2.120.1 to 2.130.0 (#11479)
|
||||||
|
* Bump the all group with 3 updates (#11478)
|
||||||
|
* Bump the all group with 2 updates (#11477)
|
||||||
|
* Bump golang.org/x/crypto from 0.23.0 to 0.24.0 (#11471)
|
||||||
|
* Bump sigs.k8s.io/controller-runtime in the all group (#11449)
|
||||||
|
* Bump github.com/prometheus/common from 0.53.0 to 0.54.0 (#11447)
|
||||||
|
* Bump the all group with 3 updates (#11450)
|
||||||
|
* Bump goreleaser/goreleaser-action from 5.1.0 to 6.0.0 (#11448)
|
||||||
|
* Bump github.com/onsi/ginkgo/v2 from 2.17.2 to 2.19.0 (#11422)
|
||||||
|
* Bump the all group with 2 updates (#11421)
|
||||||
|
* Bump google.golang.org/grpc from 1.63.2 to 1.64.0 (#11423)
|
||||||
|
* Bump the all group across 1 directory with 6 updates (#11407)
|
||||||
|
* Bump golangci/golangci-lint-action from 5.3.0 to 6.0.1 (#11406)
|
||||||
|
* Bump the all group with 3 updates (#11404)
|
||||||
|
* Bump Kubernetes version on images (#11403)
|
||||||
|
* Bump golangci/golangci-lint-action from 4.0.0 to 5.0.0 (#11402)
|
||||||
|
* Bump the all group with 4 updates (#11380)
|
||||||
|
* Bump k8s.io/component-base from 0.29.3 to 0.30.0 (#11301)
|
||||||
|
* Bump github.com/prometheus/common from 0.52.3 to 0.53.0 (#11300)
|
||||||
|
* Bump golang.org/x/net from 0.22.0 to 0.23.0 (#11285)
|
||||||
|
* Bump golang.org/x/net in /images/kube-webhook-certgen/rootfs (#11284)
|
||||||
|
* Bump the all group with 2 updates (#11266)
|
||||||
|
* Bump azure/setup-helm from 3.5 to 4 (#11265)
|
||||||
|
* Bump actions/add-to-project from 1.0.0 to 1.0.1 in the all group (#11264)
|
||||||
|
* Bump google.golang.org/grpc from 1.63.0 to 1.63.2 (#11238)
|
||||||
|
* Bump google.golang.org/grpc from 1.62.1 to 1.63.0 (#11234)
|
||||||
|
* Bump github.com/prometheus/common from 0.51.1 to 0.52.2 (#11233)
|
||||||
|
* Bump golang.org/x/crypto from 0.21.0 to 0.22.0 (#11232)
|
||||||
|
* Bump github.com/prometheus/client_model in the all group (#11231)
|
||||||
|
* Bump the all group with 3 updates (#11230)
|
||||||
|
* Bump the all group with 2 updates (#11190)
|
||||||
|
* Bump actions/add-to-project from 0.6.1 to 1.0.0 (#11189)
|
||||||
|
* Bump the all group with 3 updates (#11166)
|
||||||
|
* Bump github.com/prometheus/common from 0.50.0 to 0.51.1 (#11160)
|
||||||
|
* Bump the all group with 4 updates (#11140)
|
||||||
|
* Bump the all group with 1 update (#11136)
|
||||||
|
* Bump google.golang.org/protobuf from 1.32.0 to 1.33.0 in /magefiles (#11127)
|
||||||
|
* Bump google.golang.org/protobuf in /images/custom-error-pages/rootfs (#11128)
|
||||||
|
* Bump google.golang.org/protobuf in /images/kube-webhook-certgen/rootfs (#11122)
|
||||||
|
|
||||||
|
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.10.1...controller-v1.10.2
|
||||||
164
changelog/controller-1.11.0.md
Normal file
164
changelog/controller-1.11.0.md
Normal file
|
|
@ -0,0 +1,164 @@
|
||||||
|
# Changelog
|
||||||
|
|
||||||
|
### controller-v1.11.0
|
||||||
|
|
||||||
|
Images:
|
||||||
|
|
||||||
|
* registry.k8s.io/ingress-nginx/controller:v1.11.0@sha256:a886e56d532d1388c77c8340261149d974370edca1093af4c97a96fb1467cb39
|
||||||
|
* registry.k8s.io/ingress-nginx/controller-chroot:v1.11.0@sha256:f16dfed1c94d216b65e5dcb7508ab46148641a99649c5a700749db6f01a7039e
|
||||||
|
|
||||||
|
### All changes:
|
||||||
|
|
||||||
|
* update test runner to latest build (#11558)
|
||||||
|
* add k8s 1.30 to ci build (#11554)
|
||||||
|
* update test runner go base to 3.20 (#11552)
|
||||||
|
* tag new test runner image with new nginx base 0.0.8 (#11551)
|
||||||
|
* bump NGINX_BASE to v0.0.8 (#11544)
|
||||||
|
* add ssl patches to nginx-1.25 image for coroutines to work in lua client hello and cert ssl blocks (#11535)
|
||||||
|
* trigger build for NGINX-1.25 v0.0.8 (#11539)
|
||||||
|
* bump alpine version to 3.20 to custom-error-pages (#11538)
|
||||||
|
* fix: Ensure changes in MatchCN annotation are detected (#11529)
|
||||||
|
* Docs: Add information about HTTP/3 support. (#11513)
|
||||||
|
* Docs: Specify `ingressClass` for multi-controller setup. (#11493)
|
||||||
|
* Docs: Improve default certificate usage. (#11504)
|
||||||
|
* Upgrade OWASP_MODSECURITY_CRS_VERSION 3.3.5 to 4.4.0 and update docs (#11511)
|
||||||
|
* docs: Update Ingress-NGINX v1.10.1 compatibility with Kubernetes v1.30 (#11495)
|
||||||
|
* Update getting-started.md with new prerequisites (#11486)
|
||||||
|
* [feature] bump nginx to 1.25.5 and add http3 module (#11470)
|
||||||
|
* Fix boolean configuration (#11483)
|
||||||
|
* Chores: Align security contacts & chart maintainers to actual owners. (#11465)
|
||||||
|
* CI: Bump forgotten Ginkgo versions. (#11467)
|
||||||
|
* Tests: Replace deprecated `grpc.Dial` by `grpc.NewClient`. (#11462)
|
||||||
|
* Owners: Promote Gacko to admin. (#11463)
|
||||||
|
* Chart: Make pod affinity templatable. (#11453)
|
||||||
|
* fixed fastcgi userguide (#11454)
|
||||||
|
* Remove unnecessary space character (#11434)
|
||||||
|
* upgrade to alpine 3.20 (#11428)
|
||||||
|
* fix for docs issue 11432 (#11433)
|
||||||
|
* Update index.md (#11437)
|
||||||
|
* update golang to 1.22.4 (#11427)
|
||||||
|
* Chart: Fix `IngressClass` annotations. (#11416)
|
||||||
|
* Chart: Make admission webhook patch job RBAC configurable. (#11376)
|
||||||
|
* Merge pull request #11277 from strongjz/chart-1.10.1 (#11415)
|
||||||
|
* Chart: Remove `controller.enableWorkerSerialReloads`. (#11400)
|
||||||
|
* Adapt dashboards for Grafana 11 compatibility (#11399)
|
||||||
|
* Rename variable to fix typo (#11395)
|
||||||
|
* Fix helm install on cloud provider admonition block (#11394)
|
||||||
|
* edited helm-install tips (#11393)
|
||||||
|
* added info for aws helm install (#11390)
|
||||||
|
* added multiplecontrollers-howto to faq (#11389)
|
||||||
|
* removed tlsv1 & tlsv1.1 (#11343)
|
||||||
|
* feat: Add grpc timeouts annotations (#11258)
|
||||||
|
* sfix position of options (#11379)
|
||||||
|
* add workflow to helm release and update ct for branch (#11378)
|
||||||
|
* Accept user defined annotations in IngressClass (#11362)
|
||||||
|
* Docs: Remove opentracing and zipkin from docs (#11361)
|
||||||
|
* Allow configuring nginx worker reload behaviour, to prevent multiple concurrent worker reloads which can lead to high resource usage and OOMKill (#10884)
|
||||||
|
* chore(deps): group update k8s.io packages to v0.30.0 (#11344)
|
||||||
|
* Fix function name in comment (#11296)
|
||||||
|
* fix path in file changed detected message (#11271)
|
||||||
|
* chore: fix function names in comment (#11280)
|
||||||
|
* fix: update kube version requirement to 1.21 (#11275)
|
||||||
|
* release helm chart from release branch (#11276)
|
||||||
|
* update k8s version to latest kind release (#11240)
|
||||||
|
* feat: add annotation to allow to add custom response headers (#9742)
|
||||||
|
* remove _ssl_expire_time_seconds metric by identifier (#9706)
|
||||||
|
* update post submit helm ci and clean up (#11220)
|
||||||
|
* Chart: Add unit tests for default backend & topology spread constraints. (#11218)
|
||||||
|
* sort default backend hpa metrics (#11215)
|
||||||
|
* updated certgen image shatag (#11214)
|
||||||
|
* feature(default_backend): topologySpreadConstraints on default backend (#11197)
|
||||||
|
* bumped certgeimage tag (#11212)
|
||||||
|
* changed testrunner image sha (#11207)
|
||||||
|
* updated baseimage & deleted a useless file (#11208)
|
||||||
|
* Chart: Make `controller.config` templatable. (#11181)
|
||||||
|
* chunking related faq update (#11196)
|
||||||
|
* bump ginkgo to 2-17-1 in testrunner (#11202)
|
||||||
|
* Owners: Promote Gacko to `ingress-nginx-maintainers` & `ingress-nginx-reviewers`. (#11165)
|
||||||
|
* Fix-semver (#11193)
|
||||||
|
* refactor helm ci tests part I (#11178)
|
||||||
|
* fixes brotli build issue (#10484)
|
||||||
|
* bump ginkgo to v2.17.1 (#11177)
|
||||||
|
* Proposal: e2e tests for regex patterns (#11174)
|
||||||
|
* Controller: Make Leader Election TTL configurable. (#11142)
|
||||||
|
* Chores: Remove recently added whitespaces. (#11156)
|
||||||
|
* Add GRPC Buffer Size to the Configmap (#11155)
|
||||||
|
* fix geoip2 configuration docs (#11150)
|
||||||
|
* feature(geoip2_autoreload): Enable GeoIP2 auto_reload config (#11079)
|
||||||
|
* Chart: Add IngressClass aliases. (#11109)
|
||||||
|
* Fix typos in OTel doc (#11081)
|
||||||
|
* Chart: Render `controller.ingressClassResource.parameters` natively. (#11108)
|
||||||
|
* Fix admission controller logging of `admissionTime` and `testedConfigurationSize` (#11089)
|
||||||
|
* Chart: Align HPA & KEDA conditions. (#11110)
|
||||||
|
* Chart: Add Gacko to maintainers. Again. (#11107)
|
||||||
|
* Chart: Improve IngressClass documentation. (#11104)
|
||||||
|
* Chart: Deploy `PodDisruptionBudget` with KEDA. (#11032)
|
||||||
|
* Undo #11062 since it breaks the nginx config (#11082)
|
||||||
|
* [mTLS] Fix acme verfication when mTLS and Client CN verification is enabled (#11062)
|
||||||
|
* golangci-lint update, ci cleanup, group dependabot updates (#11071)
|
||||||
|
* bump golang (#11070)
|
||||||
|
* feature(leader_election): flag to disable leader election feature on controller (#11064)
|
||||||
|
* docs: update the 404 link to FAQ (#11069)
|
||||||
|
* Update README.md (#11065)
|
||||||
|
* quotes around numbers fort ports definitions (#11052)
|
||||||
|
|
||||||
|
### Dependency updates:
|
||||||
|
|
||||||
|
* Bump the all group with 2 updates (#11523)
|
||||||
|
* Bump k8s.io/klog/v2 from 2.130.0 to 2.130.1 in the all group (#11499)
|
||||||
|
* Bump aquasecurity/trivy-action from 0.22.0 to 0.23.0 in the all group (#11497)
|
||||||
|
* Bump k8s.io/klog/v2 from 2.120.1 to 2.130.0 (#11475)
|
||||||
|
* Bump the all group with 3 updates (#11474)
|
||||||
|
* Bump the all group with 2 updates (#11476)
|
||||||
|
* Bump golang.org/x/crypto from 0.23.0 to 0.24.0 (#11442)
|
||||||
|
* Bump the all group with 3 updates (#11443)
|
||||||
|
* Bump sigs.k8s.io/controller-runtime in the all group (#11440)
|
||||||
|
* Bump goreleaser/goreleaser-action from 5.1.0 to 6.0.0 (#11444)
|
||||||
|
* Bump github.com/prometheus/common from 0.53.0 to 0.54.0 (#11441)
|
||||||
|
* Bump the all group with 2 updates (#11419)
|
||||||
|
* Bump github.com/onsi/ginkgo/v2 from 2.17.2 to 2.19.0 (#11418)
|
||||||
|
* Bump google.golang.org/grpc from 1.63.2 to 1.64.0 (#11417)
|
||||||
|
* Bump the all group across 1 directory with 3 updates (#11384)
|
||||||
|
* Bump the all group across 1 directory with 6 updates (#11383)
|
||||||
|
* Bump golang.org/x/crypto from 0.22.0 to 0.23.0 (#11357)
|
||||||
|
* Bump golangci/golangci-lint-action from 5.3.0 to 6.0.1 (#11355)
|
||||||
|
* Bump the all group with 3 updates (#11348)
|
||||||
|
* Bump Kubernetes version on images (#11346)
|
||||||
|
* Bump sigs.k8s.io/controller-runtime from 0.17.3 to 0.18.1 (#11345)
|
||||||
|
* Bump golangci/golangci-lint-action from 4.0.0 to 5.0.0 (#11328)
|
||||||
|
* Bump the all group with 4 updates (#11327)
|
||||||
|
* Bump k8s.io/component-base from 0.29.3 to 0.30.0 (#11291)
|
||||||
|
* Bump github.com/prometheus/common from 0.52.3 to 0.53.0 (#11290)
|
||||||
|
* Bump golang.org/x/net from 0.22.0 to 0.23.0 (#11282)
|
||||||
|
* Bump golang.org/x/net in /images/kube-webhook-certgen/rootfs (#11283)
|
||||||
|
* Bump the all group with 2 updates (#11261)
|
||||||
|
* Bump azure/setup-helm from 3.5 to 4 (#11263)
|
||||||
|
* Bump actions/add-to-project from 1.0.0 to 1.0.1 in the all group (#11262)
|
||||||
|
* Bump google.golang.org/grpc from 1.63.0 to 1.63.2 (#11237)
|
||||||
|
* Bump google.golang.org/grpc from 1.62.1 to 1.63.0 (#11228)
|
||||||
|
* Bump github.com/prometheus/common from 0.51.1 to 0.52.2 (#11227)
|
||||||
|
* Bump golang.org/x/crypto from 0.21.0 to 0.22.0 (#11229)
|
||||||
|
* Bump github.com/prometheus/client_model in the all group (#11226)
|
||||||
|
* Bump the all group with 3 updates (#11225)
|
||||||
|
* Bump the all group with 2 updates (#11183)
|
||||||
|
* Bump actions/add-to-project from 0.6.1 to 1.0.0 (#11184)
|
||||||
|
* Bump the all group with 3 updates (#11157)
|
||||||
|
* Bump github.com/prometheus/common from 0.50.0 to 0.51.1 (#11159)
|
||||||
|
* Bump the all group with 4 updates (#11133)
|
||||||
|
* Bump the all group with 1 update (#11134)
|
||||||
|
* Bump google.golang.org/protobuf in /images/custom-error-pages/rootfs (#11119)
|
||||||
|
* Bump google.golang.org/protobuf from 1.32.0 to 1.33.0 in /magefiles (#11121)
|
||||||
|
* Bump google.golang.org/protobuf in /images/kube-webhook-certgen/rootfs (#11120)
|
||||||
|
* Bump github.com/onsi/ginkgo/v2 from 2.15.0 to 2.16.0 (#11076)
|
||||||
|
* Bump the all group with 1 update (#11073)
|
||||||
|
* Bump the all group with 1 update (#11072)
|
||||||
|
* Bump github.com/prometheus/common from 0.49.0 to 0.50.0 (#11075)
|
||||||
|
* Bump actions/download-artifact from 4.1.2 to 4.1.4 (#11059)
|
||||||
|
* Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (#11055)
|
||||||
|
* Bump docker/setup-buildx-action from 3.0.0 to 3.1.0 (#11057)
|
||||||
|
* Bump github.com/prometheus/common from 0.48.0 to 0.49.0 (#11056)
|
||||||
|
* Bump github/codeql-action from 3.24.5 to 3.24.6 (#11060)
|
||||||
|
* Bump aquasecurity/trivy-action from 0.17.0 to 0.18.0 (#11058)
|
||||||
|
* Bump dorny/paths-filter from 3.0.1 to 3.0.2 (#11061)
|
||||||
|
|
||||||
|
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.10.2...controller-v1.11.0
|
||||||
45
changelog/controller-1.11.1.md
Normal file
45
changelog/controller-1.11.1.md
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
# Changelog
|
||||||
|
|
||||||
|
### controller-v1.11.1
|
||||||
|
|
||||||
|
Images:
|
||||||
|
|
||||||
|
* registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
|
* registry.k8s.io/ingress-nginx/controller-chroot:v1.11.1@sha256:7cabe4bd7558bfdf5b707976d7be56fd15ffece735d7c90fc238b6eda290fd8d
|
||||||
|
|
||||||
|
### All changes:
|
||||||
|
|
||||||
|
* Tests: Bump `test-runner` to v20240717-1fe74b5f. (#11647)
|
||||||
|
* Images: Re-run `test-runner` build. (#11644)
|
||||||
|
* Images: Trigger `test-runner` build. (#11640)
|
||||||
|
* Images: Bump `NGINX_BASE` to v0.0.10. (#11638)
|
||||||
|
* Images: Trigger NGINX build. (#11632)
|
||||||
|
* bump testing runner (#11627)
|
||||||
|
* remove modsecurity coreruleset test files from nginx image (#11620)
|
||||||
|
* unskip the ocsp tests and update images to fix cfssl bug (#11616)
|
||||||
|
* Fix indent in YAML for example pod (#11610)
|
||||||
|
* Images: Bump `test-runner`. (#11605)
|
||||||
|
* Images: Bump `NGINX_BASE` to v0.0.9. (#11602)
|
||||||
|
* revert module upgrade (#11597)
|
||||||
|
* Release: Apply changes from `main`. (#11589)
|
||||||
|
* Mage: Stop mutating release notes. (#11581)
|
||||||
|
* Images: Bump `kube-webhook-certgen`. (#11584)
|
||||||
|
* update test runner to latest build (#11558)
|
||||||
|
* add k8s 1.30 to ci build (#11554)
|
||||||
|
* update test runner go base to 3.20 (#11552)
|
||||||
|
* tag new test runner image with new nginx base 0.0.8 (#11551)
|
||||||
|
* bump NGINX_BASE to v0.0.8 (#11544)
|
||||||
|
* add ssl patches to nginx-1.25 image for coroutines to work in lua client hello and cert ssl blocks (#11535)
|
||||||
|
* trigger build for NGINX-1.25 v0.0.8 (#11539)
|
||||||
|
* bump alpine version to 3.20 to custom-error-pages (#11538)
|
||||||
|
* fix: Ensure changes in MatchCN annotation are detected (#11529)
|
||||||
|
|
||||||
|
### Dependency updates:
|
||||||
|
|
||||||
|
* Bump github.com/prometheus/common from 0.54.0 to 0.55.0 (#11621)
|
||||||
|
* Bump the all group with 5 updates (#11614)
|
||||||
|
* Bump golang.org/x/crypto from 0.24.0 to 0.25.0 (#11580)
|
||||||
|
* Bump google.golang.org/grpc from 1.64.0 to 1.65.0 (#11576)
|
||||||
|
* Bump the all group with 4 updates (#11575)
|
||||||
|
|
||||||
|
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/controller-v1.11.0...controller-v1.11.1
|
||||||
|
|
@ -1,18 +1,16 @@
|
||||||
annotations:
|
annotations:
|
||||||
artifacthub.io/changes: |-
|
artifacthub.io/changes: |
|
||||||
- "update post submit helm ci and clean up (#11221)"
|
- Update Ingress-Nginx version controller-v1.11.1
|
||||||
- "refactor helm ci tests part I (#11188)"
|
|
||||||
- "Update Ingress-Nginx version controller-v1.10.1"
|
|
||||||
artifacthub.io/prerelease: "false"
|
artifacthub.io/prerelease: "false"
|
||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
appVersion: 1.10.1
|
appVersion: 1.11.1
|
||||||
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
|
description: Ingress controller for Kubernetes using NGINX as a reverse proxy and
|
||||||
load balancer
|
load balancer
|
||||||
home: https://github.com/kubernetes/ingress-nginx
|
home: https://github.com/kubernetes/ingress-nginx
|
||||||
icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
|
icon: https://upload.wikimedia.org/wikipedia/commons/thumb/c/c5/Nginx_logo.svg/500px-Nginx_logo.svg.png
|
||||||
keywords:
|
keywords:
|
||||||
- ingress
|
- ingress
|
||||||
- nginx
|
- nginx
|
||||||
kubeVersion: '>=1.21.0-0'
|
kubeVersion: '>=1.21.0-0'
|
||||||
maintainers:
|
maintainers:
|
||||||
- name: cpanato
|
- name: cpanato
|
||||||
|
|
@ -24,4 +22,4 @@ maintainers:
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/kubernetes/ingress-nginx
|
- https://github.com/kubernetes/ingress-nginx
|
||||||
version: 4.10.1
|
version: 4.11.1
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
[ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
|
[ingress-nginx](https://github.com/kubernetes/ingress-nginx) Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
|
||||||
|
|
||||||
 
|
 
|
||||||
|
|
||||||
To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
|
To use, add `ingressClassName: nginx` spec field or the `kubernetes.io/ingress.class: nginx` annotation to your Ingress resources.
|
||||||
|
|
||||||
|
|
@ -325,8 +325,8 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
|
||||||
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
|
| controller.hostname | object | `{}` | Optionally customize the pod hostname. |
|
||||||
| controller.image.allowPrivilegeEscalation | bool | `false` | |
|
| controller.image.allowPrivilegeEscalation | bool | `false` | |
|
||||||
| controller.image.chroot | bool | `false` | |
|
| controller.image.chroot | bool | `false` | |
|
||||||
| controller.image.digest | string | `"sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e"` | |
|
| controller.image.digest | string | `"sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a"` | |
|
||||||
| controller.image.digestChroot | string | `"sha256:c155954116b397163c88afcb3252462771bd7867017e8a17623e83601bab7ac7"` | |
|
| controller.image.digestChroot | string | `"sha256:7cabe4bd7558bfdf5b707976d7be56fd15ffece735d7c90fc238b6eda290fd8d"` | |
|
||||||
| controller.image.image | string | `"ingress-nginx/controller"` | |
|
| controller.image.image | string | `"ingress-nginx/controller"` | |
|
||||||
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
|
| controller.image.pullPolicy | string | `"IfNotPresent"` | |
|
||||||
| controller.image.readOnlyRootFilesystem | bool | `false` | |
|
| controller.image.readOnlyRootFilesystem | bool | `false` | |
|
||||||
|
|
@ -334,7 +334,7 @@ As of version `1.26.0` of this chart, by simply not providing any clusterIP valu
|
||||||
| controller.image.runAsNonRoot | bool | `true` | |
|
| controller.image.runAsNonRoot | bool | `true` | |
|
||||||
| controller.image.runAsUser | int | `101` | |
|
| controller.image.runAsUser | int | `101` | |
|
||||||
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
|
| controller.image.seccompProfile.type | string | `"RuntimeDefault"` | |
|
||||||
| controller.image.tag | string | `"v1.10.1"` | |
|
| controller.image.tag | string | `"v1.11.1"` | |
|
||||||
| controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
|
| controller.ingressClass | string | `"nginx"` | For backwards compatibility with ingress.class annotation, use ingressClass. Algorithm is as follows, first ingressClassName is considered, if not present, controller looks for ingress.class annotation |
|
||||||
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
|
| controller.ingressClassByName | bool | `false` | Process IngressClass per name (additionally as per spec.controller). |
|
||||||
| controller.ingressClassResource | object | `{"aliases":[],"annotations":{},"controllerValue":"k8s.io/ingress-nginx","default":false,"enabled":true,"name":"nginx","parameters":{}}` | This section refers to the creation of the IngressClass resource. IngressClasses are immutable and cannot be changed after creation. We do not support namespaced IngressClasses, yet, so a ClusterRole and a ClusterRoleBinding is required. |
|
| controller.ingressClassResource | object | `{"aliases":[],"annotations":{},"controllerValue":"k8s.io/ingress-nginx","default":false,"enabled":true,"name":"nginx","parameters":{}}` | This section refers to the creation of the IngressClass resource. IngressClasses are immutable and cannot be changed after creation. We do not support namespaced IngressClasses, yet, so a ClusterRole and a ClusterRoleBinding is required. |
|
||||||
|
|
|
||||||
18
charts/ingress-nginx/changelog/helm-chart-4.10.2.md
Normal file
18
charts/ingress-nginx/changelog/helm-chart-4.10.2.md
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Changelog
|
||||||
|
|
||||||
|
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
|
||||||
|
|
||||||
|
### 4.10.2
|
||||||
|
|
||||||
|
* Chores: Align security contacts & chart maintainers to actual owners. (#11480)
|
||||||
|
* Fix helm install on cloud provider admonition block (#11412)
|
||||||
|
* edited helm-install tips (#11411)
|
||||||
|
* added info for aws helm install (#11410)
|
||||||
|
* add workflow to helm release and update ct for branch (#11317)
|
||||||
|
* Merge pull request #11277 from strongjz/chart-1.10.1 (#11314)
|
||||||
|
* release helm chart from release branch (#11278)
|
||||||
|
* update post submit helm ci and clean up (#11221)
|
||||||
|
* refactor helm ci tests part I (#11188)
|
||||||
|
* Update Ingress-Nginx version controller-v1.10.2
|
||||||
|
|
||||||
|
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.10.1...helm-chart-4.10.2
|
||||||
18
charts/ingress-nginx/changelog/helm-chart-4.11.0.md
Normal file
18
charts/ingress-nginx/changelog/helm-chart-4.11.0.md
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Changelog
|
||||||
|
|
||||||
|
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
|
||||||
|
|
||||||
|
### 4.11.0
|
||||||
|
|
||||||
|
* Chores: Align security contacts & chart maintainers to actual owners. (#11465)
|
||||||
|
* Merge pull request #11277 from strongjz/chart-1.10.1 (#11415)
|
||||||
|
* Fix helm install on cloud provider admonition block (#11394)
|
||||||
|
* edited helm-install tips (#11393)
|
||||||
|
* added info for aws helm install (#11390)
|
||||||
|
* add workflow to helm release and update ct for branch (#11378)
|
||||||
|
* release helm chart from release branch (#11276)
|
||||||
|
* update post submit helm ci and clean up (#11220)
|
||||||
|
* refactor helm ci tests part I (#11178)
|
||||||
|
* Update Ingress-Nginx version controller-v1.11.0
|
||||||
|
|
||||||
|
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.10.2...helm-chart-4.11.0
|
||||||
9
charts/ingress-nginx/changelog/helm-chart-4.11.1.md
Normal file
9
charts/ingress-nginx/changelog/helm-chart-4.11.1.md
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
# Changelog
|
||||||
|
|
||||||
|
This file documents all notable changes to [ingress-nginx](https://github.com/kubernetes/ingress-nginx) Helm Chart. The release numbering uses [semantic versioning](http://semver.org).
|
||||||
|
|
||||||
|
### 4.11.1
|
||||||
|
|
||||||
|
* Update Ingress-Nginx version controller-v1.11.1
|
||||||
|
|
||||||
|
**Full Changelog**: https://github.com/kubernetes/ingress-nginx/compare/helm-chart-4.11.0...helm-chart-4.11.1
|
||||||
|
|
@ -26,9 +26,9 @@ controller:
|
||||||
## for backwards compatibility consider setting the full image url via the repository value below
|
## for backwards compatibility consider setting the full image url via the repository value below
|
||||||
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
|
## use *either* current default registry/image or repository format or installing chart by providing the values.yaml will fail
|
||||||
## repository:
|
## repository:
|
||||||
tag: "v1.10.1"
|
tag: "v1.11.1"
|
||||||
digest: sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
digest: sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
digestChroot: sha256:c155954116b397163c88afcb3252462771bd7867017e8a17623e83601bab7ac7
|
digestChroot: sha256:7cabe4bd7558bfdf5b707976d7be56fd15ffece735d7c90fc238b6eda290fd8d
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
runAsNonRoot: true
|
runAsNonRoot: true
|
||||||
# www-data -> uid 101
|
# www-data -> uid 101
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,12 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
automountServiceAccountToken: true
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -27,7 +28,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -39,7 +40,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -129,7 +130,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -148,7 +149,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -230,7 +231,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -249,7 +250,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -269,7 +270,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -288,7 +289,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -307,7 +308,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -328,7 +329,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -344,7 +345,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -377,7 +378,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller-admission
|
name: ingress-nginx-controller-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -400,7 +401,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -422,7 +423,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
|
|
@ -447,7 +448,7 @@ spec:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: LD_PRELOAD
|
- name: LD_PRELOAD
|
||||||
value: /usr/local/lib/libmimalloc.so
|
value: /usr/local/lib/libmimalloc.so
|
||||||
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
|
|
@ -523,7 +524,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -534,7 +535,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -574,7 +575,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -585,7 +586,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -627,7 +628,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: nginx
|
name: nginx
|
||||||
spec:
|
spec:
|
||||||
controller: k8s.io/ingress-nginx
|
controller: k8s.io/ingress-nginx
|
||||||
|
|
@ -640,7 +641,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
webhooks:
|
webhooks:
|
||||||
- admissionReviewVersions:
|
- admissionReviewVersions:
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,12 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
automountServiceAccountToken: true
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -27,7 +28,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -39,7 +40,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -129,7 +130,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -148,7 +149,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -230,7 +231,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -249,7 +250,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -269,7 +270,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -288,7 +289,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -307,7 +308,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -335,7 +336,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -353,7 +354,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -386,7 +387,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller-admission
|
name: ingress-nginx-controller-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -409,7 +410,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -431,7 +432,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
|
|
@ -456,7 +457,7 @@ spec:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: LD_PRELOAD
|
- name: LD_PRELOAD
|
||||||
value: /usr/local/lib/libmimalloc.so
|
value: /usr/local/lib/libmimalloc.so
|
||||||
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
|
|
@ -535,7 +536,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -546,7 +547,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -586,7 +587,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -597,7 +598,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -639,7 +640,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: nginx
|
name: nginx
|
||||||
spec:
|
spec:
|
||||||
controller: k8s.io/ingress-nginx
|
controller: k8s.io/ingress-nginx
|
||||||
|
|
@ -652,7 +653,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
webhooks:
|
webhooks:
|
||||||
- admissionReviewVersions:
|
- admissionReviewVersions:
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,12 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
automountServiceAccountToken: true
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -27,7 +28,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -39,7 +40,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -129,7 +130,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -148,7 +149,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -230,7 +231,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -249,7 +250,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -269,7 +270,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -288,7 +289,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -307,7 +308,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -328,7 +329,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -340,7 +341,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -372,7 +373,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller-admission
|
name: ingress-nginx-controller-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -395,7 +396,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -417,7 +418,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
|
|
@ -441,7 +442,7 @@ spec:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: LD_PRELOAD
|
- name: LD_PRELOAD
|
||||||
value: /usr/local/lib/libmimalloc.so
|
value: /usr/local/lib/libmimalloc.so
|
||||||
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
|
|
@ -517,7 +518,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -528,7 +529,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -568,7 +569,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -579,7 +580,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -621,7 +622,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: nginx
|
name: nginx
|
||||||
spec:
|
spec:
|
||||||
controller: k8s.io/ingress-nginx
|
controller: k8s.io/ingress-nginx
|
||||||
|
|
@ -634,7 +635,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
webhooks:
|
webhooks:
|
||||||
- admissionReviewVersions:
|
- admissionReviewVersions:
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,12 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
automountServiceAccountToken: true
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -27,7 +28,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -39,7 +40,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -129,7 +130,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -148,7 +149,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -230,7 +231,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -249,7 +250,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -269,7 +270,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -288,7 +289,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -307,7 +308,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -328,7 +329,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -340,7 +341,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -373,7 +374,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller-admission
|
name: ingress-nginx-controller-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -396,7 +397,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -418,7 +419,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
|
|
@ -443,7 +444,7 @@ spec:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: LD_PRELOAD
|
- name: LD_PRELOAD
|
||||||
value: /usr/local/lib/libmimalloc.so
|
value: /usr/local/lib/libmimalloc.so
|
||||||
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
|
|
@ -519,7 +520,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -530,7 +531,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -570,7 +571,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -581,7 +582,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -623,7 +624,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: nginx
|
name: nginx
|
||||||
spec:
|
spec:
|
||||||
controller: k8s.io/ingress-nginx
|
controller: k8s.io/ingress-nginx
|
||||||
|
|
@ -636,7 +637,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
webhooks:
|
webhooks:
|
||||||
- admissionReviewVersions:
|
- admissionReviewVersions:
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,12 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
automountServiceAccountToken: true
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -27,7 +28,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -39,7 +40,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -129,7 +130,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -148,7 +149,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -230,7 +231,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -249,7 +250,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -269,7 +270,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -288,7 +289,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -307,7 +308,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -329,7 +330,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -343,7 +344,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -376,7 +377,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller-admission
|
name: ingress-nginx-controller-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -399,7 +400,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -421,7 +422,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
|
|
@ -446,7 +447,7 @@ spec:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: LD_PRELOAD
|
- name: LD_PRELOAD
|
||||||
value: /usr/local/lib/libmimalloc.so
|
value: /usr/local/lib/libmimalloc.so
|
||||||
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
|
|
@ -522,7 +523,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -533,7 +534,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -573,7 +574,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -584,7 +585,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -626,7 +627,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: nginx
|
name: nginx
|
||||||
spec:
|
spec:
|
||||||
controller: k8s.io/ingress-nginx
|
controller: k8s.io/ingress-nginx
|
||||||
|
|
@ -639,7 +640,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
webhooks:
|
webhooks:
|
||||||
- admissionReviewVersions:
|
- admissionReviewVersions:
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,12 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
automountServiceAccountToken: true
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -27,7 +28,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -39,7 +40,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -129,7 +130,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -148,7 +149,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -230,7 +231,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -249,7 +250,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -269,7 +270,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -288,7 +289,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -307,7 +308,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -328,7 +329,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -349,7 +350,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -382,7 +383,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller-admission
|
name: ingress-nginx-controller-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -405,7 +406,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -423,7 +424,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
|
|
@ -448,7 +449,7 @@ spec:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: LD_PRELOAD
|
- name: LD_PRELOAD
|
||||||
value: /usr/local/lib/libmimalloc.so
|
value: /usr/local/lib/libmimalloc.so
|
||||||
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
|
|
@ -528,7 +529,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -539,7 +540,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -579,7 +580,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -590,7 +591,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -632,7 +633,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: nginx
|
name: nginx
|
||||||
spec:
|
spec:
|
||||||
controller: k8s.io/ingress-nginx
|
controller: k8s.io/ingress-nginx
|
||||||
|
|
@ -645,7 +646,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
webhooks:
|
webhooks:
|
||||||
- admissionReviewVersions:
|
- admissionReviewVersions:
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,12 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
automountServiceAccountToken: true
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -27,7 +28,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -39,7 +40,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -129,7 +130,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -148,7 +149,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -230,7 +231,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -249,7 +250,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -269,7 +270,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -288,7 +289,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -307,7 +308,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -328,7 +329,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -340,7 +341,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -372,7 +373,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller-admission
|
name: ingress-nginx-controller-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -395,7 +396,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -417,7 +418,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
|
|
@ -443,7 +444,7 @@ spec:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: LD_PRELOAD
|
- name: LD_PRELOAD
|
||||||
value: /usr/local/lib/libmimalloc.so
|
value: /usr/local/lib/libmimalloc.so
|
||||||
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
|
|
@ -529,7 +530,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -540,7 +541,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -580,7 +581,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -591,7 +592,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -633,7 +634,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: nginx
|
name: nginx
|
||||||
spec:
|
spec:
|
||||||
controller: k8s.io/ingress-nginx
|
controller: k8s.io/ingress-nginx
|
||||||
|
|
@ -646,7 +647,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
webhooks:
|
webhooks:
|
||||||
- admissionReviewVersions:
|
- admissionReviewVersions:
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,12 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
automountServiceAccountToken: true
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -27,7 +28,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -39,7 +40,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -129,7 +130,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -148,7 +149,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -230,7 +231,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -249,7 +250,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -269,7 +270,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -288,7 +289,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -307,7 +308,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -328,7 +329,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -344,7 +345,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -377,7 +378,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller-admission
|
name: ingress-nginx-controller-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -400,7 +401,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -422,7 +423,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
|
|
@ -447,7 +448,7 @@ spec:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: LD_PRELOAD
|
- name: LD_PRELOAD
|
||||||
value: /usr/local/lib/libmimalloc.so
|
value: /usr/local/lib/libmimalloc.so
|
||||||
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
|
|
@ -523,7 +524,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -534,7 +535,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -574,7 +575,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -585,7 +586,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -627,7 +628,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: nginx
|
name: nginx
|
||||||
spec:
|
spec:
|
||||||
controller: k8s.io/ingress-nginx
|
controller: k8s.io/ingress-nginx
|
||||||
|
|
@ -640,7 +641,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
webhooks:
|
webhooks:
|
||||||
- admissionReviewVersions:
|
- admissionReviewVersions:
|
||||||
|
|
|
||||||
|
|
@ -15,11 +15,12 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
automountServiceAccountToken: true
|
||||||
kind: ServiceAccount
|
kind: ServiceAccount
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
|
@ -27,7 +28,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -39,7 +40,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -129,7 +130,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
|
|
@ -148,7 +149,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -230,7 +231,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
|
@ -249,7 +250,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -269,7 +270,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
|
|
@ -288,7 +289,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx
|
name: ingress-nginx
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -307,7 +308,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
|
@ -329,7 +330,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
---
|
---
|
||||||
|
|
@ -343,7 +344,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -376,7 +377,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller-admission
|
name: ingress-nginx-controller-admission
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -399,7 +400,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-controller
|
name: ingress-nginx-controller
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -421,7 +422,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- args:
|
- args:
|
||||||
|
|
@ -446,7 +447,7 @@ spec:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: LD_PRELOAD
|
- name: LD_PRELOAD
|
||||||
value: /usr/local/lib/libmimalloc.so
|
value: /usr/local/lib/libmimalloc.so
|
||||||
image: registry.k8s.io/ingress-nginx/controller:v1.10.1@sha256:e24f39d3eed6bcc239a56f20098878845f62baa34b9f2be2fd2c38ce9fb0f29e
|
image: registry.k8s.io/ingress-nginx/controller:v1.11.1@sha256:e6439a12b52076965928e83b7b56aae6731231677b01e81818bce7fa5c60161a
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
lifecycle:
|
lifecycle:
|
||||||
preStop:
|
preStop:
|
||||||
|
|
@ -522,7 +523,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -533,7 +534,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-create
|
name: ingress-nginx-admission-create
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -573,7 +574,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
namespace: ingress-nginx
|
namespace: ingress-nginx
|
||||||
spec:
|
spec:
|
||||||
|
|
@ -584,7 +585,7 @@ spec:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission-patch
|
name: ingress-nginx-admission-patch
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
|
|
@ -626,7 +627,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: nginx
|
name: nginx
|
||||||
spec:
|
spec:
|
||||||
controller: k8s.io/ingress-nginx
|
controller: k8s.io/ingress-nginx
|
||||||
|
|
@ -639,7 +640,7 @@ metadata:
|
||||||
app.kubernetes.io/instance: ingress-nginx
|
app.kubernetes.io/instance: ingress-nginx
|
||||||
app.kubernetes.io/name: ingress-nginx
|
app.kubernetes.io/name: ingress-nginx
|
||||||
app.kubernetes.io/part-of: ingress-nginx
|
app.kubernetes.io/part-of: ingress-nginx
|
||||||
app.kubernetes.io/version: 1.10.1
|
app.kubernetes.io/version: 1.11.1
|
||||||
name: ingress-nginx-admission
|
name: ingress-nginx-admission
|
||||||
webhooks:
|
webhooks:
|
||||||
- admissionReviewVersions:
|
- admissionReviewVersions:
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,8 @@ Do not try to edit it manually.
|
||||||
- [should validate auth-tls-verify-client](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/authtls.go#L208)
|
- [should validate auth-tls-verify-client](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/authtls.go#L208)
|
||||||
- [should return 403 using auth-tls-match-cn with no matching CN from client](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/authtls.go#L267)
|
- [should return 403 using auth-tls-match-cn with no matching CN from client](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/authtls.go#L267)
|
||||||
- [should return 200 using auth-tls-match-cn with matching CN from client](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/authtls.go#L296)
|
- [should return 200 using auth-tls-match-cn with matching CN from client](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/authtls.go#L296)
|
||||||
- [should return 200 using auth-tls-match-cn where atleast one of the regex options matches CN from client](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/authtls.go#L325)
|
- [should reload the nginx config when auth-tls-match-cn is updated](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/authtls.go#L325)
|
||||||
|
- [should return 200 using auth-tls-match-cn where atleast one of the regex options matches CN from client](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/authtls.go#L368)
|
||||||
### [backend-protocol](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/backendprotocol.go#L29)
|
### [backend-protocol](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/backendprotocol.go#L29)
|
||||||
- [should set backend protocol to https:// and use proxy_pass](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/backendprotocol.go#L36)
|
- [should set backend protocol to https:// and use proxy_pass](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/backendprotocol.go#L36)
|
||||||
- [should set backend protocol to https:// and use proxy_pass with lowercase annotation](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/backendprotocol.go#L51)
|
- [should set backend protocol to https:// and use proxy_pass with lowercase annotation](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/backendprotocol.go#L51)
|
||||||
|
|
@ -148,6 +149,10 @@ Do not try to edit it manually.
|
||||||
- [should allow correct origins - missing subdomain + origin with wildcard origin and correct origin](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/cors.go#L540)
|
- [should allow correct origins - missing subdomain + origin with wildcard origin and correct origin](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/cors.go#L540)
|
||||||
- [should allow - missing origins (should allow all origins)](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/cors.go#L576)
|
- [should allow - missing origins (should allow all origins)](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/cors.go#L576)
|
||||||
- [should allow correct origin but not others - cors allow origin annotations contain trailing comma](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/cors.go#L636)
|
- [should allow correct origin but not others - cors allow origin annotations contain trailing comma](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/cors.go#L636)
|
||||||
|
### [custom-headers-*](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/customheaders.go#L33)
|
||||||
|
- [should return status code 200 when no custom-headers is configured](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/customheaders.go#L40)
|
||||||
|
- [should return status code 503 when custom-headers is configured with an invalid secret](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/customheaders.go#L57)
|
||||||
|
- [more_set_headers 'My-Custom-Header' '42';](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/customheaders.go#L78)
|
||||||
### [custom-http-errors](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/customhttperrors.go#L34)
|
### [custom-http-errors](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/customhttperrors.go#L34)
|
||||||
- [configures Nginx correctly](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/customhttperrors.go#L41)
|
- [configures Nginx correctly](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/customhttperrors.go#L41)
|
||||||
### [default-backend](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/default_backend.go#L29)
|
### [default-backend](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/default_backend.go#L29)
|
||||||
|
|
@ -170,11 +175,13 @@ Do not try to edit it manually.
|
||||||
- [should redirect from www HTTPS to HTTPS](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/fromtowwwredirect.go#L64)
|
- [should redirect from www HTTPS to HTTPS](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/fromtowwwredirect.go#L64)
|
||||||
### [annotation-global-rate-limit](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/globalratelimit.go#L30)
|
### [annotation-global-rate-limit](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/globalratelimit.go#L30)
|
||||||
- [generates correct configuration](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/globalratelimit.go#L38)
|
- [generates correct configuration](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/globalratelimit.go#L38)
|
||||||
### [backend-protocol - GRPC](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L40)
|
### [backend-protocol - GRPC](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L45)
|
||||||
- [should use grpc_pass in the configuration file](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L43)
|
- [should use grpc_pass in the configuration file](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L48)
|
||||||
- [should return OK for service with backend protocol GRPC](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L68)
|
- [should return OK for service with backend protocol GRPC](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L71)
|
||||||
- [authorization metadata should be overwritten by external auth response headers](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L129)
|
- [authorization metadata should be overwritten by external auth response headers](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L132)
|
||||||
- [should return OK for service with backend protocol GRPCS](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L190)
|
- [should return OK for service with backend protocol GRPCS](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L193)
|
||||||
|
- [should return OK when request not exceed timeout](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L266)
|
||||||
|
- [should return Error when request exceed timeout](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/grpc.go#L309)
|
||||||
### [http2-push-preload](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/http2pushpreload.go#L27)
|
### [http2-push-preload](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/http2pushpreload.go#L27)
|
||||||
- [enable the http2-push-preload directive](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/http2pushpreload.go#L34)
|
- [enable the http2-push-preload directive](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/http2pushpreload.go#L34)
|
||||||
### [allowlist-source-range](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/ipallowlist.go#L27)
|
### [allowlist-source-range](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/annotations/ipallowlist.go#L27)
|
||||||
|
|
@ -275,6 +282,8 @@ Do not try to edit it manually.
|
||||||
- [should return a self generated SSL certificate](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/defaultbackend/ssl.go#L29)
|
- [should return a self generated SSL certificate](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/defaultbackend/ssl.go#L29)
|
||||||
### [[Default Backend] change default settings](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/defaultbackend/with_hosts.go#L30)
|
### [[Default Backend] change default settings](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/defaultbackend/with_hosts.go#L30)
|
||||||
- [should apply the annotation to the default backend](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/defaultbackend/with_hosts.go#L38)
|
- [should apply the annotation to the default backend](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/defaultbackend/with_hosts.go#L38)
|
||||||
|
### [[Disable Leader] Routing works when leader election was disabled](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/disableleaderelection/disable_leader.go#L28)
|
||||||
|
- [should create multiple ingress routings rules when leader election has disabled](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/disableleaderelection/disable_leader.go#L35)
|
||||||
### [[Endpointslices] long service name](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/endpointslices/longname.go#L29)
|
### [[Endpointslices] long service name](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/endpointslices/longname.go#L29)
|
||||||
- [should return 200 when service name has max allowed number of characters 63](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/endpointslices/longname.go#L38)
|
- [should return 200 when service name has max allowed number of characters 63](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/endpointslices/longname.go#L38)
|
||||||
### [[TopologyHints] topology aware routing](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/endpointslices/topology.go#L34)
|
### [[TopologyHints] topology aware routing](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/endpointslices/topology.go#L34)
|
||||||
|
|
@ -392,6 +401,7 @@ Do not try to edit it manually.
|
||||||
### [Geoip2](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L36)
|
### [Geoip2](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L36)
|
||||||
- [should include geoip2 line in config when enabled and db file exists](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L45)
|
- [should include geoip2 line in config when enabled and db file exists](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L45)
|
||||||
- [should only allow requests from specific countries](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L69)
|
- [should only allow requests from specific countries](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L69)
|
||||||
|
- [should up and running nginx controller using autoreload flag](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/geoip2.go#L128)
|
||||||
### [[Security] block-*](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/global_access_block.go#L28)
|
### [[Security] block-*](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/global_access_block.go#L28)
|
||||||
- [should block CIDRs defined in the ConfigMap](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/global_access_block.go#L38)
|
- [should block CIDRs defined in the ConfigMap](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/global_access_block.go#L38)
|
||||||
- [should block User-Agents defined in the ConfigMap](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/global_access_block.go#L55)
|
- [should block User-Agents defined in the ConfigMap](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/global_access_block.go#L55)
|
||||||
|
|
@ -409,6 +419,8 @@ Do not try to edit it manually.
|
||||||
- [should have worker_rlimit_nofile option and be independent on amount of worker processes](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/global_options.go#L37)
|
- [should have worker_rlimit_nofile option and be independent on amount of worker processes](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/global_options.go#L37)
|
||||||
### [settings-global-rate-limit](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/globalratelimit.go#L30)
|
### [settings-global-rate-limit](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/globalratelimit.go#L30)
|
||||||
- [generates correct NGINX configuration](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/globalratelimit.go#L38)
|
- [generates correct NGINX configuration](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/globalratelimit.go#L38)
|
||||||
|
### [GRPC](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/grpc.go#L39)
|
||||||
|
- [should set the correct GRPC Buffer Size](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/grpc.go#L42)
|
||||||
### [gzip](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/gzip.go#L30)
|
### [gzip](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/gzip.go#L30)
|
||||||
- [should be disabled by default](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/gzip.go#L40)
|
- [should be disabled by default](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/gzip.go#L40)
|
||||||
- [should be enabled with default settings](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/gzip.go#L56)
|
- [should be enabled with default settings](https://github.com/kubernetes/ingress-nginx/tree/main//test/e2e/settings/gzip.go#L56)
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,8 @@ apiVersion: v1
|
||||||
kind: Pod
|
kind: Pod
|
||||||
metadata:
|
metadata:
|
||||||
name: example-app
|
name: example-app
|
||||||
labels:
|
labels:
|
||||||
app: example-app
|
app: example-app
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: example-app
|
- name: example-app
|
||||||
|
|
|
||||||
22
go.mod
22
go.mod
|
|
@ -15,21 +15,21 @@ require (
|
||||||
github.com/mitchellh/hashstructure/v2 v2.0.2
|
github.com/mitchellh/hashstructure/v2 v2.0.2
|
||||||
github.com/mitchellh/mapstructure v1.5.0
|
github.com/mitchellh/mapstructure v1.5.0
|
||||||
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
|
github.com/moul/pb v0.0.0-20220425114252-bca18df4138c
|
||||||
github.com/ncabatoff/process-exporter v0.7.11
|
github.com/ncabatoff/process-exporter v0.8.2
|
||||||
github.com/onsi/ginkgo/v2 v2.19.0
|
github.com/onsi/ginkgo/v2 v2.19.0
|
||||||
github.com/opencontainers/runc v1.1.13
|
github.com/opencontainers/runc v1.1.13
|
||||||
github.com/pmezard/go-difflib v1.0.0
|
github.com/pmezard/go-difflib v1.0.0
|
||||||
github.com/prometheus/client_golang v1.19.1
|
github.com/prometheus/client_golang v1.19.1
|
||||||
github.com/prometheus/client_model v0.6.1
|
github.com/prometheus/client_model v0.6.1
|
||||||
github.com/prometheus/common v0.54.0
|
github.com/prometheus/common v0.55.0
|
||||||
github.com/spf13/cobra v1.8.1
|
github.com/spf13/cobra v1.8.1
|
||||||
github.com/spf13/pflag v1.0.5
|
github.com/spf13/pflag v1.0.5
|
||||||
github.com/stretchr/testify v1.9.0
|
github.com/stretchr/testify v1.9.0
|
||||||
github.com/yudai/gojsondiff v1.0.0
|
github.com/yudai/gojsondiff v1.0.0
|
||||||
github.com/zakjan/cert-chain-resolver v0.0.0-20221221105603-fcedb00c5b30
|
github.com/zakjan/cert-chain-resolver v0.0.0-20221221105603-fcedb00c5b30
|
||||||
golang.org/x/crypto v0.24.0
|
golang.org/x/crypto v0.25.0
|
||||||
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
|
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
|
||||||
google.golang.org/grpc v1.64.0
|
google.golang.org/grpc v1.65.0
|
||||||
google.golang.org/grpc/examples v0.0.0-20240223204917-5ccf176a08ab
|
google.golang.org/grpc/examples v0.0.0-20240223204917-5ccf176a08ab
|
||||||
gopkg.in/go-playground/pool.v3 v3.1.1
|
gopkg.in/go-playground/pool.v3 v3.1.1
|
||||||
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
|
gopkg.in/mcuadros/go-syslog.v2 v2.3.0
|
||||||
|
|
@ -100,7 +100,7 @@ require (
|
||||||
github.com/opencontainers/runtime-spec v1.2.0 // indirect
|
github.com/opencontainers/runtime-spec v1.2.0 // indirect
|
||||||
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
|
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
github.com/prometheus/procfs v0.13.0 // indirect
|
github.com/prometheus/procfs v0.15.1 // indirect
|
||||||
github.com/sergi/go-diff v1.3.1 // indirect
|
github.com/sergi/go-diff v1.3.1 // indirect
|
||||||
github.com/sirupsen/logrus v1.9.3 // indirect
|
github.com/sirupsen/logrus v1.9.3 // indirect
|
||||||
github.com/xlab/treeprint v1.2.0 // indirect
|
github.com/xlab/treeprint v1.2.0 // indirect
|
||||||
|
|
@ -109,16 +109,16 @@ require (
|
||||||
go.starlark.net v0.0.0-20240123142251-f86470692795 // indirect
|
go.starlark.net v0.0.0-20240123142251-f86470692795 // indirect
|
||||||
go.uber.org/zap v1.27.0 // indirect
|
go.uber.org/zap v1.27.0 // indirect
|
||||||
golang.org/x/mod v0.17.0 // indirect
|
golang.org/x/mod v0.17.0 // indirect
|
||||||
golang.org/x/net v0.25.0 // indirect
|
golang.org/x/net v0.26.0 // indirect
|
||||||
golang.org/x/oauth2 v0.20.0 // indirect
|
golang.org/x/oauth2 v0.21.0 // indirect
|
||||||
golang.org/x/sync v0.7.0 // indirect
|
golang.org/x/sync v0.7.0 // indirect
|
||||||
golang.org/x/sys v0.21.0 // indirect
|
golang.org/x/sys v0.22.0 // indirect
|
||||||
golang.org/x/term v0.21.0 // indirect
|
golang.org/x/term v0.22.0 // indirect
|
||||||
golang.org/x/text v0.16.0 // indirect
|
golang.org/x/text v0.16.0 // indirect
|
||||||
golang.org/x/time v0.5.0 // indirect
|
golang.org/x/time v0.5.0 // indirect
|
||||||
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
|
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
|
||||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20240429193739-8cf5692501f6 // indirect
|
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
|
||||||
google.golang.org/protobuf v1.34.0 // indirect
|
google.golang.org/protobuf v1.34.2 // indirect
|
||||||
gopkg.in/evanphx/json-patch.v5 v5.9.0 // indirect
|
gopkg.in/evanphx/json-patch.v5 v5.9.0 // indirect
|
||||||
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
|
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
|
||||||
gopkg.in/inf.v0 v0.9.1 // indirect
|
gopkg.in/inf.v0 v0.9.1 // indirect
|
||||||
|
|
|
||||||
51
go.work.sum
51
go.work.sum
|
|
@ -1,3 +1,4 @@
|
||||||
|
cel.dev/expr v0.15.0/go.mod h1:TRSuuV7DlVCE/uwv5QbAiW/v8l5O8C4eEPHeu7gf7Sg=
|
||||||
cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA=
|
cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA=
|
||||||
cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
|
cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI=
|
||||||
cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk=
|
cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk=
|
||||||
|
|
@ -560,8 +561,10 @@ github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9 h1:7kQgkwGRoLzC9K0oy
|
||||||
github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19 h1:iXUgAaqDcIUGbRoy2TdeofRG/j1zpGRSEmNK05T+bi8=
|
github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19 h1:iXUgAaqDcIUGbRoy2TdeofRG/j1zpGRSEmNK05T+bi8=
|
||||||
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b h1:slYM766cy2nI3BwyRiyQj/Ud48djTMtMebDqepE95rw=
|
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b h1:slYM766cy2nI3BwyRiyQj/Ud48djTMtMebDqepE95rw=
|
||||||
github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
|
github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjHpqDjYY=
|
||||||
|
github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
|
||||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
|
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
|
||||||
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
|
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
|
||||||
|
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
|
||||||
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
|
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
|
||||||
github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
|
github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
|
||||||
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=
|
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=
|
||||||
|
|
@ -581,6 +584,7 @@ github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZX
|
||||||
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
|
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
|
||||||
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
|
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
|
||||||
github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
|
github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g=
|
||||||
|
github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw=
|
||||||
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
|
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
|
||||||
github.com/checkpoint-restore/go-criu/v5 v5.3.0 h1:wpFFOoomK3389ue2lAb0Boag6XPht5QYpipxmSNL4d8=
|
github.com/checkpoint-restore/go-criu/v5 v5.3.0 h1:wpFFOoomK3389ue2lAb0Boag6XPht5QYpipxmSNL4d8=
|
||||||
github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
|
github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
|
||||||
|
|
@ -592,21 +596,26 @@ github.com/chromedp/chromedp v0.9.2 h1:dKtNz4kApb06KuSXoTQIyUC2TrA0fhGDwNZf3bcgf
|
||||||
github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs=
|
github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmtGzzhLsnLs=
|
||||||
github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
|
github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
|
||||||
github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
|
github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
|
||||||
|
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
||||||
github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
|
github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
|
||||||
github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
|
github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
|
||||||
|
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
||||||
github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
|
github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
|
||||||
github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
|
github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
|
||||||
|
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
||||||
github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
|
github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
|
||||||
github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
|
github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
|
||||||
github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k=
|
github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k=
|
||||||
github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
|
github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
|
||||||
github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
|
github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
|
||||||
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=
|
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk=
|
||||||
|
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
|
||||||
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
|
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
|
||||||
github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
|
github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
|
||||||
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
|
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ=
|
||||||
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
|
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM=
|
||||||
github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50/go.mod h1:5e1+Vvlzido69INQaVO6d87Qn543Xr6nooe9Kz7oBFM=
|
github.com/cncf/xds/go v0.0.0-20240318125728-8a4994d93e50/go.mod h1:5e1+Vvlzido69INQaVO6d87Qn543Xr6nooe9Kz7oBFM=
|
||||||
|
github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
|
||||||
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
|
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
|
||||||
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
|
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
|
||||||
github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=
|
github.com/coreos/go-oidc v2.2.1+incompatible h1:mh48q/BqXqgjVHpy2ZY7WnWAbenxRjsz9N1i1YxjHAk=
|
||||||
|
|
@ -653,8 +662,10 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
|
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
|
||||||
github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
|
github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
|
||||||
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
|
github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU=
|
||||||
|
github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
|
||||||
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 h1:6zl3BbBhdnMkpSj2YY30qV3gDcVBGtFgVsV3+/i+mKQ=
|
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 h1:6zl3BbBhdnMkpSj2YY30qV3gDcVBGtFgVsV3+/i+mKQ=
|
||||||
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
|
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
|
||||||
|
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
|
||||||
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
|
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
|
||||||
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||||
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
|
||||||
|
|
@ -676,6 +687,7 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91
|
||||||
github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
|
github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
|
||||||
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
|
github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
|
||||||
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
|
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
|
||||||
|
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
|
||||||
github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
|
github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
|
||||||
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
|
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
|
||||||
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
|
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
|
||||||
|
|
@ -690,7 +702,9 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF0
|
||||||
github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
|
github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
|
||||||
github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
|
github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68=
|
||||||
github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
|
github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
|
||||||
|
github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
|
||||||
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
|
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
|
||||||
|
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||||
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
|
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
|
||||||
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
|
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
|
||||||
github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
|
github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
|
||||||
|
|
@ -702,9 +716,12 @@ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
|
||||||
github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
|
github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
|
||||||
github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
|
github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
|
||||||
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||||
|
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
|
||||||
github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
|
github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
|
||||||
github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
|
github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
|
||||||
github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
|
github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
|
||||||
|
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
|
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
|
github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
|
||||||
github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
|
github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
|
||||||
|
|
@ -722,12 +739,14 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2
|
||||||
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
|
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
|
||||||
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
|
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
|
||||||
github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
|
github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
|
||||||
|
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
|
||||||
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
|
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
|
||||||
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
|
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
|
||||||
github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
|
github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
|
||||||
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
||||||
github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=
|
github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0=
|
||||||
github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
|
github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
|
||||||
|
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
|
github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465 h1:KwWnWVWCNtNq/ewIX7HIKnELmEx2nDP42yskD/pi7QE=
|
github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465 h1:KwWnWVWCNtNq/ewIX7HIKnELmEx2nDP42yskD/pi7QE=
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
|
github.com/ianlancetaylor/demangle v0.0.0-20240312041847-bd984b5ce465/go.mod h1:gx7rwoVhcfuVKG5uya9Hs3Sxj7EIvldVofAWIUtGouw=
|
||||||
|
|
@ -738,8 +757,10 @@ github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJS
|
||||||
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
|
github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
|
||||||
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
|
github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
|
||||||
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
|
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
|
||||||
|
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
|
||||||
github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
|
github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
|
||||||
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
|
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
|
||||||
|
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
|
||||||
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 h1:PJr+ZMXIecYc1Ey2zucXdR73SMBtgjPgwa31099IMv0=
|
github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5 h1:PJr+ZMXIecYc1Ey2zucXdR73SMBtgjPgwa31099IMv0=
|
||||||
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
|
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
|
||||||
github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=
|
github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=
|
||||||
|
|
@ -767,6 +788,7 @@ github.com/lyft/protoc-gen-star/v2 v2.0.1 h1:keaAo8hRuAT0O3DfJ/wM3rufbAjGeJ1lAtW
|
||||||
github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk=
|
github.com/lyft/protoc-gen-star/v2 v2.0.3/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk=
|
||||||
github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw=
|
github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw=
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
|
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
|
||||||
|
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
|
||||||
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
|
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
|
||||||
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=
|
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=
|
||||||
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
|
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
|
||||||
|
|
@ -776,9 +798,11 @@ github.com/mrunalp/fileutils v0.5.1 h1:F+S7ZlNKnrwHfSwdlgNSkKo67ReVf8o9fel6C3dkm
|
||||||
github.com/mrunalp/fileutils v0.5.1/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
|
github.com/mrunalp/fileutils v0.5.1/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
|
||||||
github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
||||||
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
|
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
|
||||||
|
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
||||||
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
|
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
|
||||||
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
|
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
|
||||||
github.com/ncabatoff/fakescraper v0.0.0-20201102132415-4b37ba603d65 h1:Og+dVkxEQNvRGU2vUKeOwYT2UJ+pEaDMWB6tIQnIh6A=
|
github.com/ncabatoff/fakescraper v0.0.0-20201102132415-4b37ba603d65 h1:Og+dVkxEQNvRGU2vUKeOwYT2UJ+pEaDMWB6tIQnIh6A=
|
||||||
|
github.com/ncabatoff/fakescraper v0.0.0-20201102132415-4b37ba603d65/go.mod h1:Tx6UMSMyIsjLG/VU/F6xA1+0XI+/f9o1dGJnf1l+bPg=
|
||||||
github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
|
github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
|
||||||
github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
|
github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
|
||||||
github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
|
github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
|
||||||
|
|
@ -795,12 +819,16 @@ github.com/phpdave11/gofpdf v1.4.2 h1:KPKiIbfwbvC/wOncwhrpRdXVj2CZTCFlw4wnoyjtHf
|
||||||
github.com/phpdave11/gofpdi v1.0.13 h1:o61duiW8M9sMlkVXWlvP92sZJtGKENvW3VExs6dZukQ=
|
github.com/phpdave11/gofpdi v1.0.13 h1:o61duiW8M9sMlkVXWlvP92sZJtGKENvW3VExs6dZukQ=
|
||||||
github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
|
github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
|
||||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
|
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A=
|
||||||
|
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||||
github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs=
|
github.com/pkg/sftp v1.13.1 h1:I2qBYMChEhIjOgazfJmV3/mZM256btk6wkCDRmW7JYs=
|
||||||
github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc=
|
github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc=
|
||||||
github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
|
github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
|
||||||
github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g=
|
github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g=
|
||||||
|
github.com/prometheus/exporter-toolkit v0.11.0/go.mod h1:BVnENhnNecpwoTLiABx7mrPB/OLRIgN74qlQbV+FK1Q=
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
|
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
|
||||||
github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
|
github.com/rogpeppe/fastuuid v1.2.0 h1:Ppwyp6VYCF1nvBTXL3trRso7mXMlRrw9ooo375wvi2s=
|
||||||
|
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||||
|
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
|
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
|
||||||
github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245 h1:K1Xf3bKttbF+koVGaX5xngRIZ5bVjbmPnaxE/dR08uY=
|
github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245 h1:K1Xf3bKttbF+koVGaX5xngRIZ5bVjbmPnaxE/dR08uY=
|
||||||
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds=
|
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds=
|
||||||
|
|
@ -814,6 +842,12 @@ github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw=
|
||||||
github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
|
github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
|
||||||
github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
|
github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
|
||||||
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
|
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
|
||||||
|
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||||
|
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||||
|
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||||
|
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||||
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=
|
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI=
|
||||||
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
||||||
|
|
@ -837,6 +871,7 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
||||||
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
||||||
github.com/xhit/go-str2duration v1.2.0 h1:BcV5u025cITWxEQKGWr1URRzrcXtu7uk8+luz3Yuhwc=
|
github.com/xhit/go-str2duration v1.2.0 h1:BcV5u025cITWxEQKGWr1URRzrcXtu7uk8+luz3Yuhwc=
|
||||||
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
|
github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
|
||||||
|
github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
|
||||||
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
|
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
|
||||||
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
|
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
|
||||||
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
|
github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
|
||||||
|
|
@ -897,14 +932,20 @@ golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
|
||||||
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||||
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
|
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
|
||||||
|
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||||
|
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
|
||||||
golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
|
golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
|
||||||
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
|
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
|
||||||
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
|
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028 h1:4+4C/Iv2U4fMZBiMCc98MG1In4gJY5YRhtpDNeDeHWs=
|
||||||
|
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
||||||
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||||
|
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
||||||
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
|
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
|
||||||
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
|
||||||
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
|
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
|
||||||
|
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
|
||||||
|
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
|
||||||
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
||||||
golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
|
golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
|
||||||
golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk=
|
golang.org/x/oauth2 v0.11.0/go.mod h1:LdF7O/8bLR/qWK9DrpXmbHLTouvRHK0SgJl0GmDBchk=
|
||||||
|
|
@ -913,19 +954,27 @@ golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74Ow
|
||||||
golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
|
golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
|
||||||
golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
|
golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA=
|
||||||
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
||||||
|
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
|
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ=
|
golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ=
|
||||||
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY=
|
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY=
|
||||||
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
|
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
|
||||||
|
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
|
||||||
|
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
|
||||||
|
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||||
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||||
|
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||||
golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
|
golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
|
||||||
golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
|
golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
|
||||||
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
|
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
|
||||||
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
|
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
|
||||||
|
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
|
||||||
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
|
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
|
||||||
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
|
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
|
||||||
|
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
|
||||||
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
|
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
|
||||||
gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E=
|
gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E=
|
||||||
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc=
|
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc=
|
||||||
|
|
@ -935,6 +984,7 @@ google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWL
|
||||||
google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI=
|
google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI=
|
||||||
google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk=
|
google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk=
|
||||||
google.golang.org/api v0.162.0/go.mod h1:6SulDkfoBIg4NFmCuZ39XeeAgSHCPecfSUuDyYlAHs0=
|
google.golang.org/api v0.162.0/go.mod h1:6SulDkfoBIg4NFmCuZ39XeeAgSHCPecfSUuDyYlAHs0=
|
||||||
|
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
||||||
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
|
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
|
||||||
google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU=
|
google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:CCviP9RmpZ1mxVr8MUjCnSiY09IbAXZxhLE6EhHIdPU=
|
||||||
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0=
|
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 h1:SeZZZx0cP0fqUyA+oRzP9k7cSwJlvDFiROO72uwD6i0=
|
||||||
|
|
@ -968,6 +1018,7 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9/go.
|
||||||
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0=
|
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0=
|
||||||
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8=
|
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8=
|
||||||
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE=
|
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE=
|
||||||
|
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU=
|
||||||
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc h1:g3hIDl0jRNd9PPTs2uBzYuaD5mQuwOkZY0vSc0LR32o=
|
google.golang.org/genproto/googleapis/bytestream v0.0.0-20230530153820-e85fd2cbaebc h1:g3hIDl0jRNd9PPTs2uBzYuaD5mQuwOkZY0vSc0LR32o=
|
||||||
google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw=
|
google.golang.org/genproto/googleapis/bytestream v0.0.0-20231030173426-d783a09b4405/go.mod h1:GRUCuLdzVqZte8+Dl/D4N25yLzcGqqWaYkeVOwulFqw=
|
||||||
google.golang.org/genproto/googleapis/bytestream v0.0.0-20231212172506-995d672761c0/go.mod h1:guYXGPwC6jwxgWKW5Y405fKWOFNwlvUlUnzyp9i0uqo=
|
google.golang.org/genproto/googleapis/bytestream v0.0.0-20231212172506-995d672761c0/go.mod h1:guYXGPwC6jwxgWKW5Y405fKWOFNwlvUlUnzyp9i0uqo=
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
ARG GOLANG_VERSION
|
ARG GOLANG_VERSION
|
||||||
|
|
||||||
FROM golang:${GOLANG_VERSION}-alpine3.18 as builder
|
FROM golang:${GOLANG_VERSION}-alpine3.20 as builder
|
||||||
|
|
||||||
RUN apk update \
|
RUN apk update \
|
||||||
&& apk upgrade && apk add git
|
&& apk upgrade && apk add git
|
||||||
|
|
@ -37,4 +37,4 @@ COPY --from=builder /go/src/k8s.io/ingress-nginx/images/custom-error-pages/www /
|
||||||
COPY --from=builder /go/src/k8s.io/ingress-nginx/images/custom-error-pages/etc /etc
|
COPY --from=builder /go/src/k8s.io/ingress-nginx/images/custom-error-pages/etc /etc
|
||||||
USER nonroot:nonroot
|
USER nonroot:nonroot
|
||||||
|
|
||||||
CMD ["/nginx-errors"]
|
CMD ["/nginx-errors"]
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
v1.4.1
|
v1.4.2
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
v0.0.7
|
v0.0.10
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,8 @@ export MODSECURITY_LIB_VERSION=v3.0.12
|
||||||
# Check for recent changes: https://github.com/coreruleset/coreruleset/compare/v3.3.5...v4.0/main
|
# Check for recent changes: https://github.com/coreruleset/coreruleset/compare/v3.3.5...v4.0/main
|
||||||
export OWASP_MODSECURITY_CRS_VERSION=v4.4.0
|
export OWASP_MODSECURITY_CRS_VERSION=v4.4.0
|
||||||
|
|
||||||
# Check for recent changes: https://github.com/openresty/lua-nginx-module/compare/b5d1688ae722538ba4dc8a7ec08820a08abfb93d...master
|
# Check for recent changes: https://github.com/openresty/lua-nginx-module/compare/v0.10.26``...master
|
||||||
export LUA_NGX_VERSION=b5d1688ae722538ba4dc8a7ec08820a08abfb93d
|
export LUA_NGX_VERSION=v0.10.26
|
||||||
|
|
||||||
# Check for recent changes: https://github.com/openresty/stream-lua-nginx-module/compare/bea8a0c0de94cede71554f53818ac0267d675d63...master
|
# Check for recent changes: https://github.com/openresty/stream-lua-nginx-module/compare/bea8a0c0de94cede71554f53818ac0267d675d63...master
|
||||||
export LUA_STREAM_NGX_VERSION=bea8a0c0de94cede71554f53818ac0267d675d63
|
export LUA_STREAM_NGX_VERSION=bea8a0c0de94cede71554f53818ac0267d675d63
|
||||||
|
|
@ -622,7 +622,7 @@ for dir in "${writeDirs[@]}"; do
|
||||||
done
|
done
|
||||||
|
|
||||||
rm -rf /etc/nginx/owasp-modsecurity-crs/.git
|
rm -rf /etc/nginx/owasp-modsecurity-crs/.git
|
||||||
rm -rf /etc/nginx/owasp-modsecurity-crs/util/regression-tests
|
rm -rf /etc/nginx/owasp-modsecurity-crs/tests
|
||||||
|
|
||||||
# remove .a files
|
# remove .a files
|
||||||
find /usr/local -name "*.a" -print | xargs /bin/rm
|
find /usr/local -name "*.a" -print | xargs /bin/rm
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
diff --git a/src/os/win32/ngx_event_log.c b/src/os/win32/ngx_event_log.c
|
||||||
|
index e11ed1e8..dce8eddd 100644
|
||||||
|
--- a/src/os/win32/ngx_event_log.c
|
||||||
|
+++ b/src/os/win32/ngx_event_log.c
|
||||||
|
@@ -8,7 +8,9 @@
|
||||||
|
#include <ngx_core.h>
|
||||||
|
|
||||||
|
|
||||||
|
-#define NGX_MAX_ERROR_STR 2048
|
||||||
|
+#ifndef NGX_MAX_ERROR_STR
|
||||||
|
+#define NGX_MAX_ERROR_STR 4096
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
|
||||||
|
void ngx_cdecl
|
||||||
|
|
@ -0,0 +1,53 @@
|
||||||
|
diff --git a/src/stream/ngx_stream_upstream_round_robin.c b/src/stream/ngx_stream_upstream_round_robin.c
|
||||||
|
index 526de3a..b531ce1 100644
|
||||||
|
--- a/src/stream/ngx_stream_upstream_round_robin.c
|
||||||
|
+++ b/src/stream/ngx_stream_upstream_round_robin.c
|
||||||
|
@@ -21,10 +21,6 @@ static void ngx_stream_upstream_notify_round_robin_peer(
|
||||||
|
|
||||||
|
#if (NGX_STREAM_SSL)
|
||||||
|
|
||||||
|
-static ngx_int_t ngx_stream_upstream_set_round_robin_peer_session(
|
||||||
|
- ngx_peer_connection_t *pc, void *data);
|
||||||
|
-static void ngx_stream_upstream_save_round_robin_peer_session(
|
||||||
|
- ngx_peer_connection_t *pc, void *data);
|
||||||
|
static ngx_int_t ngx_stream_upstream_empty_set_session(
|
||||||
|
ngx_peer_connection_t *pc, void *data);
|
||||||
|
static void ngx_stream_upstream_empty_save_session(ngx_peer_connection_t *pc,
|
||||||
|
@@ -690,7 +686,7 @@ ngx_stream_upstream_notify_round_robin_peer(ngx_peer_connection_t *pc,
|
||||||
|
|
||||||
|
#if (NGX_STREAM_SSL)
|
||||||
|
|
||||||
|
-static ngx_int_t
|
||||||
|
+ngx_int_t
|
||||||
|
ngx_stream_upstream_set_round_robin_peer_session(ngx_peer_connection_t *pc,
|
||||||
|
void *data)
|
||||||
|
{
|
||||||
|
@@ -756,7 +752,7 @@ ngx_stream_upstream_set_round_robin_peer_session(ngx_peer_connection_t *pc,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
-static void
|
||||||
|
+void
|
||||||
|
ngx_stream_upstream_save_round_robin_peer_session(ngx_peer_connection_t *pc,
|
||||||
|
void *data)
|
||||||
|
{
|
||||||
|
diff --git a/src/stream/ngx_stream_upstream_round_robin.h b/src/stream/ngx_stream_upstream_round_robin.h
|
||||||
|
index 35d9fce..75f3e31 100644
|
||||||
|
--- a/src/stream/ngx_stream_upstream_round_robin.h
|
||||||
|
+++ b/src/stream/ngx_stream_upstream_round_robin.h
|
||||||
|
@@ -142,5 +142,15 @@ ngx_int_t ngx_stream_upstream_get_round_robin_peer(ngx_peer_connection_t *pc,
|
||||||
|
void ngx_stream_upstream_free_round_robin_peer(ngx_peer_connection_t *pc,
|
||||||
|
void *data, ngx_uint_t state);
|
||||||
|
|
||||||
|
+#if (NGX_STREAM_SSL)
|
||||||
|
+ngx_int_t ngx_stream_upstream_set_round_robin_peer_session(
|
||||||
|
+ ngx_peer_connection_t *pc, void *data);
|
||||||
|
+void ngx_stream_upstream_save_round_robin_peer_session(
|
||||||
|
+ ngx_peer_connection_t *pc, void *data);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+#define HAVE_NGX_STREAM_BALANCER_EXPORT_PATCH 1
|
||||||
|
+
|
||||||
|
|
||||||
|
#endif /* _NGX_STREAM_UPSTREAM_ROUND_ROBIN_H_INCLUDED_ */
|
||||||
|
|
@ -0,0 +1,31 @@
|
||||||
|
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
|
||||||
|
index 09d2459..de92724 100644
|
||||||
|
--- a/src/stream/ngx_stream.h
|
||||||
|
+++ b/src/stream/ngx_stream.h
|
||||||
|
@@ -303,4 +303,7 @@ typedef ngx_int_t (*ngx_stream_filter_pt)(ngx_stream_session_t *s,
|
||||||
|
extern ngx_stream_filter_pt ngx_stream_top_filter;
|
||||||
|
|
||||||
|
|
||||||
|
+#define HAS_NGX_STREAM_PROXY_GET_NEXT_UPSTREAM_TRIES_PATCH 1
|
||||||
|
+
|
||||||
|
+
|
||||||
|
#endif /* _NGX_STREAM_H_INCLUDED_ */
|
||||||
|
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
|
||||||
|
index 0afde1c..3254ce1 100644
|
||||||
|
--- a/src/stream/ngx_stream_proxy_module.c
|
||||||
|
+++ b/src/stream/ngx_stream_proxy_module.c
|
||||||
|
@@ -2156,3 +2156,14 @@ ngx_stream_proxy_bind(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||||
|
|
||||||
|
return NGX_CONF_OK;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ngx_uint_t
|
||||||
|
+ngx_stream_proxy_get_next_upstream_tries(ngx_stream_session_t *s)
|
||||||
|
+{
|
||||||
|
+ ngx_stream_proxy_srv_conf_t *pscf;
|
||||||
|
+
|
||||||
|
+ pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
|
||||||
|
+
|
||||||
|
+ return pscf->next_upstream_tries;
|
||||||
|
+}
|
||||||
|
|
@ -0,0 +1,178 @@
|
||||||
|
diff -u -r -p -Naur nginx-1.25.3/src/stream/ngx_stream.h nginx-1.25.3-patched/src/stream/ngx_stream.h
|
||||||
|
--- nginx-1.25.3/src/stream/ngx_stream.h 2021-11-04 21:27:55.288708527 +0800
|
||||||
|
+++ nginx-1.25.3-patched/src/stream/ngx_stream.h 2021-11-04 21:28:50.768035209 +0800
|
||||||
|
@@ -254,6 +254,15 @@ typedef struct {
|
||||||
|
} ngx_stream_module_t;
|
||||||
|
|
||||||
|
|
||||||
|
+typedef struct {
|
||||||
|
+ ngx_msec_t connect_timeout;
|
||||||
|
+ ngx_msec_t timeout;
|
||||||
|
+} ngx_stream_proxy_ctx_t;
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+#define NGX_STREAM_HAVE_PROXY_TIMEOUT_FIELDS_PATCH 1
|
||||||
|
+
|
||||||
|
+
|
||||||
|
#define NGX_STREAM_MODULE 0x4d525453 /* "STRM" */
|
||||||
|
|
||||||
|
#define NGX_STREAM_MAIN_CONF 0x02000000
|
||||||
|
@@ -307,6 +316,7 @@ void ngx_stream_finalize_session(ngx_str
|
||||||
|
extern ngx_module_t ngx_stream_module;
|
||||||
|
extern ngx_uint_t ngx_stream_max_module;
|
||||||
|
extern ngx_module_t ngx_stream_core_module;
|
||||||
|
+extern ngx_module_t ngx_stream_proxy_module;
|
||||||
|
|
||||||
|
|
||||||
|
typedef ngx_int_t (*ngx_stream_filter_pt)(ngx_stream_session_t *s,
|
||||||
|
diff -u -r -p -Naur nginx-1.25.3/src/stream/ngx_stream_proxy_module.c nginx-1.25.3-patched/src/stream/ngx_stream_proxy_module.c
|
||||||
|
--- nginx-1.25.3/src/stream/ngx_stream_proxy_module.c 2021-11-04 21:27:55.289708533 +0800
|
||||||
|
+++ nginx-1.25.3-patched/src/stream/ngx_stream_proxy_module.c 2021-11-04 21:37:03.578936990 +0800
|
||||||
|
@@ -400,6 +400,7 @@ ngx_stream_proxy_handler(ngx_stream_sess
|
||||||
|
ngx_stream_proxy_srv_conf_t *pscf;
|
||||||
|
ngx_stream_upstream_srv_conf_t *uscf, **uscfp;
|
||||||
|
ngx_stream_upstream_main_conf_t *umcf;
|
||||||
|
+ ngx_stream_proxy_ctx_t *pctx;
|
||||||
|
|
||||||
|
c = s->connection;
|
||||||
|
|
||||||
|
@@ -408,6 +409,17 @@ ngx_stream_proxy_handler(ngx_stream_sess
|
||||||
|
ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0,
|
||||||
|
"proxy connection handler");
|
||||||
|
|
||||||
|
+ pctx = ngx_palloc(c->pool, sizeof(ngx_stream_proxy_ctx_t));
|
||||||
|
+ if (pctx == NULL) {
|
||||||
|
+ ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ pctx->connect_timeout = pscf->connect_timeout;
|
||||||
|
+ pctx->timeout = pscf->timeout;
|
||||||
|
+
|
||||||
|
+ ngx_stream_set_ctx(s, pctx, ngx_stream_proxy_module);
|
||||||
|
+
|
||||||
|
u = ngx_pcalloc(c->pool, sizeof(ngx_stream_upstream_t));
|
||||||
|
if (u == NULL) {
|
||||||
|
ngx_stream_proxy_finalize(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
|
||||||
|
@@ -699,6 +711,7 @@ ngx_stream_proxy_connect(ngx_stream_sess
|
||||||
|
ngx_connection_t *c, *pc;
|
||||||
|
ngx_stream_upstream_t *u;
|
||||||
|
ngx_stream_proxy_srv_conf_t *pscf;
|
||||||
|
+ ngx_stream_proxy_ctx_t *ctx;
|
||||||
|
|
||||||
|
c = s->connection;
|
||||||
|
|
||||||
|
@@ -706,6 +719,8 @@ ngx_stream_proxy_connect(ngx_stream_sess
|
||||||
|
|
||||||
|
pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
|
||||||
|
|
||||||
|
+ ctx = ngx_stream_get_module_ctx(s, ngx_stream_proxy_module);
|
||||||
|
+
|
||||||
|
u = s->upstream;
|
||||||
|
|
||||||
|
u->connected = 0;
|
||||||
|
@@ -774,7 +789,7 @@ ngx_stream_proxy_connect(ngx_stream_sess
|
||||||
|
pc->read->handler = ngx_stream_proxy_connect_handler;
|
||||||
|
pc->write->handler = ngx_stream_proxy_connect_handler;
|
||||||
|
|
||||||
|
- ngx_add_timer(pc->write, pscf->connect_timeout);
|
||||||
|
+ ngx_add_timer(pc->write, ctx->connect_timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -957,12 +957,14 @@ ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
|
||||||
|
static ngx_int_t
|
||||||
|
ngx_stream_proxy_send_proxy_protocol(ngx_stream_session_t *s)
|
||||||
|
{
|
||||||
|
- u_char *p;
|
||||||
|
- ssize_t n, size;
|
||||||
|
- ngx_connection_t *c, *pc;
|
||||||
|
- ngx_stream_upstream_t *u;
|
||||||
|
- ngx_stream_proxy_srv_conf_t *pscf;
|
||||||
|
- u_char buf[NGX_PROXY_PROTOCOL_V1_MAX_HEADER];
|
||||||
|
+ u_char *p;
|
||||||
|
+ u_char buf[NGX_PROXY_PROTOCOL_V1_MAX_HEADER];
|
||||||
|
+ ssize_t n, size;
|
||||||
|
+ ngx_connection_t *c, *pc;
|
||||||
|
+ ngx_stream_upstream_t *u;
|
||||||
|
+ ngx_stream_proxy_ctx_t *ctx;
|
||||||
|
+
|
||||||
|
+ ctx = ngx_stream_get_module_ctx(s, ngx_stream_proxy_module);
|
||||||
|
|
||||||
|
c = s->connection;
|
||||||
|
|
||||||
|
@@ -976,9 +993,7 @@ ngx_stream_proxy_send_proxy_protocol(ngx
|
||||||
|
return NGX_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
- pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
|
||||||
|
-
|
||||||
|
- ngx_add_timer(pc->write, pscf->timeout);
|
||||||
|
+ ngx_add_timer(pc->write, ctx->timeout);
|
||||||
|
|
||||||
|
pc->write->handler = ngx_stream_proxy_connect_handler;
|
||||||
|
|
||||||
|
@@ -1053,6 +1068,9 @@ ngx_stream_proxy_ssl_init_connection(ngx
|
||||||
|
ngx_connection_t *pc;
|
||||||
|
ngx_stream_upstream_t *u;
|
||||||
|
ngx_stream_proxy_srv_conf_t *pscf;
|
||||||
|
+ ngx_stream_proxy_ctx_t *ctx;
|
||||||
|
+
|
||||||
|
+ ctx = ngx_stream_get_module_ctx(s, ngx_stream_proxy_module);
|
||||||
|
|
||||||
|
u = s->upstream;
|
||||||
|
|
||||||
|
@@ -1099,7 +1117,7 @@ ngx_stream_proxy_ssl_init_connection(ngx
|
||||||
|
if (rc == NGX_AGAIN) {
|
||||||
|
|
||||||
|
if (!pc->write->timer_set) {
|
||||||
|
- ngx_add_timer(pc->write, pscf->connect_timeout);
|
||||||
|
+ ngx_add_timer(pc->write, ctx->connect_timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
pc->ssl->handler = ngx_stream_proxy_ssl_handshake;
|
||||||
|
@@ -1408,6 +1426,7 @@ ngx_stream_proxy_process_connection(ngx_
|
||||||
|
ngx_stream_session_t *s;
|
||||||
|
ngx_stream_upstream_t *u;
|
||||||
|
ngx_stream_proxy_srv_conf_t *pscf;
|
||||||
|
+ ngx_stream_proxy_ctx_t *ctx;
|
||||||
|
|
||||||
|
c = ev->data;
|
||||||
|
s = c->data;
|
||||||
|
@@ -1419,6 +1438,8 @@ ngx_stream_proxy_process_connection(ngx_
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ ctx = ngx_stream_get_module_ctx(s, ngx_stream_proxy_module);
|
||||||
|
+
|
||||||
|
c = s->connection;
|
||||||
|
pc = u->peer.connection;
|
||||||
|
|
||||||
|
@@ -1438,7 +1459,7 @@ ngx_stream_proxy_process_connection(ngx_
|
||||||
|
}
|
||||||
|
|
||||||
|
if (u->connected && !c->read->delayed && !pc->read->delayed) {
|
||||||
|
- ngx_add_timer(c->write, pscf->timeout);
|
||||||
|
+ ngx_add_timer(c->write, ctx->timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
@@ -1600,6 +1621,9 @@ ngx_stream_proxy_process(ngx_stream_sess
|
||||||
|
ngx_log_handler_pt handler;
|
||||||
|
ngx_stream_upstream_t *u;
|
||||||
|
ngx_stream_proxy_srv_conf_t *pscf;
|
||||||
|
+ ngx_stream_proxy_ctx_t *ctx;
|
||||||
|
+
|
||||||
|
+ ctx = ngx_stream_get_module_ctx(s, ngx_stream_proxy_module);
|
||||||
|
|
||||||
|
u = s->upstream;
|
||||||
|
|
||||||
|
@@ -1807,7 +1831,7 @@ ngx_stream_proxy_process(ngx_stream_sess
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!c->read->delayed && !pc->read->delayed) {
|
||||||
|
- ngx_add_timer(c->write, pscf->timeout);
|
||||||
|
+ ngx_add_timer(c->write, ctx->timeout);
|
||||||
|
|
||||||
|
} else if (c->write->timer_set) {
|
||||||
|
ngx_del_timer(c->write);
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
diff --git a/src/stream/ngx_stream_ssl_preread_module.c b/src/stream/ngx_stream_ssl_preread_module.c
|
||||||
|
index e3d11fd9..3717b5fe 100644
|
||||||
|
--- a/src/stream/ngx_stream_ssl_preread_module.c
|
||||||
|
+++ b/src/stream/ngx_stream_ssl_preread_module.c
|
||||||
|
@@ -159,7 +159,7 @@ ngx_stream_ssl_preread_handler(ngx_stream_session_t *s)
|
||||||
|
|
||||||
|
rc = ngx_stream_ssl_preread_parse_record(ctx, p, p + len);
|
||||||
|
if (rc != NGX_AGAIN) {
|
||||||
|
- return rc;
|
||||||
|
+ return rc == NGX_OK ? NGX_DECLINED : rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
p += len;
|
||||||
|
|
@ -0,0 +1,263 @@
|
||||||
|
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
|
||||||
|
index cd55520c..dade1846 100644
|
||||||
|
--- a/src/core/ngx_resolver.c
|
||||||
|
+++ b/src/core/ngx_resolver.c
|
||||||
|
@@ -9,12 +9,26 @@
|
||||||
|
#include <ngx_core.h>
|
||||||
|
#include <ngx_event.h>
|
||||||
|
|
||||||
|
+#if !(NGX_WIN32)
|
||||||
|
+#include <resolv.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
|
||||||
|
#define NGX_RESOLVER_UDP_SIZE 4096
|
||||||
|
|
||||||
|
#define NGX_RESOLVER_TCP_RSIZE (2 + 65535)
|
||||||
|
#define NGX_RESOLVER_TCP_WSIZE 8192
|
||||||
|
|
||||||
|
+#if !(NGX_WIN32)
|
||||||
|
+/*
|
||||||
|
+ * note that 2KB should be more than enough for majority of the
|
||||||
|
+ * resolv.conf files out there. it also acts as a safety guard to prevent
|
||||||
|
+ * abuse.
|
||||||
|
+ */
|
||||||
|
+#define NGX_RESOLVER_FILE_BUF_SIZE 2048
|
||||||
|
+#define NGX_RESOLVER_FILE_NAME "/etc/resolv.conf"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
u_char ident_hi;
|
||||||
|
@@ -131,6 +145,191 @@ static ngx_resolver_node_t *ngx_resolver_lookup_addr6(ngx_resolver_t *r,
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
+#if !(NGX_WIN32)
|
||||||
|
+static ngx_int_t
|
||||||
|
+ngx_resolver_read_resolv_conf(ngx_conf_t *cf, ngx_resolver_t *r, u_char *path,
|
||||||
|
+ size_t path_len)
|
||||||
|
+{
|
||||||
|
+ ngx_url_t u;
|
||||||
|
+ ngx_resolver_connection_t *rec;
|
||||||
|
+ ngx_fd_t fd;
|
||||||
|
+ ngx_file_t file;
|
||||||
|
+ u_char buf[NGX_RESOLVER_FILE_BUF_SIZE];
|
||||||
|
+ u_char ipv6_buf[NGX_INET6_ADDRSTRLEN];
|
||||||
|
+ ngx_uint_t address = 0, j, total = 0;
|
||||||
|
+ ssize_t n, i;
|
||||||
|
+ enum {
|
||||||
|
+ sw_nameserver,
|
||||||
|
+ sw_spaces,
|
||||||
|
+ sw_address,
|
||||||
|
+ sw_skip
|
||||||
|
+ } state;
|
||||||
|
+
|
||||||
|
+ file.name.data = path;
|
||||||
|
+ file.name.len = path_len;
|
||||||
|
+
|
||||||
|
+ if (ngx_conf_full_name(cf->cycle, &file.name, 1) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ fd = ngx_open_file(file.name.data, NGX_FILE_RDONLY,
|
||||||
|
+ NGX_FILE_OPEN, 0);
|
||||||
|
+
|
||||||
|
+ if (fd == NGX_INVALID_FILE) {
|
||||||
|
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
|
||||||
|
+ ngx_open_file_n " \"%s\" failed", file.name.data);
|
||||||
|
+
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ngx_memzero(&file, sizeof(ngx_file_t));
|
||||||
|
+
|
||||||
|
+ file.fd = fd;
|
||||||
|
+ file.log = cf->log;
|
||||||
|
+
|
||||||
|
+ state = sw_nameserver;
|
||||||
|
+
|
||||||
|
+ n = ngx_read_file(&file, buf, NGX_RESOLVER_FILE_BUF_SIZE, 0);
|
||||||
|
+
|
||||||
|
+ if (n == NGX_ERROR) {
|
||||||
|
+ ngx_conf_log_error(NGX_LOG_ALERT, cf, ngx_errno,
|
||||||
|
+ ngx_read_file_n " \"%s\" failed", file.name.data);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
|
||||||
|
+ ngx_conf_log_error(NGX_LOG_ALERT, cf, ngx_errno,
|
||||||
|
+ ngx_close_file_n " \"%s\" failed", file.name.data);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (n == NGX_ERROR) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (n == 0) {
|
||||||
|
+ return NGX_OK;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < n && total < MAXNS; /* void */) {
|
||||||
|
+ if (buf[i] == '#' || buf[i] == ';') {
|
||||||
|
+ state = sw_skip;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ switch (state) {
|
||||||
|
+
|
||||||
|
+ case sw_nameserver:
|
||||||
|
+
|
||||||
|
+ if ((size_t) n - i >= sizeof("nameserver") - 1
|
||||||
|
+ && ngx_memcmp(buf + i, "nameserver",
|
||||||
|
+ sizeof("nameserver") - 1) == 0)
|
||||||
|
+ {
|
||||||
|
+ state = sw_spaces;
|
||||||
|
+ i += sizeof("nameserver") - 1;
|
||||||
|
+
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case sw_spaces:
|
||||||
|
+ if (buf[i] != '\t' && buf[i] != ' ') {
|
||||||
|
+ address = i;
|
||||||
|
+ state = sw_address;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case sw_address:
|
||||||
|
+
|
||||||
|
+ if (buf[i] == CR || buf[i] == LF || i == n - 1) {
|
||||||
|
+ ngx_memzero(&u, sizeof(ngx_url_t));
|
||||||
|
+
|
||||||
|
+ u.url.data = buf + address;
|
||||||
|
+
|
||||||
|
+ if (i == n - 1 && buf[i] != CR && buf[i] != LF) {
|
||||||
|
+ u.url.len = n - address;
|
||||||
|
+
|
||||||
|
+ } else {
|
||||||
|
+ u.url.len = i - address;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ u.default_port = 53;
|
||||||
|
+
|
||||||
|
+ /* IPv6? */
|
||||||
|
+ if (ngx_strlchr(u.url.data, u.url.data + u.url.len,
|
||||||
|
+ ':') != NULL)
|
||||||
|
+ {
|
||||||
|
+ if (u.url.len + 2 > sizeof(ipv6_buf)) {
|
||||||
|
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||||
|
+ "IPv6 resolver address is too long:"
|
||||||
|
+ " \"%V\"", &u.url);
|
||||||
|
+
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ipv6_buf[0] = '[';
|
||||||
|
+ ngx_memcpy(ipv6_buf + 1, u.url.data, u.url.len);
|
||||||
|
+ ipv6_buf[u.url.len + 1] = ']';
|
||||||
|
+
|
||||||
|
+ u.url.data = ipv6_buf;
|
||||||
|
+ u.url.len = u.url.len + 2;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ngx_parse_url(cf->pool, &u) != NGX_OK) {
|
||||||
|
+ if (u.err) {
|
||||||
|
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||||
|
+ "%s in resolver \"%V\"",
|
||||||
|
+ u.err, &u.url);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ rec = ngx_array_push_n(&r->connections, u.naddrs);
|
||||||
|
+ if (rec == NULL) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ngx_memzero(rec, u.naddrs * sizeof(ngx_resolver_connection_t));
|
||||||
|
+
|
||||||
|
+ for (j = 0; j < u.naddrs; j++) {
|
||||||
|
+ rec[j].sockaddr = u.addrs[j].sockaddr;
|
||||||
|
+ rec[j].socklen = u.addrs[j].socklen;
|
||||||
|
+ rec[j].server = u.addrs[j].name;
|
||||||
|
+ rec[j].resolver = r;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ total++;
|
||||||
|
+
|
||||||
|
+#if (NGX_DEBUG)
|
||||||
|
+ /*
|
||||||
|
+ * logs with level below NGX_LOG_NOTICE will not be printed
|
||||||
|
+ * in this early phase
|
||||||
|
+ */
|
||||||
|
+ ngx_conf_log_error(NGX_LOG_NOTICE, cf, 0,
|
||||||
|
+ "parsed a resolver: \"%V\"", &u.url);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+ state = sw_nameserver;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ break;
|
||||||
|
+
|
||||||
|
+ case sw_skip:
|
||||||
|
+ if (buf[i] == CR || buf[i] == LF) {
|
||||||
|
+ state = sw_nameserver;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ i++;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return NGX_OK;
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
ngx_resolver_t *
|
||||||
|
ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
|
||||||
|
{
|
||||||
|
@@ -246,6 +445,39 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if !(NGX_WIN32)
|
||||||
|
+ if (ngx_strncmp(names[i].data, "local=", 6) == 0) {
|
||||||
|
+
|
||||||
|
+ if (ngx_strcmp(&names[i].data[6], "on") == 0) {
|
||||||
|
+ if (ngx_resolver_read_resolv_conf(cf, r,
|
||||||
|
+ (u_char *)
|
||||||
|
+ NGX_RESOLVER_FILE_NAME,
|
||||||
|
+ sizeof(NGX_RESOLVER_FILE_NAME)
|
||||||
|
+ - 1)
|
||||||
|
+ != NGX_OK)
|
||||||
|
+ {
|
||||||
|
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||||
|
+ "unable to parse local resolver");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ } else if (ngx_strcmp(&names[i].data[6], "off") != 0) {
|
||||||
|
+ if (ngx_resolver_read_resolv_conf(cf, r,
|
||||||
|
+ &names[i].data[6],
|
||||||
|
+ names[i].len - 6)
|
||||||
|
+ != NGX_OK)
|
||||||
|
+ {
|
||||||
|
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||||
|
+ "unable to parse local resolver");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
ngx_memzero(&u, sizeof(ngx_url_t));
|
||||||
|
|
||||||
|
u.url = names[i];
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff --git a/src/os/unix/ngx_daemon.c b/src/os/unix/ngx_daemon.c
|
||||||
|
index ab672110..f259af31 100644
|
||||||
|
--- a/src/os/unix/ngx_daemon.c
|
||||||
|
+++ b/src/os/unix/ngx_daemon.c
|
||||||
|
@@ -23,6 +23,8 @@ ngx_daemon(ngx_log_t *log)
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
+ /* just to make it ASAN or Valgrind clean */
|
||||||
|
+ ngx_destroy_pool(ngx_cycle->pool);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,59 @@
|
||||||
|
diff -rup nginx-1.25.3/src/core/nginx.c nginx-1.25.3-patched/src/core/nginx.c
|
||||||
|
--- nginx-1.25.3/src/core/nginx.c 2017-12-17 00:00:38.136470108 -0800
|
||||||
|
+++ nginx-1.25.3-patched/src/core/nginx.c 2017-12-16 23:59:51.680958322 -0800
|
||||||
|
@@ -186,6 +186,7 @@ static u_char *ngx_prefix;
|
||||||
|
static u_char *ngx_conf_file;
|
||||||
|
static u_char *ngx_conf_params;
|
||||||
|
static char *ngx_signal;
|
||||||
|
+ngx_pool_t *saved_init_cycle_pool = NULL;
|
||||||
|
|
||||||
|
|
||||||
|
static char **ngx_os_environ;
|
||||||
|
@@ -253,6 +254,8 @@ main(int argc, char *const *argv)
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ saved_init_cycle_pool = init_cycle.pool;
|
||||||
|
+
|
||||||
|
if (ngx_save_argv(&init_cycle, argc, argv) != NGX_OK) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
diff -rup nginx-1.25.3/src/core/ngx_core.h nginx-1.25.3-patched/src/core/ngx_core.h
|
||||||
|
--- nginx-1.25.3/src/core/ngx_core.h 2017-10-10 08:22:51.000000000 -0700
|
||||||
|
+++ nginx-1.25.3-patched/src/core/ngx_core.h 2017-12-16 23:59:51.679958370 -0800
|
||||||
|
@@ -108,4 +108,6 @@ void ngx_cpuinfo(void);
|
||||||
|
#define NGX_DISABLE_SYMLINKS_NOTOWNER 2
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+extern ngx_pool_t *saved_init_cycle_pool;
|
||||||
|
+
|
||||||
|
#endif /* _NGX_CORE_H_INCLUDED_ */
|
||||||
|
diff -rup nginx-1.25.3/src/core/ngx_cycle.c nginx-1.25.3-patched/src/core/ngx_cycle.c
|
||||||
|
--- nginx-1.25.3/src/core/ngx_cycle.c 2017-10-10 08:22:51.000000000 -0700
|
||||||
|
+++ nginx-1.25.3-patched/src/core/ngx_cycle.c 2017-12-16 23:59:51.678958419 -0800
|
||||||
|
@@ -748,6 +748,10 @@ old_shm_zone_done:
|
||||||
|
|
||||||
|
if (ngx_process == NGX_PROCESS_MASTER || ngx_is_init_cycle(old_cycle)) {
|
||||||
|
|
||||||
|
+ if (ngx_is_init_cycle(old_cycle)) {
|
||||||
|
+ saved_init_cycle_pool = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
ngx_destroy_pool(old_cycle->pool);
|
||||||
|
cycle->old_cycle = NULL;
|
||||||
|
|
||||||
|
diff -rup nginx-1.25.3/src/os/unix/ngx_process_cycle.c nginx-1.25.3-patched/src/os/unix/ngx_process_cycle.c
|
||||||
|
--- nginx-1.25.3/src/os/unix/ngx_process_cycle.c 2017-12-17 00:00:38.142469762 -0800
|
||||||
|
+++ nginx-1.25.3-patched/src/os/unix/ngx_process_cycle.c 2017-12-16 23:59:51.691957791 -0800
|
||||||
|
@@ -687,6 +692,11 @@ ngx_master_process_exit(ngx_cycle_t *cyc
|
||||||
|
ngx_exit_cycle.files_n = ngx_cycle->files_n;
|
||||||
|
ngx_cycle = &ngx_exit_cycle;
|
||||||
|
|
||||||
|
+ if (saved_init_cycle_pool != NULL && saved_init_cycle_pool != cycle->pool) {
|
||||||
|
+ ngx_destroy_pool(saved_init_cycle_pool);
|
||||||
|
+ saved_init_cycle_pool = NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
ngx_destroy_pool(cycle->pool);
|
||||||
|
|
||||||
|
exit(0);
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
|
||||||
|
index f8d5707d..6efe0047 100644
|
||||||
|
--- a/src/http/ngx_http_upstream.c
|
||||||
|
+++ b/src/http/ngx_http_upstream.c
|
||||||
|
@@ -1515,6 +1515,11 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (rc >= NGX_HTTP_SPECIAL_RESPONSE) {
|
||||||
|
+ ngx_http_upstream_finalize_request(r, u, rc);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
u->state->peer = u->peer.name;
|
||||||
|
|
||||||
|
if (rc == NGX_BUSY) {
|
||||||
|
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
|
||||||
|
index 3e714e5b..dfbb25e0 100644
|
||||||
|
--- a/src/http/ngx_http_upstream.h
|
||||||
|
+++ b/src/http/ngx_http_upstream.h
|
||||||
|
@@ -427,4 +427,9 @@ extern ngx_conf_bitmask_t ngx_http_upstream_cache_method_mask[];
|
||||||
|
extern ngx_conf_bitmask_t ngx_http_upstream_ignore_headers_masks[];
|
||||||
|
|
||||||
|
|
||||||
|
+#ifndef HAVE_BALANCER_STATUS_CODE_PATCH
|
||||||
|
+#define HAVE_BALANCER_STATUS_CODE_PATCH
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
#endif /* _NGX_HTTP_UPSTREAM_H_INCLUDED_ */
|
||||||
|
diff --git a/src/stream/ngx_stream.h b/src/stream/ngx_stream.h
|
||||||
|
index 09d24593..d8b4b584 100644
|
||||||
|
--- a/src/stream/ngx_stream.h
|
||||||
|
+++ b/src/stream/ngx_stream.h
|
||||||
|
@@ -27,6 +27,7 @@ typedef struct ngx_stream_session_s ngx_stream_session_t;
|
||||||
|
|
||||||
|
|
||||||
|
#define NGX_STREAM_OK 200
|
||||||
|
+#define NGX_STREAM_SPECIAL_RESPONSE 300
|
||||||
|
#define NGX_STREAM_BAD_REQUEST 400
|
||||||
|
#define NGX_STREAM_FORBIDDEN 403
|
||||||
|
#define NGX_STREAM_INTERNAL_SERVER_ERROR 500
|
||||||
|
diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
|
||||||
|
index 818d7329..329dcdc6 100644
|
||||||
|
--- a/src/stream/ngx_stream_proxy_module.c
|
||||||
|
+++ b/src/stream/ngx_stream_proxy_module.c
|
||||||
|
@@ -691,6 +691,11 @@ ngx_stream_proxy_connect(ngx_stream_session_t *s)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (rc >= NGX_STREAM_SPECIAL_RESPONSE) {
|
||||||
|
+ ngx_stream_proxy_finalize(s, rc);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
u->state->peer = u->peer.name;
|
||||||
|
|
||||||
|
if (rc == NGX_BUSY) {
|
||||||
|
diff --git a/src/stream/ngx_stream_upstream.h b/src/stream/ngx_stream_upstream.h
|
||||||
|
index 73947f46..21bc0ad7 100644
|
||||||
|
--- a/src/stream/ngx_stream_upstream.h
|
||||||
|
+++ b/src/stream/ngx_stream_upstream.h
|
||||||
|
@@ -151,4 +151,9 @@ ngx_stream_upstream_srv_conf_t *ngx_stream_upstream_add(ngx_conf_t *cf,
|
||||||
|
extern ngx_module_t ngx_stream_upstream_module;
|
||||||
|
|
||||||
|
|
||||||
|
+#ifndef HAVE_BALANCER_STATUS_CODE_PATCH
|
||||||
|
+#define HAVE_BALANCER_STATUS_CODE_PATCH
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
#endif /* _NGX_STREAM_UPSTREAM_H_INCLUDED_ */
|
||||||
|
|
@ -0,0 +1,98 @@
|
||||||
|
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
|
||||||
|
index 57af8132..4853945f 100644
|
||||||
|
--- a/src/event/ngx_event.c
|
||||||
|
+++ b/src/event/ngx_event.c
|
||||||
|
@@ -196,6 +196,9 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
|
||||||
|
ngx_uint_t flags;
|
||||||
|
ngx_msec_t timer, delta;
|
||||||
|
|
||||||
|
+ ngx_queue_t *q;
|
||||||
|
+ ngx_event_t *ev;
|
||||||
|
+
|
||||||
|
if (ngx_timer_resolution) {
|
||||||
|
timer = NGX_TIMER_INFINITE;
|
||||||
|
flags = 0;
|
||||||
|
@@ -215,6 +218,13 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (!ngx_queue_empty(&ngx_posted_delayed_events)) {
|
||||||
|
+ ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
||||||
|
+ "posted delayed event queue not empty"
|
||||||
|
+ " making poll timeout 0");
|
||||||
|
+ timer = 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (ngx_use_accept_mutex) {
|
||||||
|
if (ngx_accept_disabled > 0) {
|
||||||
|
ngx_accept_disabled--;
|
||||||
|
@@ -257,6 +267,35 @@ ngx_process_events_and_timers(ngx_cycle_t *cycle)
|
||||||
|
}
|
||||||
|
|
||||||
|
ngx_event_process_posted(cycle, &ngx_posted_events);
|
||||||
|
+
|
||||||
|
+ while (!ngx_queue_empty(&ngx_posted_delayed_events)) {
|
||||||
|
+ q = ngx_queue_head(&ngx_posted_delayed_events);
|
||||||
|
+
|
||||||
|
+ ev = ngx_queue_data(q, ngx_event_t, queue);
|
||||||
|
+ if (ev->delayed) {
|
||||||
|
+ /* start of newly inserted nodes */
|
||||||
|
+ for (/* void */;
|
||||||
|
+ q != ngx_queue_sentinel(&ngx_posted_delayed_events);
|
||||||
|
+ q = ngx_queue_next(q))
|
||||||
|
+ {
|
||||||
|
+ ev = ngx_queue_data(q, ngx_event_t, queue);
|
||||||
|
+ ev->delayed = 0;
|
||||||
|
+
|
||||||
|
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
||||||
|
+ "skipping delayed posted event %p,"
|
||||||
|
+ " till next iteration", ev);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
|
||||||
|
+ "delayed posted event %p", ev);
|
||||||
|
+
|
||||||
|
+ ngx_delete_posted_event(ev);
|
||||||
|
+
|
||||||
|
+ ev->handler(ev);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -600,6 +639,7 @@ ngx_event_process_init(ngx_cycle_t *cycle)
|
||||||
|
|
||||||
|
ngx_queue_init(&ngx_posted_accept_events);
|
||||||
|
ngx_queue_init(&ngx_posted_events);
|
||||||
|
+ ngx_queue_init(&ngx_posted_delayed_events);
|
||||||
|
|
||||||
|
if (ngx_event_timer_init(cycle->log) == NGX_ERROR) {
|
||||||
|
return NGX_ERROR;
|
||||||
|
diff --git a/src/event/ngx_event_posted.c b/src/event/ngx_event_posted.c
|
||||||
|
index d851f3d1..b6cea009 100644
|
||||||
|
--- a/src/event/ngx_event_posted.c
|
||||||
|
+++ b/src/event/ngx_event_posted.c
|
||||||
|
@@ -12,6 +12,7 @@
|
||||||
|
|
||||||
|
ngx_queue_t ngx_posted_accept_events;
|
||||||
|
ngx_queue_t ngx_posted_events;
|
||||||
|
+ngx_queue_t ngx_posted_delayed_events;
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
diff --git a/src/event/ngx_event_posted.h b/src/event/ngx_event_posted.h
|
||||||
|
index 145d30fe..6c388553 100644
|
||||||
|
--- a/src/event/ngx_event_posted.h
|
||||||
|
+++ b/src/event/ngx_event_posted.h
|
||||||
|
@@ -43,6 +43,9 @@ void ngx_event_process_posted(ngx_cycle_t *cycle, ngx_queue_t *posted);
|
||||||
|
|
||||||
|
extern ngx_queue_t ngx_posted_accept_events;
|
||||||
|
extern ngx_queue_t ngx_posted_events;
|
||||||
|
+extern ngx_queue_t ngx_posted_delayed_events;
|
||||||
|
+
|
||||||
|
+#define HAVE_POSTED_DELAYED_EVENTS_PATCH
|
||||||
|
|
||||||
|
|
||||||
|
#endif /* _NGX_EVENT_POSTED_H_INCLUDED_ */
|
||||||
|
|
@ -0,0 +1,203 @@
|
||||||
|
diff --git a/src/core/nginx.c b/src/core/nginx.c
|
||||||
|
index 60f8fe7..4bd244b 100644
|
||||||
|
--- a/src/core/nginx.c
|
||||||
|
+++ b/src/core/nginx.c
|
||||||
|
@@ -981,6 +981,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
|
||||||
|
|
||||||
|
ccf->daemon = NGX_CONF_UNSET;
|
||||||
|
ccf->master = NGX_CONF_UNSET;
|
||||||
|
+ ccf->privileged_agent = NGX_CONF_UNSET;
|
||||||
|
ccf->timer_resolution = NGX_CONF_UNSET_MSEC;
|
||||||
|
|
||||||
|
ccf->worker_processes = NGX_CONF_UNSET;
|
||||||
|
@@ -1009,6 +1010,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
|
||||||
|
|
||||||
|
ngx_conf_init_value(ccf->daemon, 1);
|
||||||
|
ngx_conf_init_value(ccf->master, 1);
|
||||||
|
+ ngx_conf_init_value(ccf->privileged_agent, 0);
|
||||||
|
ngx_conf_init_msec_value(ccf->timer_resolution, 0);
|
||||||
|
|
||||||
|
ngx_conf_init_value(ccf->worker_processes, 1);
|
||||||
|
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
|
||||||
|
index c51b7ff..3261f90 100644
|
||||||
|
--- a/src/core/ngx_cycle.h
|
||||||
|
+++ b/src/core/ngx_cycle.h
|
||||||
|
@@ -22,6 +22,9 @@
|
||||||
|
#define NGX_DEBUG_POINTS_ABORT 2
|
||||||
|
|
||||||
|
|
||||||
|
+#define HAVE_PRIVILEGED_PROCESS_PATCH 1
|
||||||
|
+
|
||||||
|
+
|
||||||
|
typedef struct ngx_shm_zone_s ngx_shm_zone_t;
|
||||||
|
|
||||||
|
typedef ngx_int_t (*ngx_shm_zone_init_pt) (ngx_shm_zone_t *zone, void *data);
|
||||||
|
@@ -81,6 +84,7 @@ struct ngx_cycle_s {
|
||||||
|
typedef struct {
|
||||||
|
ngx_flag_t daemon;
|
||||||
|
ngx_flag_t master;
|
||||||
|
+ ngx_flag_t privileged_agent;
|
||||||
|
|
||||||
|
ngx_msec_t timer_resolution;
|
||||||
|
|
||||||
|
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
|
||||||
|
index 7cee1c5..c4f70d6 100644
|
||||||
|
--- a/src/os/unix/ngx_process_cycle.c
|
||||||
|
+++ b/src/os/unix/ngx_process_cycle.c
|
||||||
|
@@ -15,6 +15,8 @@ static void ngx_start_worker_processes(ngx_cycle_t *cycle, ngx_int_t n,
|
||||||
|
ngx_int_t type);
|
||||||
|
static void ngx_start_cache_manager_processes(ngx_cycle_t *cycle,
|
||||||
|
ngx_uint_t respawn);
|
||||||
|
+static void ngx_start_privileged_agent_processes(ngx_cycle_t *cycle,
|
||||||
|
+ ngx_uint_t respawn);
|
||||||
|
static void ngx_pass_open_channel(ngx_cycle_t *cycle);
|
||||||
|
static void ngx_signal_worker_processes(ngx_cycle_t *cycle, int signo);
|
||||||
|
static ngx_uint_t ngx_reap_children(ngx_cycle_t *cycle);
|
||||||
|
@@ -24,6 +26,7 @@ static void ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker);
|
||||||
|
static void ngx_worker_process_exit(ngx_cycle_t *cycle);
|
||||||
|
static void ngx_channel_handler(ngx_event_t *ev);
|
||||||
|
static void ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data);
|
||||||
|
+static void ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data);
|
||||||
|
static void ngx_cache_manager_process_handler(ngx_event_t *ev);
|
||||||
|
static void ngx_cache_loader_process_handler(ngx_event_t *ev);
|
||||||
|
|
||||||
|
@@ -51,6 +54,8 @@ sig_atomic_t ngx_noaccept;
|
||||||
|
ngx_uint_t ngx_noaccepting;
|
||||||
|
ngx_uint_t ngx_restart;
|
||||||
|
|
||||||
|
+ngx_uint_t ngx_is_privileged_agent;
|
||||||
|
+
|
||||||
|
|
||||||
|
static u_char master_process[] = "master process";
|
||||||
|
|
||||||
|
@@ -130,6 +135,7 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
|
||||||
|
ngx_start_worker_processes(cycle, ccf->worker_processes,
|
||||||
|
NGX_PROCESS_RESPAWN);
|
||||||
|
ngx_start_cache_manager_processes(cycle, 0);
|
||||||
|
+ ngx_start_privileged_agent_processes(cycle, 0);
|
||||||
|
|
||||||
|
ngx_new_binary = 0;
|
||||||
|
delay = 0;
|
||||||
|
@@ -215,6 +221,7 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
|
||||||
|
ngx_start_worker_processes(cycle, ccf->worker_processes,
|
||||||
|
NGX_PROCESS_RESPAWN);
|
||||||
|
ngx_start_cache_manager_processes(cycle, 0);
|
||||||
|
+ ngx_start_privileged_agent_processes(cycle, 0);
|
||||||
|
ngx_noaccepting = 0;
|
||||||
|
|
||||||
|
continue;
|
||||||
|
@@ -234,6 +241,7 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
|
||||||
|
ngx_start_worker_processes(cycle, ccf->worker_processes,
|
||||||
|
NGX_PROCESS_JUST_RESPAWN);
|
||||||
|
ngx_start_cache_manager_processes(cycle, 1);
|
||||||
|
+ ngx_start_privileged_agent_processes(cycle, 1);
|
||||||
|
|
||||||
|
/* allow new processes to start */
|
||||||
|
ngx_msleep(100);
|
||||||
|
@@ -248,6 +256,7 @@ ngx_master_process_cycle(ngx_cycle_t *cycle)
|
||||||
|
ngx_start_worker_processes(cycle, ccf->worker_processes,
|
||||||
|
NGX_PROCESS_RESPAWN);
|
||||||
|
ngx_start_cache_manager_processes(cycle, 0);
|
||||||
|
+ ngx_start_privileged_agent_processes(cycle, 0);
|
||||||
|
live = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -393,6 +431,26 @@ ngx_start_cache_manager_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
+ngx_start_privileged_agent_processes(ngx_cycle_t *cycle, ngx_uint_t respawn)
|
||||||
|
+{
|
||||||
|
+ ngx_core_conf_t *ccf;
|
||||||
|
+
|
||||||
|
+ ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx,
|
||||||
|
+ ngx_core_module);
|
||||||
|
+
|
||||||
|
+ if (!ccf->privileged_agent) {
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ngx_spawn_process(cycle, ngx_privileged_agent_process_cycle,
|
||||||
|
+ "privileged agent process", "privileged agent process",
|
||||||
|
+ respawn ? NGX_PROCESS_JUST_RESPAWN : NGX_PROCESS_RESPAWN);
|
||||||
|
+
|
||||||
|
+ ngx_pass_open_channel(cycle);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
ngx_pass_open_channel(ngx_cycle_t *cycle)
|
||||||
|
{
|
||||||
|
ngx_int_t i;
|
||||||
|
@@ -794,7 +860,10 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_int_t worker)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (geteuid() == 0) {
|
||||||
|
+ /*
|
||||||
|
+ * privileged agent process has the same permission as master process
|
||||||
|
+ */
|
||||||
|
+ if (!ngx_is_privileged_agent && geteuid() == 0) {
|
||||||
|
if (setgid(ccf->group) == -1) {
|
||||||
|
ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
|
||||||
|
"setgid(%d) failed", ccf->group);
|
||||||
|
@@ -1149,6 +1216,47 @@ ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data)
|
||||||
|
|
||||||
|
|
||||||
|
static void
|
||||||
|
+ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
|
||||||
|
+{
|
||||||
|
+ char *name = data;
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Set correct process type since closing listening Unix domain socket
|
||||||
|
+ * in a master process also removes the Unix domain socket file.
|
||||||
|
+ */
|
||||||
|
+ ngx_process = NGX_PROCESS_HELPER;
|
||||||
|
+ ngx_is_privileged_agent = 1;
|
||||||
|
+
|
||||||
|
+ ngx_close_listening_sockets(cycle);
|
||||||
|
+
|
||||||
|
+ /* Set a moderate number of connections for a helper process. */
|
||||||
|
+ cycle->connection_n = 512;
|
||||||
|
+
|
||||||
|
+ ngx_worker_process_init(cycle, -1);
|
||||||
|
+
|
||||||
|
+ ngx_use_accept_mutex = 0;
|
||||||
|
+
|
||||||
|
+ ngx_setproctitle(name);
|
||||||
|
+
|
||||||
|
+ for ( ;; ) {
|
||||||
|
+
|
||||||
|
+ if (ngx_terminate || ngx_quit) {
|
||||||
|
+ ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
|
||||||
|
+ ngx_worker_process_exit(cycle);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ngx_reopen) {
|
||||||
|
+ ngx_reopen = 0;
|
||||||
|
+ ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "reopening logs");
|
||||||
|
+ ngx_reopen_files(cycle, -1);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ngx_process_events_and_timers(cycle);
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+static void
|
||||||
|
ngx_cache_manager_process_handler(ngx_event_t *ev)
|
||||||
|
{
|
||||||
|
time_t next, n;
|
||||||
|
diff --git a/src/os/unix/ngx_process_cycle.h b/src/os/unix/ngx_process_cycle.h
|
||||||
|
index 69495d5..5149396 100644
|
||||||
|
--- a/src/os/unix/ngx_process_cycle.h
|
||||||
|
+++ b/src/os/unix/ngx_process_cycle.h
|
||||||
|
@@ -45,6 +45,7 @@ extern ngx_pid_t ngx_new_binary;
|
||||||
|
extern ngx_uint_t ngx_inherited;
|
||||||
|
extern ngx_uint_t ngx_daemonized;
|
||||||
|
extern ngx_uint_t ngx_exiting;
|
||||||
|
+extern ngx_uint_t ngx_is_privileged_agent;
|
||||||
|
|
||||||
|
extern sig_atomic_t ngx_reap;
|
||||||
|
extern sig_atomic_t ngx_sigio;
|
||||||
|
|
@ -0,0 +1,73 @@
|
||||||
|
diff --git a/src/core/nginx.c b/src/core/nginx.c
|
||||||
|
index 269ff84..48329bd 100644
|
||||||
|
--- a/src/core/nginx.c
|
||||||
|
+++ b/src/core/nginx.c
|
||||||
|
@@ -1062,6 +1062,7 @@ ngx_core_module_create_conf(ngx_cycle_t *cycle)
|
||||||
|
ccf->daemon = NGX_CONF_UNSET;
|
||||||
|
ccf->master = NGX_CONF_UNSET;
|
||||||
|
ccf->privileged_agent = NGX_CONF_UNSET;
|
||||||
|
+ ccf->privileged_agent_connections = NGX_CONF_UNSET_UINT;
|
||||||
|
ccf->timer_resolution = NGX_CONF_UNSET_MSEC;
|
||||||
|
ccf->shutdown_timeout = NGX_CONF_UNSET_MSEC;
|
||||||
|
|
||||||
|
@@ -1092,6 +1093,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf)
|
||||||
|
ngx_conf_init_value(ccf->daemon, 1);
|
||||||
|
ngx_conf_init_value(ccf->master, 1);
|
||||||
|
ngx_conf_init_value(ccf->privileged_agent, 0);
|
||||||
|
+ ngx_conf_init_uint_value(ccf->privileged_agent_connections, 512);
|
||||||
|
ngx_conf_init_msec_value(ccf->timer_resolution, 0);
|
||||||
|
ngx_conf_init_msec_value(ccf->shutdown_timeout, 0);
|
||||||
|
|
||||||
|
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
|
||||||
|
index 6a9583e..4469390 100644
|
||||||
|
--- a/src/core/ngx_cycle.h
|
||||||
|
+++ b/src/core/ngx_cycle.h
|
||||||
|
@@ -93,6 +93,7 @@ typedef struct {
|
||||||
|
ngx_flag_t daemon;
|
||||||
|
ngx_flag_t master;
|
||||||
|
ngx_flag_t privileged_agent;
|
||||||
|
+ ngx_uint_t privileged_agent_connections;
|
||||||
|
|
||||||
|
ngx_msec_t timer_resolution;
|
||||||
|
ngx_msec_t shutdown_timeout;
|
||||||
|
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
|
||||||
|
index df25f9d..bd259c1 100644
|
||||||
|
--- a/src/os/unix/ngx_process_cycle.c
|
||||||
|
+++ b/src/os/unix/ngx_process_cycle.c
|
||||||
|
@@ -1179,6 +1179,7 @@ static void
|
||||||
|
ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
|
||||||
|
{
|
||||||
|
char *name = data;
|
||||||
|
+ ngx_core_conf_t *ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Set correct process type since closing listening Unix domain socket
|
||||||
|
@@ -1190,7 +1191,7 @@ ngx_privileged_agent_process_cycle(ngx_cycle_t *cycle, void *data)
|
||||||
|
ngx_close_listening_sockets(cycle);
|
||||||
|
|
||||||
|
/* Set a moderate number of connections for a helper process. */
|
||||||
|
- cycle->connection_n = 512;
|
||||||
|
+ cycle->connection_n = ccf->privileged_agent_connections;
|
||||||
|
|
||||||
|
ngx_worker_process_init(cycle, -1);
|
||||||
|
|
||||||
|
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
|
||||||
|
index df25f9d..bd259c1 100644
|
||||||
|
--- a/src/os/unix/ngx_process_cycle.c
|
||||||
|
+++ b/src/os/unix/ngx_process_cycle.c
|
||||||
|
@@ -442,6 +442,15 @@
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* 0 is an illegal value and may result in a core dump later */
|
||||||
|
+ if (ccf->privileged_agent_connections == 0) {
|
||||||
|
+ ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
|
||||||
|
+ "%ui worker_connection is not enough, "
|
||||||
|
+ "privileged agent process cannot be spawned",
|
||||||
|
+ ccf->privileged_agent_connections);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
ngx_spawn_process(cycle, ngx_privileged_agent_process_cycle,
|
||||||
|
"privileged agent process", "privileged agent process",
|
||||||
|
respawn ? NGX_PROCESS_JUST_RESPAWN : NGX_PROCESS_RESPAWN);
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
--- a/src/core/ngx_thread_pool.c
|
||||||
|
+++ b/src/core/ngx_thread_pool.c
|
||||||
|
@@ -587,7 +587,8 @@
|
||||||
|
ngx_thread_pool_conf_t *tcf;
|
||||||
|
|
||||||
|
if (ngx_process != NGX_PROCESS_WORKER
|
||||||
|
- && ngx_process != NGX_PROCESS_SINGLE)
|
||||||
|
+ && ngx_process != NGX_PROCESS_SINGLE
|
||||||
|
+ && !ngx_is_privileged_agent)
|
||||||
|
{
|
||||||
|
return NGX_OK;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,75 @@
|
||||||
|
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c
|
||||||
|
index 15680237..12a8c687 100644
|
||||||
|
--- a/src/os/unix/ngx_process.c
|
||||||
|
+++ b/src/os/unix/ngx_process.c
|
||||||
|
@@ -362,8 +362,15 @@ ngx_signal_handler(int signo, siginfo_t *siginfo, void *ucontext)
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ngx_signal_value(NGX_RECONFIGURE_SIGNAL):
|
||||||
|
- ngx_reconfigure = 1;
|
||||||
|
- action = ", reconfiguring";
|
||||||
|
+ if (ngx_process == NGX_PROCESS_SINGLE) {
|
||||||
|
+ ngx_terminate = 1;
|
||||||
|
+ action = ", exiting";
|
||||||
|
+
|
||||||
|
+ } else {
|
||||||
|
+ ngx_reconfigure = 1;
|
||||||
|
+ action = ", reconfiguring";
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ngx_signal_value(NGX_REOPEN_SIGNAL):
|
||||||
|
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
|
||||||
|
index 5817a2c2..f3d58e97 100644
|
||||||
|
--- a/src/os/unix/ngx_process_cycle.c
|
||||||
|
+++ b/src/os/unix/ngx_process_cycle.c
|
||||||
|
@@ -305,11 +305,26 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
|
||||||
|
}
|
||||||
|
|
||||||
|
for ( ;; ) {
|
||||||
|
+ if (ngx_exiting) {
|
||||||
|
+ if (ngx_event_no_timers_left() == NGX_OK) {
|
||||||
|
+ ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
|
||||||
|
+
|
||||||
|
+ for (i = 0; cycle->modules[i]; i++) {
|
||||||
|
+ if (cycle->modules[i]->exit_process) {
|
||||||
|
+ cycle->modules[i]->exit_process(cycle);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ngx_master_process_exit(cycle);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "worker cycle");
|
||||||
|
|
||||||
|
ngx_process_events_and_timers(cycle);
|
||||||
|
|
||||||
|
- if (ngx_terminate || ngx_quit) {
|
||||||
|
+ if (ngx_terminate) {
|
||||||
|
+ ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
|
||||||
|
|
||||||
|
for (i = 0; cycle->modules[i]; i++) {
|
||||||
|
if (cycle->modules[i]->exit_process) {
|
||||||
|
@@ -320,6 +335,20 @@ ngx_single_process_cycle(ngx_cycle_t *cycle)
|
||||||
|
ngx_master_process_exit(cycle);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (ngx_quit) {
|
||||||
|
+ ngx_quit = 0;
|
||||||
|
+ ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0,
|
||||||
|
+ "gracefully shutting down");
|
||||||
|
+ ngx_setproctitle("process is shutting down");
|
||||||
|
+
|
||||||
|
+ if (!ngx_exiting) {
|
||||||
|
+ ngx_exiting = 1;
|
||||||
|
+ ngx_set_shutdown_timer(cycle);
|
||||||
|
+ ngx_close_listening_sockets(cycle);
|
||||||
|
+ ngx_close_idle_connections(cycle);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (ngx_reconfigure) {
|
||||||
|
ngx_reconfigure = 0;
|
||||||
|
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "reconfiguring");
|
||||||
|
|
@ -0,0 +1,60 @@
|
||||||
|
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h
|
||||||
|
index c51b7ff..4c335b9 100644
|
||||||
|
--- a/src/core/ngx_cycle.h
|
||||||
|
+++ b/src/core/ngx_cycle.h
|
||||||
|
@@ -22,9 +22,14 @@
|
||||||
|
#define NGX_DEBUG_POINTS_ABORT 2
|
||||||
|
|
||||||
|
|
||||||
|
+#define HAVE_INTERCEPT_ERROR_LOG_PATCH
|
||||||
|
+
|
||||||
|
+
|
||||||
|
typedef struct ngx_shm_zone_s ngx_shm_zone_t;
|
||||||
|
|
||||||
|
typedef ngx_int_t (*ngx_shm_zone_init_pt) (ngx_shm_zone_t *zone, void *data);
|
||||||
|
+typedef ngx_int_t (*ngx_log_intercept_pt) (ngx_log_t *log, ngx_uint_t level,
|
||||||
|
+ u_char *buf, size_t len);
|
||||||
|
|
||||||
|
struct ngx_shm_zone_s {
|
||||||
|
void *data;
|
||||||
|
@@ -75,6 +80,10 @@ struct ngx_cycle_s {
|
||||||
|
ngx_str_t prefix;
|
||||||
|
ngx_str_t lock_file;
|
||||||
|
ngx_str_t hostname;
|
||||||
|
+
|
||||||
|
+ ngx_log_intercept_pt intercept_error_log_handler;
|
||||||
|
+ void *intercept_error_log_data;
|
||||||
|
+ unsigned entered_logger; /* :1 */
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
|
||||||
|
index 8e9408d..ed9b11b 100644
|
||||||
|
--- a/src/core/ngx_log.c
|
||||||
|
+++ b/src/core/ngx_log.c
|
||||||
|
@@ -112,6 +112,8 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
|
||||||
|
ngx_uint_t wrote_stderr, debug_connection;
|
||||||
|
u_char errstr[NGX_MAX_ERROR_STR];
|
||||||
|
|
||||||
|
+ ngx_log_intercept_pt log_intercept = NULL;
|
||||||
|
+
|
||||||
|
last = errstr + NGX_MAX_ERROR_STR;
|
||||||
|
|
||||||
|
p = ngx_cpymem(errstr, ngx_cached_err_log_time.data,
|
||||||
|
@@ -153,6 +155,16 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
|
||||||
|
p = last - NGX_LINEFEED_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (ngx_cycle) {
|
||||||
|
+ log_intercept = ngx_cycle->intercept_error_log_handler;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (log_intercept && !ngx_cycle->entered_logger) {
|
||||||
|
+ ngx_cycle->entered_logger = 1;
|
||||||
|
+ log_intercept(log, level, errstr, p - errstr);
|
||||||
|
+ ngx_cycle->entered_logger = 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
ngx_linefeed(p);
|
||||||
|
|
||||||
|
wrote_stderr = 0;
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
commit f9907b72a76a21ac5413187b83177a919475c75f
|
||||||
|
Author: Yichun Zhang (agentzh) <agentzh@gmail.com>
|
||||||
|
Date: Wed Feb 10 16:05:08 2016 -0800
|
||||||
|
|
||||||
|
bugfix: upstream: keep sending request data after the first write attempt.
|
||||||
|
|
||||||
|
See
|
||||||
|
http://mailman.nginx.org/pipermail/nginx-devel/2012-March/002040.html
|
||||||
|
for more details on the issue.
|
||||||
|
|
||||||
|
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
|
||||||
|
index 69019417..92b7c97f 100644
|
||||||
|
--- a/src/http/ngx_http_upstream.c
|
||||||
|
+++ b/src/http/ngx_http_upstream.c
|
||||||
|
@@ -2239,7 +2239,7 @@ ngx_http_upstream_send_request_handler(ngx_http_request_t *r,
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- if (u->header_sent && !u->conf->preserve_output) {
|
||||||
|
+ if (u->request_body_sent && !u->conf->preserve_output) {
|
||||||
|
u->write_event_handler = ngx_http_upstream_dummy_handler;
|
||||||
|
|
||||||
|
(void) ngx_handle_write_event(c->write, 0);
|
||||||
|
|
@ -0,0 +1,91 @@
|
||||||
|
diff -upr nginx-1.25.3/src/http/ngx_http_core_module.c nginx-1.25.3-patched/src/http/ngx_http_core_module.c
|
||||||
|
--- nginx-1.25.3/src/http/ngx_http_core_module.c 2017-08-31 18:14:41.000000000 -0700
|
||||||
|
+++ nginx-1.25.3-patched/src/http/ngx_http_core_module.c 2017-08-31 18:21:31.638098196 -0700
|
||||||
|
@@ -64,6 +64,8 @@ static char *ngx_http_core_directio(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||||
|
void *conf);
|
||||||
|
static char *ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||||
|
void *conf);
|
||||||
|
+static char *ngx_http_core_no_error_pages(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||||
|
+ void *conf);
|
||||||
|
static char *ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||||
|
void *conf);
|
||||||
|
static char *ngx_http_core_error_log(ngx_conf_t *cf, ngx_command_t *cmd,
|
||||||
|
@@ -671,6 +673,14 @@ static ngx_command_t ngx_http_core_commands[] = {
|
||||||
|
0,
|
||||||
|
NULL },
|
||||||
|
|
||||||
|
+ { ngx_string("no_error_pages"),
|
||||||
|
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
|
||||||
|
+ |NGX_CONF_NOARGS,
|
||||||
|
+ ngx_http_core_no_error_pages,
|
||||||
|
+ NGX_HTTP_LOC_CONF_OFFSET,
|
||||||
|
+ 0,
|
||||||
|
+ NULL },
|
||||||
|
+
|
||||||
|
{ ngx_string("post_action"),
|
||||||
|
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
|
||||||
|
|NGX_CONF_TAKE1,
|
||||||
|
@@ -3564,7 +3574,6 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
|
||||||
|
* clcf->types = NULL;
|
||||||
|
* clcf->default_type = { 0, NULL };
|
||||||
|
* clcf->error_log = NULL;
|
||||||
|
- * clcf->error_pages = NULL;
|
||||||
|
* clcf->client_body_path = NULL;
|
||||||
|
* clcf->regex = NULL;
|
||||||
|
* clcf->exact_match = 0;
|
||||||
|
@@ -3574,6 +3583,7 @@ ngx_http_core_create_loc_conf(ngx_conf_t *cf)
|
||||||
|
* clcf->keepalive_disable = 0;
|
||||||
|
*/
|
||||||
|
|
||||||
|
+ clcf->error_pages = NGX_CONF_UNSET_PTR;
|
||||||
|
clcf->client_max_body_size = NGX_CONF_UNSET;
|
||||||
|
clcf->client_body_buffer_size = NGX_CONF_UNSET_SIZE;
|
||||||
|
clcf->client_body_timeout = NGX_CONF_UNSET_MSEC;
|
||||||
|
@@ -3776,9 +3786,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (conf->error_pages == NULL && prev->error_pages) {
|
||||||
|
- conf->error_pages = prev->error_pages;
|
||||||
|
- }
|
||||||
|
+ ngx_conf_merge_ptr_value(conf->error_pages, prev->error_pages, NULL);
|
||||||
|
|
||||||
|
ngx_conf_merge_str_value(conf->default_type,
|
||||||
|
prev->default_type, "text/plain");
|
||||||
|
@@ -4815,6 +4823,10 @@ ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||||
|
ngx_http_compile_complex_value_t ccv;
|
||||||
|
|
||||||
|
if (clcf->error_pages == NULL) {
|
||||||
|
+ return "conflicts with \"no_error_pages\"";
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (clcf->error_pages == NGX_CONF_UNSET_PTR) {
|
||||||
|
clcf->error_pages = ngx_array_create(cf->pool, 4,
|
||||||
|
sizeof(ngx_http_err_page_t));
|
||||||
|
if (clcf->error_pages == NULL) {
|
||||||
|
@@ -4920,6 +4932,25 @@ ngx_http_core_error_page(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
+static char *
|
||||||
|
+ngx_http_core_no_error_pages(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||||
|
+{
|
||||||
|
+ ngx_http_core_loc_conf_t *clcf = conf;
|
||||||
|
+
|
||||||
|
+ if (clcf->error_pages == NULL) {
|
||||||
|
+ return "is duplicate";
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (clcf->error_pages != NGX_CONF_UNSET_PTR) {
|
||||||
|
+ return "conflicts with \"error_page\"";
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ clcf->error_pages = NULL;
|
||||||
|
+
|
||||||
|
+ return NGX_CONF_OK;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
static char *
|
||||||
|
ngx_http_core_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
||||||
|
{
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
diff -urp nginx-1.25.3/auto/cc/clang nginx-1.25.3-patched/auto/cc/clang
|
||||||
|
--- nginx-1.25.3/auto/cc/clang 2014-03-04 03:39:24.000000000 -0800
|
||||||
|
+++ nginx-1.25.3-patched/auto/cc/clang 2014-03-13 20:54:26.241413360 -0700
|
||||||
|
@@ -89,7 +89,7 @@ CFLAGS="$CFLAGS -Wconditional-uninitiali
|
||||||
|
CFLAGS="$CFLAGS -Wno-unused-parameter"
|
||||||
|
|
||||||
|
# stop on warning
|
||||||
|
-CFLAGS="$CFLAGS -Werror"
|
||||||
|
+#CFLAGS="$CFLAGS -Werror"
|
||||||
|
|
||||||
|
# debug
|
||||||
|
CFLAGS="$CFLAGS -g"
|
||||||
|
diff -urp nginx-1.25.3/auto/cc/gcc nginx-1.25.3-patched/auto/cc/gcc
|
||||||
|
--- nginx-1.25.3/auto/cc/gcc 2014-03-04 03:39:24.000000000 -0800
|
||||||
|
+++ nginx-1.25.3-patched/auto/cc/gcc 2014-03-13 20:54:13.301355329 -0700
|
||||||
|
@@ -168,7 +168,7 @@ esac
|
||||||
|
|
||||||
|
|
||||||
|
# stop on warning
|
||||||
|
-CFLAGS="$CFLAGS -Werror"
|
||||||
|
+#CFLAGS="$CFLAGS -Werror"
|
||||||
|
|
||||||
|
# debug
|
||||||
|
CFLAGS="$CFLAGS -g"
|
||||||
|
diff -urp nginx-1.25.3/auto/cc/icc nginx-1.25.3-patched/auto/cc/icc
|
||||||
|
--- nginx-1.25.3/auto/cc/icc 2014-03-04 03:39:24.000000000 -0800
|
||||||
|
+++ nginx-1.25.3-patched/auto/cc/icc 2014-03-13 20:54:13.301355329 -0700
|
||||||
|
@@ -115,7 +115,7 @@ case "$NGX_ICC_VER" in
|
||||||
|
esac
|
||||||
|
|
||||||
|
# stop on warning
|
||||||
|
-CFLAGS="$CFLAGS -Werror"
|
||||||
|
+#CFLAGS="$CFLAGS -Werror"
|
||||||
|
|
||||||
|
# debug
|
||||||
|
CFLAGS="$CFLAGS -g"
|
||||||
|
|
@ -0,0 +1,117 @@
|
||||||
|
diff --git a/src/http/modules/ngx_http_log_module.c b/src/http/modules/ngx_http_log_module.c
|
||||||
|
index 917ed55f..b769dfd3 100644
|
||||||
|
--- a/src/http/modules/ngx_http_log_module.c
|
||||||
|
+++ b/src/http/modules/ngx_http_log_module.c
|
||||||
|
@@ -79,6 +79,8 @@ typedef struct {
|
||||||
|
time_t open_file_cache_valid;
|
||||||
|
ngx_uint_t open_file_cache_min_uses;
|
||||||
|
|
||||||
|
+ ngx_flag_t escape_non_ascii;
|
||||||
|
+
|
||||||
|
ngx_uint_t off; /* unsigned off:1 */
|
||||||
|
} ngx_http_log_loc_conf_t;
|
||||||
|
|
||||||
|
@@ -131,7 +133,8 @@ static size_t ngx_http_log_variable_getlen(ngx_http_request_t *r,
|
||||||
|
uintptr_t data);
|
||||||
|
static u_char *ngx_http_log_variable(ngx_http_request_t *r, u_char *buf,
|
||||||
|
ngx_http_log_op_t *op);
|
||||||
|
-static uintptr_t ngx_http_log_escape(u_char *dst, u_char *src, size_t size);
|
||||||
|
+static uintptr_t ngx_http_log_escape(ngx_http_log_loc_conf_t *lcf, u_char *dst,
|
||||||
|
+ u_char *src, size_t size);
|
||||||
|
static size_t ngx_http_log_json_variable_getlen(ngx_http_request_t *r,
|
||||||
|
uintptr_t data);
|
||||||
|
static u_char *ngx_http_log_json_variable(ngx_http_request_t *r, u_char *buf,
|
||||||
|
@@ -177,6 +180,13 @@ static ngx_command_t ngx_http_log_commands[] = {
|
||||||
|
0,
|
||||||
|
NULL },
|
||||||
|
|
||||||
|
+ { ngx_string("log_escape_non_ascii"),
|
||||||
|
+ NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
|
||||||
|
+ ngx_conf_set_flag_slot,
|
||||||
|
+ NGX_HTTP_LOC_CONF_OFFSET,
|
||||||
|
+ offsetof(ngx_http_log_loc_conf_t, escape_non_ascii),
|
||||||
|
+ NULL },
|
||||||
|
+
|
||||||
|
ngx_null_command
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -935,6 +945,7 @@ static size_t
|
||||||
|
ngx_http_log_variable_getlen(ngx_http_request_t *r, uintptr_t data)
|
||||||
|
{
|
||||||
|
uintptr_t len;
|
||||||
|
+ ngx_http_log_loc_conf_t *lcf;
|
||||||
|
ngx_http_variable_value_t *value;
|
||||||
|
|
||||||
|
value = ngx_http_get_indexed_variable(r, data);
|
||||||
|
@@ -943,7 +954,9 @@ ngx_http_log_variable_getlen(ngx_http_request_t *r, uintptr_t data)
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- len = ngx_http_log_escape(NULL, value->data, value->len);
|
||||||
|
+ lcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module);
|
||||||
|
+
|
||||||
|
+ len = ngx_http_log_escape(lcf, NULL, value->data, value->len);
|
||||||
|
|
||||||
|
value->escape = len ? 1 : 0;
|
||||||
|
|
||||||
|
@@ -954,6 +967,7 @@ ngx_http_log_variable_getlen(ngx_http_request_t *r, uintptr_t data)
|
||||||
|
static u_char *
|
||||||
|
ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op)
|
||||||
|
{
|
||||||
|
+ ngx_http_log_loc_conf_t *lcf;
|
||||||
|
ngx_http_variable_value_t *value;
|
||||||
|
|
||||||
|
value = ngx_http_get_indexed_variable(r, op->data);
|
||||||
|
@@ -967,16 +981,18 @@ ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op)
|
||||||
|
return ngx_cpymem(buf, value->data, value->len);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
- return (u_char *) ngx_http_log_escape(buf, value->data, value->len);
|
||||||
|
+ lcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module);
|
||||||
|
+ return (u_char *) ngx_http_log_escape(lcf, buf, value->data, value->len);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static uintptr_t
|
||||||
|
-ngx_http_log_escape(u_char *dst, u_char *src, size_t size)
|
||||||
|
+ngx_http_log_escape(ngx_http_log_loc_conf_t *lcf, u_char *dst, u_char *src,
|
||||||
|
+ size_t size)
|
||||||
|
{
|
||||||
|
- ngx_uint_t n;
|
||||||
|
- static u_char hex[] = "0123456789ABCDEF";
|
||||||
|
+ ngx_uint_t n;
|
||||||
|
+ static u_char hex[] = "0123456789ABCDEF";
|
||||||
|
|
||||||
|
static uint32_t escape[] = {
|
||||||
|
0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */
|
||||||
|
@@ -996,6 +1012,12 @@ ngx_http_log_escape(u_char *dst, u_char *src, size_t size)
|
||||||
|
0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */
|
||||||
|
};
|
||||||
|
|
||||||
|
+ if (lcf->escape_non_ascii) {
|
||||||
|
+ ngx_memset(&escape[4], 0xff, sizeof(uint32_t) * 4);
|
||||||
|
+
|
||||||
|
+ } else {
|
||||||
|
+ ngx_memzero(&escape[4], sizeof(uint32_t) * 4);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (dst == NULL) {
|
||||||
|
|
||||||
|
@@ -1120,6 +1142,7 @@ ngx_http_log_create_loc_conf(ngx_conf_t *cf)
|
||||||
|
}
|
||||||
|
|
||||||
|
conf->open_file_cache = NGX_CONF_UNSET_PTR;
|
||||||
|
+ conf->escape_non_ascii = NGX_CONF_UNSET;
|
||||||
|
|
||||||
|
return conf;
|
||||||
|
}
|
||||||
|
@@ -1135,6 +1158,8 @@ ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
|
||||||
|
ngx_http_log_fmt_t *fmt;
|
||||||
|
ngx_http_log_main_conf_t *lmcf;
|
||||||
|
|
||||||
|
+ ngx_conf_merge_value(conf->escape_non_ascii, prev->escape_non_ascii, 1);
|
||||||
|
+
|
||||||
|
if (conf->open_file_cache == NGX_CONF_UNSET_PTR) {
|
||||||
|
|
||||||
|
conf->open_file_cache = prev->open_file_cache;
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
--- nginx-1.25.3/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800
|
||||||
|
+++ nginx-1.25.3-patched/src/http/modules/ngx_http_proxy_module.c 2017-07-16 14:02:51.000000000 +0800
|
||||||
|
@@ -793,13 +793,13 @@ static ngx_keyval_t ngx_http_proxy_cach
|
||||||
|
static ngx_http_variable_t ngx_http_proxy_vars[] = {
|
||||||
|
|
||||||
|
{ ngx_string("proxy_host"), NULL, ngx_http_proxy_host_variable, 0,
|
||||||
|
- NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
|
||||||
|
+ NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
|
||||||
|
|
||||||
|
{ ngx_string("proxy_port"), NULL, ngx_http_proxy_port_variable, 0,
|
||||||
|
- NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE|NGX_HTTP_VAR_NOHASH, 0 },
|
||||||
|
+ NGX_HTTP_VAR_CHANGEABLE|NGX_HTTP_VAR_NOCACHEABLE, 0 },
|
||||||
|
|
||||||
|
{ ngx_string("proxy_add_x_forwarded_for"), NULL,
|
||||||
|
- ngx_http_proxy_add_x_forwarded_for_variable, 0, NGX_HTTP_VAR_NOHASH, 0 },
|
||||||
|
+ ngx_http_proxy_add_x_forwarded_for_variable, 0, 0, 0 },
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
{ ngx_string("proxy_add_via"), NULL, NULL, 0, NGX_HTTP_VAR_NOHASH, 0 },
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
# HG changeset patch
|
||||||
|
# User Yichun Zhang <agentzh@gmail.com>
|
||||||
|
# Date 1383598130 28800
|
||||||
|
# Node ID f64218e1ac963337d84092536f588b8e0d99bbaa
|
||||||
|
# Parent dea321e5c0216efccbb23e84bbce7cf3e28f130c
|
||||||
|
Cache: gracefully exit the cache manager process.
|
||||||
|
|
||||||
|
diff -r dea321e5c021 -r f64218e1ac96 src/os/unix/ngx_process_cycle.c
|
||||||
|
--- a/src/os/unix/ngx_process_cycle.c Thu Oct 31 18:23:49 2013 +0400
|
||||||
|
+++ b/src/os/unix/ngx_process_cycle.c Mon Nov 04 12:48:50 2013 -0800
|
||||||
|
@@ -1134,7 +1134,7 @@
|
||||||
|
|
||||||
|
if (ngx_terminate || ngx_quit) {
|
||||||
|
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, "exiting");
|
||||||
|
- exit(0);
|
||||||
|
+ ngx_worker_process_exit(cycle);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ngx_reopen) {
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
--- nginx-1.25.3/src/core/ngx_log.h 2013-10-08 05:07:14.000000000 -0700
|
||||||
|
+++ nginx-1.25.3-patched/src/core/ngx_log.h 2013-12-05 20:35:35.996236720 -0800
|
||||||
|
@@ -64,7 +64,9 @@ struct ngx_log_s {
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
-#define NGX_MAX_ERROR_STR 2048
|
||||||
|
+#ifndef NGX_MAX_ERROR_STR
|
||||||
|
+#define NGX_MAX_ERROR_STR 4096
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
|
||||||
|
/*********************************/
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
# HG changeset patch
|
||||||
|
# User Yichun Zhang <agentzh@gmail.com>
|
||||||
|
# Date 1386694955 28800
|
||||||
|
# Node ID 9ba6b149669f1f02eeb4cdc0ebd364a949b5c469
|
||||||
|
# Parent 30e806b8636af5fd3f03ec17df24801f390f7511
|
||||||
|
Configure: added new option --with-pcre-conf-opt=OPTIONS.
|
||||||
|
|
||||||
|
diff -r 30e806b8636a -r 9ba6b149669f auto/options
|
||||||
|
--- a/auto/options Mon Dec 09 10:16:44 2013 +0400
|
||||||
|
+++ b/auto/options Tue Dec 10 09:02:35 2013 -0800
|
||||||
|
@@ -286,6 +286,7 @@
|
||||||
|
--with-pcre) USE_PCRE=YES ;;
|
||||||
|
--with-pcre=*) PCRE="$value" ;;
|
||||||
|
--with-pcre-opt=*) PCRE_OPT="$value" ;;
|
||||||
|
+ --with-pcre-conf-opt=*) PCRE_CONF_OPT="$value" ;;
|
||||||
|
--with-pcre-jit) PCRE_JIT=YES ;;
|
||||||
|
|
||||||
|
--with-openssl=*) OPENSSL="$value" ;;
|
||||||
|
@@ -441,6 +442,7 @@
|
||||||
|
--with-pcre force PCRE library usage
|
||||||
|
--with-pcre=DIR set path to PCRE library sources
|
||||||
|
--with-pcre-opt=OPTIONS set additional build options for PCRE
|
||||||
|
+ --with-pcre-conf-opt=OPTIONS set additional configure options for PCRE
|
||||||
|
--with-pcre-jit build PCRE with JIT compilation support
|
||||||
|
|
||||||
|
--with-md5=DIR set path to md5 library sources
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- nginx-1.25.3/auto/cc/conf 2015-10-30 22:47:50.000000000 +0800
|
||||||
|
+++ nginx-1.25.3-patched/auto/cc/conf 2015-11-02 12:23:05.385156987 +0800
|
||||||
|
@@ -144,7 +144,7 @@ fi
|
||||||
|
CFLAGS="$CFLAGS $NGX_CC_OPT"
|
||||||
|
NGX_TEST_LD_OPT="$NGX_LD_OPT"
|
||||||
|
|
||||||
|
-if [ "$NGX_PLATFORM" != win32 ]; then
|
||||||
|
+if [ 1 ]; then
|
||||||
|
|
||||||
|
if test -n "$NGX_LD_OPT"; then
|
||||||
|
ngx_feature=--with-ld-opt=\"$NGX_LD_OPT\"
|
||||||
|
|
@ -0,0 +1,64 @@
|
||||||
|
# HG changeset patch
|
||||||
|
# User Yichun Zhang <agentzh@openresty.org>
|
||||||
|
# Date 1451762084 28800
|
||||||
|
# Sat Jan 02 11:14:44 2016 -0800
|
||||||
|
# Node ID 449f0461859c16e95bdb18e8be6b94401545d3dd
|
||||||
|
# Parent 78b4e10b4367b31367aad3c83c9c3acdd42397c4
|
||||||
|
SSL: handled SSL_CTX_set_cert_cb() callback yielding.
|
||||||
|
|
||||||
|
OpenSSL 1.0.2+ introduces SSL_CTX_set_cert_cb() to allow custom
|
||||||
|
callbacks to serve the SSL certificiates and private keys dynamically
|
||||||
|
and lazily. The callbacks may yield for nonblocking I/O or sleeping.
|
||||||
|
Here we added support for such usage in NGINX 3rd-party modules
|
||||||
|
(like ngx_lua) in NGINX's event handlers for downstream SSL
|
||||||
|
connections.
|
||||||
|
|
||||||
|
diff -r 78b4e10b4367 -r 449f0461859c src/event/ngx_event_openssl.c
|
||||||
|
--- a/src/event/ngx_event_openssl.c Thu Dec 17 16:39:15 2015 +0300
|
||||||
|
+++ b/src/event/ngx_event_openssl.c Sat Jan 02 11:14:44 2016 -0800
|
||||||
|
@@ -1445,6 +1445,23 @@ ngx_ssl_handshake(ngx_connection_t *c)
|
||||||
|
return NGX_AGAIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
|
||||||
|
+ if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
|
||||||
|
+ c->read->handler = ngx_ssl_handshake_handler;
|
||||||
|
+ c->write->handler = ngx_ssl_handshake_handler;
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return NGX_AGAIN;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
|
||||||
|
|
||||||
|
c->ssl->no_wait_shutdown = 1;
|
||||||
|
@@ -1558,6 +1575,21 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
|
||||||
|
return NGX_AGAIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
|
||||||
|
+ c->read->handler = ngx_ssl_handshake_handler;
|
||||||
|
+ c->write->handler = ngx_ssl_handshake_handler;
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return NGX_AGAIN;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
|
||||||
|
|
||||||
|
c->ssl->no_wait_shutdown = 1;
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
|
||||||
|
--- a/src/event/ngx_event_openssl.c
|
||||||
|
+++ b/src/event/ngx_event_openssl.c
|
||||||
|
@@ -1446,7 +1446,12 @@ ngx_ssl_handshake(ngx_connection_t *c)
|
||||||
|
}
|
||||||
|
|
||||||
|
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
|
||||||
|
- if (sslerr == SSL_ERROR_WANT_X509_LOOKUP) {
|
||||||
|
+ if (sslerr == SSL_ERROR_WANT_X509_LOOKUP
|
||||||
|
+# ifdef SSL_ERROR_PENDING_SESSION
|
||||||
|
+ || sslerr == SSL_ERROR_PENDING_SESSION
|
||||||
|
+# endif
|
||||||
|
+ )
|
||||||
|
+ {
|
||||||
|
c->read->handler = ngx_ssl_handshake_handler;
|
||||||
|
c->write->handler = ngx_ssl_handshake_handler;
|
||||||
|
|
||||||
|
@@ -1575,6 +1580,23 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
|
||||||
|
return NGX_AGAIN;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef SSL_ERROR_PENDING_SESSION
|
||||||
|
+ if (sslerr == SSL_ERROR_PENDING_SESSION) {
|
||||||
|
+ c->read->handler = ngx_ssl_handshake_handler;
|
||||||
|
+ c->write->handler = ngx_ssl_handshake_handler;
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return NGX_AGAIN;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
|
||||||
|
|
||||||
|
c->ssl->no_wait_shutdown = 1;
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
|
||||||
|
index 8ba30e58..2b2db95c 100644
|
||||||
|
--- a/src/event/ngx_event_openssl.c
|
||||||
|
+++ b/src/event/ngx_event_openssl.c
|
||||||
|
@@ -1712,6 +1712,9 @@ ngx_ssl_handshake(ngx_connection_t *c)
|
||||||
|
if (sslerr == SSL_ERROR_WANT_X509_LOOKUP
|
||||||
|
# ifdef SSL_ERROR_PENDING_SESSION
|
||||||
|
|| sslerr == SSL_ERROR_PENDING_SESSION
|
||||||
|
+# endif
|
||||||
|
+# ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
|
||||||
|
+ || sslerr == SSL_ERROR_WANT_CLIENT_HELLO_CB
|
||||||
|
# endif
|
||||||
|
)
|
||||||
|
{
|
||||||
|
@@ -1889,6 +1892,23 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifdef SSL_ERROR_WANT_CLIENT_HELLO_CB
|
||||||
|
+ if (sslerr == SSL_ERROR_WANT_CLIENT_HELLO_CB) {
|
||||||
|
+ c->read->handler = ngx_ssl_handshake_handler;
|
||||||
|
+ c->write->handler = ngx_ssl_handshake_handler;
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ngx_handle_write_event(c->write, 0) != NGX_OK) {
|
||||||
|
+ return NGX_ERROR;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return NGX_AGAIN;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
err = (sslerr == SSL_ERROR_SYSCALL) ? ngx_errno : 0;
|
||||||
|
|
||||||
|
c->ssl->no_wait_shutdown = 1;
|
||||||
|
|
@ -0,0 +1,112 @@
|
||||||
|
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
|
||||||
|
index 69019417..2265d8f7 100644
|
||||||
|
--- a/src/http/ngx_http_upstream.c
|
||||||
|
+++ b/src/http/ngx_http_upstream.c
|
||||||
|
@@ -509,12 +509,19 @@ void
|
||||||
|
ngx_http_upstream_init(ngx_http_request_t *r)
|
||||||
|
{
|
||||||
|
ngx_connection_t *c;
|
||||||
|
+ ngx_http_upstream_t *u;
|
||||||
|
|
||||||
|
c = r->connection;
|
||||||
|
|
||||||
|
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
|
||||||
|
"http init upstream, client timer: %d", c->read->timer_set);
|
||||||
|
|
||||||
|
+ u = r->upstream;
|
||||||
|
+
|
||||||
|
+ u->connect_timeout = u->conf->connect_timeout;
|
||||||
|
+ u->send_timeout = u->conf->send_timeout;
|
||||||
|
+ u->read_timeout = u->conf->read_timeout;
|
||||||
|
+
|
||||||
|
#if (NGX_HTTP_V2)
|
||||||
|
if (r->stream) {
|
||||||
|
ngx_http_upstream_init_request(r);
|
||||||
|
@@ -1626,7 +1633,7 @@ ngx_http_upstream_connect(ngx_http_request_t *r, ngx_http_upstream_t *u)
|
||||||
|
u->request_body_blocked = 0;
|
||||||
|
|
||||||
|
if (rc == NGX_AGAIN) {
|
||||||
|
- ngx_add_timer(c->write, u->conf->connect_timeout);
|
||||||
|
+ ngx_add_timer(c->write, u->connect_timeout);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1704,7 +1711,7 @@ ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
|
||||||
|
if (rc == NGX_AGAIN) {
|
||||||
|
|
||||||
|
if (!c->write->timer_set) {
|
||||||
|
- ngx_add_timer(c->write, u->conf->connect_timeout);
|
||||||
|
+ ngx_add_timer(c->write, u->connect_timeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
c->ssl->handler = ngx_http_upstream_ssl_handshake_handler;
|
||||||
|
@@ -2022,7 +2029,7 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
|
||||||
|
|
||||||
|
if (rc == NGX_AGAIN) {
|
||||||
|
if (!c->write->ready || u->request_body_blocked) {
|
||||||
|
- ngx_add_timer(c->write, u->conf->send_timeout);
|
||||||
|
+ ngx_add_timer(c->write, u->send_timeout);
|
||||||
|
|
||||||
|
} else if (c->write->timer_set) {
|
||||||
|
ngx_del_timer(c->write);
|
||||||
|
@@ -2084,7 +2091,7 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
- ngx_add_timer(c->read, u->conf->read_timeout);
|
||||||
|
+ ngx_add_timer(c->read, u->read_timeout);
|
||||||
|
|
||||||
|
if (c->read->ready) {
|
||||||
|
ngx_http_upstream_process_header(r, u);
|
||||||
|
@@ -3213,7 +3220,7 @@ ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
|
||||||
|
p->cyclic_temp_file = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- p->read_timeout = u->conf->read_timeout;
|
||||||
|
+ p->read_timeout = u->read_timeout;
|
||||||
|
p->send_timeout = clcf->send_timeout;
|
||||||
|
p->send_lowat = clcf->send_lowat;
|
||||||
|
|
||||||
|
@@ -3458,7 +3465,7 @@ ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
|
||||||
|
}
|
||||||
|
|
||||||
|
if (upstream->write->active && !upstream->write->ready) {
|
||||||
|
- ngx_add_timer(upstream->write, u->conf->send_timeout);
|
||||||
|
+ ngx_add_timer(upstream->write, u->send_timeout);
|
||||||
|
|
||||||
|
} else if (upstream->write->timer_set) {
|
||||||
|
ngx_del_timer(upstream->write);
|
||||||
|
@@ -3470,7 +3477,7 @@ ngx_http_upstream_process_upgraded(ngx_http_request_t *r,
|
||||||
|
}
|
||||||
|
|
||||||
|
if (upstream->read->active && !upstream->read->ready) {
|
||||||
|
- ngx_add_timer(upstream->read, u->conf->read_timeout);
|
||||||
|
+ ngx_add_timer(upstream->read, u->read_timeout);
|
||||||
|
|
||||||
|
} else if (upstream->read->timer_set) {
|
||||||
|
ngx_del_timer(upstream->read);
|
||||||
|
@@ -3664,7 +3671,7 @@ ngx_http_upstream_process_non_buffered_request(ngx_http_request_t *r,
|
||||||
|
}
|
||||||
|
|
||||||
|
if (upstream->read->active && !upstream->read->ready) {
|
||||||
|
- ngx_add_timer(upstream->read, u->conf->read_timeout);
|
||||||
|
+ ngx_add_timer(upstream->read, u->read_timeout);
|
||||||
|
|
||||||
|
} else if (upstream->read->timer_set) {
|
||||||
|
ngx_del_timer(upstream->read);
|
||||||
|
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
|
||||||
|
index c2f4dc0b..b9eef118 100644
|
||||||
|
--- a/src/http/ngx_http_upstream.h
|
||||||
|
+++ b/src/http/ngx_http_upstream.h
|
||||||
|
@@ -333,6 +333,11 @@ struct ngx_http_upstream_s {
|
||||||
|
ngx_array_t *caches;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#define HAVE_NGX_UPSTREAM_TIMEOUT_FIELDS 1
|
||||||
|
+ ngx_msec_t connect_timeout;
|
||||||
|
+ ngx_msec_t send_timeout;
|
||||||
|
+ ngx_msec_t read_timeout;
|
||||||
|
+
|
||||||
|
ngx_http_upstream_headers_in_t headers_in;
|
||||||
|
|
||||||
|
ngx_http_upstream_resolved_t *resolved;
|
||||||
|
|
@ -0,0 +1,60 @@
|
||||||
|
# HG changeset patch
|
||||||
|
# User Thibault Charbonnier <thibaultcha@fastmail.com>
|
||||||
|
# Date 1481847421 28800
|
||||||
|
# Thu Dec 15 16:17:01 2016 -0800
|
||||||
|
# Node ID 8bf038fe006fd8ae253d6b41fc6cf109a8912d3e
|
||||||
|
# Parent a3dc657f4e9530623683e6b85bd7492662e4dc47
|
||||||
|
Resolver: ignore ipv6=off resolver option when no ipv6 support
|
||||||
|
|
||||||
|
Makes the resolver directive more robust: we only error out when ipv6
|
||||||
|
resolution is desired but not supported (ipv6=on).
|
||||||
|
|
||||||
|
use case 1: some configurations are sometimes re-used between builds with and
|
||||||
|
without ipv6 support. This patch avoids the need to remove the "ipv6=off" flag.
|
||||||
|
|
||||||
|
use case 2: currently, some tools rely on the --with-ipv6 configure option from
|
||||||
|
"nginx -V" to determine if ipv6 resolution should be disabled in some cases.
|
||||||
|
With this option disappearing in Nginx 1.11.5, this patch would allow such tools
|
||||||
|
to assume "ipv6=off" to be safe regardless of ipv6 support in the current
|
||||||
|
build.
|
||||||
|
|
||||||
|
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
|
||||||
|
index dade1846..5a3f0aa4 100644
|
||||||
|
--- a/src/core/ngx_resolver.c
|
||||||
|
+++ b/src/core/ngx_resolver.c
|
||||||
|
@@ -425,7 +425,6 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if (NGX_HAVE_INET6)
|
||||||
|
if (ngx_strncmp(names[i].data, "ipv4=", 5) == 0) {
|
||||||
|
|
||||||
|
if (ngx_strcmp(&names[i].data[5], "on") == 0) {
|
||||||
|
@@ -446,10 +445,19 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
|
||||||
|
if (ngx_strncmp(names[i].data, "ipv6=", 5) == 0) {
|
||||||
|
|
||||||
|
if (ngx_strcmp(&names[i].data[5], "on") == 0) {
|
||||||
|
+#if (NGX_HAVE_INET6)
|
||||||
|
r->ipv6 = 1;
|
||||||
|
+#else
|
||||||
|
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||||
|
+ "no ipv6 support but \"%V\" in resolver",
|
||||||
|
+ &names[i]);
|
||||||
|
+ return NULL;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
} else if (ngx_strcmp(&names[i].data[5], "off") == 0) {
|
||||||
|
+#if (NGX_HAVE_INET6)
|
||||||
|
r->ipv6 = 0;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
} else {
|
||||||
|
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
|
||||||
|
@@ -459,7 +467,6 @@ ngx_resolver_create(ngx_conf_t *cf, ngx_str_t *names, ngx_uint_t n)
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
#if !(NGX_WIN32)
|
||||||
|
if (ngx_strncmp(names[i].data, "local=", 6) == 0) {
|
||||||
|
|
@ -0,0 +1,185 @@
|
||||||
|
diff --git a/auto/unix b/auto/unix
|
||||||
|
index 10835f6c..b5b33bb3 100644
|
||||||
|
--- a/auto/unix
|
||||||
|
+++ b/auto/unix
|
||||||
|
@@ -990,3 +990,27 @@ ngx_feature_test='struct addrinfo *res;
|
||||||
|
if (getaddrinfo("localhost", NULL, NULL, &res) != 0) return 1;
|
||||||
|
freeaddrinfo(res)'
|
||||||
|
. auto/feature
|
||||||
|
+
|
||||||
|
+ngx_feature="SOCK_CLOEXEC support"
|
||||||
|
+ngx_feature_name="NGX_HAVE_SOCKET_CLOEXEC"
|
||||||
|
+ngx_feature_run=no
|
||||||
|
+ngx_feature_incs="#include <sys/types.h>
|
||||||
|
+ #include <sys/socket.h>"
|
||||||
|
+ngx_feature_path=
|
||||||
|
+ngx_feature_libs=
|
||||||
|
+ngx_feature_test="int fd;
|
||||||
|
+ fd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);"
|
||||||
|
+. auto/feature
|
||||||
|
+
|
||||||
|
+ngx_feature="FD_CLOEXEC support"
|
||||||
|
+ngx_feature_name="NGX_HAVE_FD_CLOEXEC"
|
||||||
|
+ngx_feature_run=no
|
||||||
|
+ngx_feature_incs="#include <sys/types.h>
|
||||||
|
+ #include <sys/socket.h>
|
||||||
|
+ #include <fcntl.h>"
|
||||||
|
+ngx_feature_path=
|
||||||
|
+ngx_feature_libs=
|
||||||
|
+ngx_feature_test="int fd;
|
||||||
|
+ fd = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
|
+ fcntl(fd, F_SETFD, FD_CLOEXEC);"
|
||||||
|
+. auto/feature
|
||||||
|
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
|
||||||
|
index cd55520c..438e0806 100644
|
||||||
|
--- a/src/core/ngx_resolver.c
|
||||||
|
+++ b/src/core/ngx_resolver.c
|
||||||
|
@@ -4466,8 +4466,14 @@ ngx_tcp_connect(ngx_resolver_connection_t *rec)
|
||||||
|
ngx_event_t *rev, *wev;
|
||||||
|
ngx_connection_t *c;
|
||||||
|
|
||||||
|
+#if (NGX_HAVE_SOCKET_CLOEXEC)
|
||||||
|
+ s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM | SOCK_CLOEXEC, 0);
|
||||||
|
+
|
||||||
|
+#else
|
||||||
|
s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM, 0);
|
||||||
|
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "TCP socket %d", s);
|
||||||
|
|
||||||
|
if (s == (ngx_socket_t) -1) {
|
||||||
|
@@ -4494,6 +4500,15 @@ ngx_tcp_connect(ngx_resolver_connection_t *rec)
|
||||||
|
goto failed;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if (NGX_HAVE_FD_CLOEXEC)
|
||||||
|
+ if (ngx_cloexec(s) == -1) {
|
||||||
|
+ ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
|
||||||
|
+ ngx_cloexec_n " failed");
|
||||||
|
+
|
||||||
|
+ goto failed;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
rev = c->read;
|
||||||
|
wev = c->write;
|
||||||
|
|
||||||
|
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
|
||||||
|
index 19fec68..8c2f01a 100644
|
||||||
|
--- a/src/event/ngx_event.h
|
||||||
|
+++ b/src/event/ngx_event.h
|
||||||
|
@@ -73,6 +73,9 @@ struct ngx_event_s {
|
||||||
|
/* to test on worker exit */
|
||||||
|
unsigned channel:1;
|
||||||
|
unsigned resolver:1;
|
||||||
|
+#if (HAVE_SOCKET_CLOEXEC_PATCH)
|
||||||
|
+ unsigned skip_socket_leak_check:1;
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
unsigned cancelable:1;
|
||||||
|
|
||||||
|
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
|
||||||
|
index 77563709..5827b9d0 100644
|
||||||
|
--- a/src/event/ngx_event_accept.c
|
||||||
|
+++ b/src/event/ngx_event_accept.c
|
||||||
|
@@ -62,7 +62,9 @@ ngx_event_accept(ngx_event_t *ev)
|
||||||
|
|
||||||
|
#if (NGX_HAVE_ACCEPT4)
|
||||||
|
if (use_accept4) {
|
||||||
|
- s = accept4(lc->fd, &sa.sockaddr, &socklen, SOCK_NONBLOCK);
|
||||||
|
+ s = accept4(lc->fd, &sa.sockaddr, &socklen,
|
||||||
|
+ SOCK_NONBLOCK | SOCK_CLOEXEC);
|
||||||
|
+
|
||||||
|
} else {
|
||||||
|
s = accept(lc->fd, &sa.sockaddr, &socklen);
|
||||||
|
}
|
||||||
|
@@ -202,6 +204,16 @@ ngx_event_accept(ngx_event_t *ev)
|
||||||
|
ngx_close_accepted_connection(c);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+#if (NGX_HAVE_FD_CLOEXEC)
|
||||||
|
+ if (ngx_cloexec(s) == -1) {
|
||||||
|
+ ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno,
|
||||||
|
+ ngx_cloexec_n " failed");
|
||||||
|
+ ngx_close_accepted_connection(c);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
|
||||||
|
index c5bb8068..cf33b1d2 100644
|
||||||
|
--- a/src/event/ngx_event_connect.c
|
||||||
|
+++ b/src/event/ngx_event_connect.c
|
||||||
|
@@ -38,8 +38,15 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
|
||||||
|
|
||||||
|
type = (pc->type ? pc->type : SOCK_STREAM);
|
||||||
|
|
||||||
|
+#if (NGX_HAVE_SOCKET_CLOEXEC)
|
||||||
|
+ s = ngx_socket(pc->sockaddr->sa_family, type | SOCK_CLOEXEC, 0);
|
||||||
|
+
|
||||||
|
+#else
|
||||||
|
s = ngx_socket(pc->sockaddr->sa_family, type, 0);
|
||||||
|
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0, "%s socket %d",
|
||||||
|
(type == SOCK_STREAM) ? "stream" : "dgram", s);
|
||||||
|
|
||||||
|
@@ -80,6 +87,15 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
|
||||||
|
goto failed;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if (NGX_HAVE_FD_CLOEXEC)
|
||||||
|
+ if (ngx_cloexec(s) == -1) {
|
||||||
|
+ ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
|
||||||
|
+ ngx_cloexec_n " failed");
|
||||||
|
+
|
||||||
|
+ goto failed;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
if (pc->local) {
|
||||||
|
|
||||||
|
#if (NGX_HAVE_TRANSPARENT_PROXY)
|
||||||
|
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c
|
||||||
|
index c4376a5..48e8fa8 100644
|
||||||
|
--- a/src/os/unix/ngx_process_cycle.c
|
||||||
|
+++ b/src/os/unix/ngx_process_cycle.c
|
||||||
|
@@ -960,6 +1029,9 @@ ngx_worker_process_exit(ngx_cycle_t *cycle)
|
||||||
|
for (i = 0; i < cycle->connection_n; i++) {
|
||||||
|
if (c[i].fd != -1
|
||||||
|
&& c[i].read
|
||||||
|
+#if (HAVE_SOCKET_CLOEXEC_PATCH)
|
||||||
|
+ && !c[i].read->skip_socket_leak_check
|
||||||
|
+#endif
|
||||||
|
&& !c[i].read->accept
|
||||||
|
&& !c[i].read->channel
|
||||||
|
&& !c[i].read->resolver)
|
||||||
|
diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h
|
||||||
|
index fcc51533..d1eebf47 100644
|
||||||
|
--- a/src/os/unix/ngx_socket.h
|
||||||
|
+++ b/src/os/unix/ngx_socket.h
|
||||||
|
@@ -38,6 +38,17 @@ int ngx_blocking(ngx_socket_t s);
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if (NGX_HAVE_FD_CLOEXEC)
|
||||||
|
+
|
||||||
|
+#define ngx_cloexec(s) fcntl(s, F_SETFD, FD_CLOEXEC)
|
||||||
|
+#define ngx_cloexec_n "fcntl(FD_CLOEXEC)"
|
||||||
|
+
|
||||||
|
+/* at least FD_CLOEXEC is required to ensure connection fd is closed
|
||||||
|
+ * after execve */
|
||||||
|
+#define HAVE_SOCKET_CLOEXEC_PATCH 1
|
||||||
|
+
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
int ngx_tcp_nopush(ngx_socket_t s);
|
||||||
|
int ngx_tcp_push(ngx_socket_t s);
|
||||||
|
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
|
||||||
|
--- a/src/core/ngx_connection.c
|
||||||
|
+++ b/src/core/ngx_connection.c
|
||||||
|
@@ -1118,6 +1118,12 @@ ngx_close_listening_sockets(ngx_cycle_t *cycle)
|
||||||
|
ls = cycle->listening.elts;
|
||||||
|
for (i = 0; i < cycle->listening.nelts; i++) {
|
||||||
|
|
||||||
|
+#if (NGX_HAVE_REUSEPORT)
|
||||||
|
+ if (ls[i].fd == (ngx_socket_t) -1) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
c = ls[i].connection;
|
||||||
|
|
||||||
|
if (c) {
|
||||||
|
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
|
||||||
|
--- a/src/event/ngx_event.c
|
||||||
|
+++ b/src/event/ngx_event.c
|
||||||
|
@@ -775,6 +775,18 @@ ngx_event_process_init(ngx_cycle_t *cycle)
|
||||||
|
|
||||||
|
#if (NGX_HAVE_REUSEPORT)
|
||||||
|
if (ls[i].reuseport && ls[i].worker != ngx_worker) {
|
||||||
|
+ ngx_log_debug2(NGX_LOG_DEBUG_CORE, cycle->log, 0,
|
||||||
|
+ "closing unused fd:%d listening on %V",
|
||||||
|
+ ls[i].fd, &ls[i].addr_text);
|
||||||
|
+
|
||||||
|
+ if (ngx_close_socket(ls[i].fd) == -1) {
|
||||||
|
+ ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_socket_errno,
|
||||||
|
+ ngx_close_socket_n " %V failed",
|
||||||
|
+ &ls[i].addr_text);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ ls[i].fd = (ngx_socket_t) -1;
|
||||||
|
+
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
@ -735,7 +735,7 @@ for dir in "${writeDirs[@]}"; do
|
||||||
done
|
done
|
||||||
|
|
||||||
rm -rf /etc/nginx/owasp-modsecurity-crs/.git
|
rm -rf /etc/nginx/owasp-modsecurity-crs/.git
|
||||||
rm -rf /etc/nginx/owasp-modsecurity-crs/util/regression-tests
|
rm -rf /etc/nginx/owasp-modsecurity-crs/tests
|
||||||
|
|
||||||
# remove .a files
|
# remove .a files
|
||||||
find /usr/local -name "*.a" -print | xargs /bin/rm
|
find /usr/local -name "*.a" -print | xargs /bin/rm
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
v0.0.3
|
v0.0.8
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ ARG BASE_IMAGE
|
||||||
ARG GOLANG_VERSION
|
ARG GOLANG_VERSION
|
||||||
ARG ETCD_VERSION
|
ARG ETCD_VERSION
|
||||||
|
|
||||||
FROM golang:${GOLANG_VERSION}-alpine3.18 as GO
|
FROM golang:${GOLANG_VERSION}-alpine3.20 as GO
|
||||||
FROM registry.k8s.io/etcd:${ETCD_VERSION} as etcd
|
FROM registry.k8s.io/etcd:${ETCD_VERSION} as etcd
|
||||||
|
|
||||||
FROM ${BASE_IMAGE}
|
FROM ${BASE_IMAGE}
|
||||||
|
|
@ -66,7 +66,8 @@ RUN apk update && apk upgrade && apk add --no-cache \
|
||||||
openssl \
|
openssl \
|
||||||
cfssl@testing \
|
cfssl@testing \
|
||||||
tzdata \
|
tzdata \
|
||||||
libc6-compat
|
libc6-compat \
|
||||||
|
sqlite-dev
|
||||||
|
|
||||||
RUN go install -v github.com/onsi/ginkgo/v2/ginkgo@v${GINKGO_VERSION} \
|
RUN go install -v github.com/onsi/ginkgo/v2/ginkgo@v${GINKGO_VERSION} \
|
||||||
&& go install golang.org/x/lint/golint@${GOLINT_VERSION}
|
&& go install golang.org/x/lint/golint@${GOLINT_VERSION}
|
||||||
|
|
|
||||||
|
|
@ -122,6 +122,9 @@ func (assl1 *Config) Equal(assl2 *Config) bool {
|
||||||
if assl1.PassCertToUpstream != assl2.PassCertToUpstream {
|
if assl1.PassCertToUpstream != assl2.PassCertToUpstream {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
if assl1.MatchCN != assl2.MatchCN {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -333,6 +333,15 @@ func TestEquals(t *testing.T) {
|
||||||
}
|
}
|
||||||
cfg2.PassCertToUpstream = true
|
cfg2.PassCertToUpstream = true
|
||||||
|
|
||||||
|
// Different MatchCN
|
||||||
|
cfg1.MatchCN = "CN=(hello-app|goodbye)"
|
||||||
|
cfg2.MatchCN = "CN=(hello-app)"
|
||||||
|
result = cfg1.Equal(cfg2)
|
||||||
|
if result != false {
|
||||||
|
t.Errorf("Expected false")
|
||||||
|
}
|
||||||
|
cfg2.MatchCN = "CN=(hello-app|goodbye)"
|
||||||
|
|
||||||
// Equal Configs
|
// Equal Configs
|
||||||
result = cfg1.Equal(cfg2)
|
result = cfg1.Equal(cfg2)
|
||||||
if result != true {
|
if result != true {
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ func NewNGINXProcess(pod, namespace, ingressClass string) (NGINXProcessCollector
|
||||||
|
|
||||||
p := &namedProcess{
|
p := &namedProcess{
|
||||||
scrapeChan: make(chan scrapeRequest),
|
scrapeChan: make(chan scrapeRequest),
|
||||||
Grouper: proc.NewGrouper(nm, true, false, false, false),
|
Grouper: proc.NewGrouper(nm, true, false, false, 0, false),
|
||||||
fs: fs,
|
fs: fs,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,7 @@ package steps
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
|
||||||
|
|
||||||
semver "github.com/blang/semver/v4"
|
semver "github.com/blang/semver/v4"
|
||||||
"github.com/helm/helm/pkg/chartutil"
|
"github.com/helm/helm/pkg/chartutil"
|
||||||
|
|
@ -104,18 +102,21 @@ func updateVersion(version string) {
|
||||||
utils.CheckIfError(err, "HELM Saving new Chart")
|
utils.CheckIfError(err, "HELM Saving new Chart")
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateChartReleaseNotes(releasesNotes []string) {
|
func updateChartReleaseNotes(releaseNotes []string) {
|
||||||
utils.Info("HELM Updating the Chart Release notes")
|
utils.Info("HELM Updating chart release notes")
|
||||||
chart, err := chartutil.LoadChartfile(HelmChartPath)
|
chart, err := chartutil.LoadChartfile(HelmChartPath)
|
||||||
utils.CheckIfError(err, "HELM Could not Load Chart to update release notes %s", HelmChartPath)
|
utils.CheckIfError(err, "HELM Failed to load chart manifest: %s", HelmChartPath)
|
||||||
for i := range releasesNotes {
|
|
||||||
releasesNotes[i] = fmt.Sprintf("- %q", releasesNotes[i])
|
releaseNotesBytes, err := yaml.Marshal(releaseNotes)
|
||||||
}
|
utils.CheckIfError(err, "HELM Failed to marshal release notes")
|
||||||
releaseNoteString := strings.Join(releasesNotes, "\n")
|
|
||||||
utils.Info("HELM Release note string %s", releaseNoteString)
|
releaseNotesString := string(releaseNotesBytes)
|
||||||
chart.Annotations["artifacthub.io/changes"] = releaseNoteString
|
utils.Info("HELM Chart release notes:\n%s", releaseNotesString)
|
||||||
|
chart.Annotations["artifacthub.io/changes"] = releaseNotesString
|
||||||
|
|
||||||
|
utils.Info("HELM Saving chart release notes")
|
||||||
err = chartutil.SaveChartfile(HelmChartPath, chart)
|
err = chartutil.SaveChartfile(HelmChartPath, chart)
|
||||||
utils.CheckIfError(err, "HELM Saving updated release notes for Chart")
|
utils.CheckIfError(err, "HELM Failed to save chart manifest: %s", HelmChartPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateChartValue Updates the Helm ChartValue
|
// UpdateChartValue Updates the Helm ChartValue
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ func (Release) NewReleaseFromOld(version, oldversion string) {
|
||||||
func (Release) E2EDocs() {
|
func (Release) E2EDocs() {
|
||||||
e2edocs, err := utils.GenerateE2EDocs()
|
e2edocs, err := utils.GenerateE2EDocs()
|
||||||
utils.CheckIfError(err, "error on template")
|
utils.CheckIfError(err, "error on template")
|
||||||
err = os.WriteFile("docs/e2e-tests.md", []byte(e2edocs), 644)
|
err = os.WriteFile("docs/e2e-tests.md", []byte(e2edocs), 0644)
|
||||||
utils.CheckIfError(err, "Could not write new e2e test file ")
|
utils.CheckIfError(err, "Could not write new e2e test file ")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -158,7 +158,7 @@ func updateIndexMD(old, new string) error {
|
||||||
utils.CheckIfError(err, "Could not read INDEX_DOCS file %s", INDEX_DOCS)
|
utils.CheckIfError(err, "Could not read INDEX_DOCS file %s", INDEX_DOCS)
|
||||||
datString := string(data)
|
datString := string(data)
|
||||||
datString = strings.Replace(datString, old, new, -1)
|
datString = strings.Replace(datString, old, new, -1)
|
||||||
err = os.WriteFile(INDEX_DOCS, []byte(datString), 644)
|
err = os.WriteFile(INDEX_DOCS, []byte(datString), 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.ErrorF("Could not write new %s %s", INDEX_DOCS, err)
|
utils.ErrorF("Could not write new %s %s", INDEX_DOCS, err)
|
||||||
return err
|
return err
|
||||||
|
|
@ -255,7 +255,7 @@ func makeReleaseNotes(newVersion, oldVersion string) (*utils.ReleaseNote, error)
|
||||||
|
|
||||||
// the newControllerVersion should match the latest tag
|
// the newControllerVersion should match the latest tag
|
||||||
if newControllerVersion != allControllerTags[0] {
|
if newControllerVersion != allControllerTags[0] {
|
||||||
return nil, errors.New(fmt.Sprintf("Generating release new version %s didnt match the current latest tag %s", newControllerVersion, allControllerTags[0]))
|
return nil, fmt.Errorf("generating release new version %s didnt match the current latest tag %s", newControllerVersion, allControllerTags[0])
|
||||||
}
|
}
|
||||||
// previous version
|
// previous version
|
||||||
newReleaseNotes.PreviousControllerVersion = allControllerTags[1]
|
newReleaseNotes.PreviousControllerVersion = allControllerTags[1]
|
||||||
|
|
@ -272,8 +272,8 @@ func makeReleaseNotes(newVersion, oldVersion string) (*utils.ReleaseNote, error)
|
||||||
var allUpdates []string
|
var allUpdates []string
|
||||||
var depUpdates []string
|
var depUpdates []string
|
||||||
var helmUpdates []string
|
var helmUpdates []string
|
||||||
prRegex := regexp.MustCompile("\\(#\\d+\\)")
|
prRegex := regexp.MustCompile(`\(#\d+\)`)
|
||||||
depBot := regexp.MustCompile("^(\\w){1,10} Bump ")
|
depBot := regexp.MustCompile(`^(\w){1,10} Bump `)
|
||||||
helmRegex := regexp.MustCompile("helm|chart")
|
helmRegex := regexp.MustCompile("helm|chart")
|
||||||
for i, s := range commits {
|
for i, s := range commits {
|
||||||
// matches on PR
|
// matches on PR
|
||||||
|
|
@ -322,13 +322,13 @@ func makeReleaseNotes(newVersion, oldVersion string) (*utils.ReleaseNote, error)
|
||||||
controllerDigest := utils.FindImageDigest(data, "controller", newVersion)
|
controllerDigest := utils.FindImageDigest(data, "controller", newVersion)
|
||||||
if len(controllerDigest) == 0 {
|
if len(controllerDigest) == 0 {
|
||||||
utils.ErrorF("Controller Digest could not be found")
|
utils.ErrorF("Controller Digest could not be found")
|
||||||
return nil, errors.New("Controller digest could not be found")
|
return nil, errors.New("controller digest could not be found")
|
||||||
}
|
}
|
||||||
|
|
||||||
controllerChrootDigest := utils.FindImageDigest(data, "controller-chroot", newVersion)
|
controllerChrootDigest := utils.FindImageDigest(data, "controller-chroot", newVersion)
|
||||||
if len(controllerChrootDigest) == 0 {
|
if len(controllerChrootDigest) == 0 {
|
||||||
utils.ErrorF("Controller Chroot Digest could not be found")
|
utils.ErrorF("Controller Chroot Digest could not be found")
|
||||||
return nil, errors.New("Controller Chroot digest could not be found")
|
return nil, errors.New("controller chroot digest could not be found")
|
||||||
}
|
}
|
||||||
|
|
||||||
utils.Debug("Latest Controller Digest %v", controllerDigest)
|
utils.Debug("Latest Controller Digest %v", controllerDigest)
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,8 @@ RUN apk update \
|
||||||
bash \
|
bash \
|
||||||
tzdata \
|
tzdata \
|
||||||
libc6-compat \
|
libc6-compat \
|
||||||
openssl
|
openssl \
|
||||||
|
sqlite-dev
|
||||||
|
|
||||||
COPY --from=BASE /go/bin/ginkgo /usr/local/bin/
|
COPY --from=BASE /go/bin/ginkgo /usr/local/bin/
|
||||||
COPY --from=BASE /usr/local/bin/helm /usr/local/bin/
|
COPY --from=BASE /usr/local/bin/helm /usr/local/bin/
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
|
DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
|
||||||
E2E_BASE_IMAGE ?= "registry.k8s.io/ingress-nginx/e2e-test-runner:v20240404-436df3e4@sha256:6bcba53b14d396177414e01f20e9111f1c009ac3b476a9b7668bb98d12bd5e85"
|
E2E_BASE_IMAGE ?= "registry.k8s.io/ingress-nginx/e2e-test-runner:v20240717-1fe74b5f@sha256:fce2ca5e683708cf76c6ba759f351fd7a592c5a56841491cf2d08784154ebf75"
|
||||||
|
|
||||||
image:
|
image:
|
||||||
echo "..entered Makefile in /test/e2e-image"
|
echo "..entered Makefile in /test/e2e-image"
|
||||||
|
|
|
||||||
|
|
@ -322,6 +322,49 @@ var _ = framework.DescribeAnnotation("auth-tls-*", func() {
|
||||||
Status(http.StatusOK)
|
Status(http.StatusOK)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
ginkgo.It("should reload the nginx config when auth-tls-match-cn is updated", func() {
|
||||||
|
host := authTLSFooHost
|
||||||
|
nameSpace := f.Namespace
|
||||||
|
|
||||||
|
clientConfig, err := framework.CreateIngressMASecret(
|
||||||
|
f.KubeClientSet,
|
||||||
|
host,
|
||||||
|
host,
|
||||||
|
nameSpace)
|
||||||
|
assert.Nil(ginkgo.GinkgoT(), err)
|
||||||
|
|
||||||
|
// First add an annotation that forbids our connection
|
||||||
|
annotations := map[string]string{
|
||||||
|
"nginx.ingress.kubernetes.io/auth-tls-secret": nameSpace + "/" + host,
|
||||||
|
"nginx.ingress.kubernetes.io/auth-tls-verify-client": "on",
|
||||||
|
"nginx.ingress.kubernetes.io/auth-tls-match-cn": "CN=notvalid",
|
||||||
|
}
|
||||||
|
|
||||||
|
ingress := f.EnsureIngress(framework.NewSingleIngressWithTLS(host, "/", host, []string{host}, nameSpace, framework.EchoService, 80, annotations))
|
||||||
|
|
||||||
|
assertSslClientCertificateConfig(f, host, "on", "1")
|
||||||
|
|
||||||
|
f.HTTPTestClientWithTLSConfig(clientConfig).
|
||||||
|
GET("/").
|
||||||
|
WithURL(f.GetURL(framework.HTTPS)).
|
||||||
|
WithHeader("Host", host).
|
||||||
|
Expect().
|
||||||
|
Status(http.StatusForbidden)
|
||||||
|
|
||||||
|
// Update the annotation to something that allows the connection
|
||||||
|
ingress.Annotations["nginx.ingress.kubernetes.io/auth-tls-match-cn"] = "CN=authtls"
|
||||||
|
f.UpdateIngress(ingress)
|
||||||
|
|
||||||
|
assertSslClientCertificateConfig(f, host, "on", "1")
|
||||||
|
|
||||||
|
f.HTTPTestClientWithTLSConfig(clientConfig).
|
||||||
|
GET("/").
|
||||||
|
WithURL(f.GetURL(framework.HTTPS)).
|
||||||
|
WithHeader("Host", host).
|
||||||
|
Expect().
|
||||||
|
Status(http.StatusOK)
|
||||||
|
})
|
||||||
|
|
||||||
ginkgo.It("should return 200 using auth-tls-match-cn where atleast one of the regex options matches CN from client", func() {
|
ginkgo.It("should return 200 using auth-tls-match-cn where atleast one of the regex options matches CN from client", func() {
|
||||||
host := authTLSFooHost
|
host := authTLSFooHost
|
||||||
nameSpace := f.Namespace
|
nameSpace := f.Namespace
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ docker run --rm --interactive --network host \
|
||||||
--volume $KUBECONFIG:/root/.kube/config \
|
--volume $KUBECONFIG:/root/.kube/config \
|
||||||
--volume "${DIR}/../../":/workdir \
|
--volume "${DIR}/../../":/workdir \
|
||||||
--workdir /workdir \
|
--workdir /workdir \
|
||||||
registry.k8s.io/ingress-nginx/e2e-test-runner:v20240404-436df3e4@sha256:6bcba53b14d396177414e01f20e9111f1c009ac3b476a9b7668bb98d12bd5e85 \
|
registry.k8s.io/ingress-nginx/e2e-test-runner:v20240717-1fe74b5f@sha256:fce2ca5e683708cf76c6ba759f351fd7a592c5a56841491cf2d08784154ebf75 \
|
||||||
ct install \
|
ct install \
|
||||||
--charts charts/ingress-nginx \
|
--charts charts/ingress-nginx \
|
||||||
--helm-extra-args "--timeout 60s"
|
--helm-extra-args "--timeout 60s"
|
||||||
|
|
|
||||||
|
|
@ -47,12 +47,15 @@ var _ = framework.DescribeSetting("OCSP", func() {
|
||||||
})
|
})
|
||||||
|
|
||||||
ginkgo.It("should enable OCSP and contain stapling information in the connection", func() {
|
ginkgo.It("should enable OCSP and contain stapling information in the connection", func() {
|
||||||
ginkgo.Skip("Skipped due to a bug with cfssl and Alpine")
|
|
||||||
host := "www.example.com"
|
host := "www.example.com"
|
||||||
|
|
||||||
f.UpdateNginxConfigMapData("enable-ocsp", "true")
|
f.UpdateNginxConfigMapData("enable-ocsp", "true")
|
||||||
|
|
||||||
err := prepareCertificates(f.Namespace)
|
err := prepareCertificates(f.Namespace)
|
||||||
|
if err != nil {
|
||||||
|
ginkgo.By(fmt.Sprintf("Prepare Certs error %v", err.Error()))
|
||||||
|
}
|
||||||
|
|
||||||
assert.Nil(ginkgo.GinkgoT(), err)
|
assert.Nil(ginkgo.GinkgoT(), err)
|
||||||
|
|
||||||
ing := framework.NewSingleIngressWithTLS(host, "/", host, []string{host}, f.Namespace, framework.EchoService, 80, nil)
|
ing := framework.NewSingleIngressWithTLS(host, "/", host, []string{host}, f.Namespace, framework.EchoService, 80, nil)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue