Commit graph

7432 commits

Author SHA1 Message Date
Ricardo Katz
7df1b8e915 Bump go libraries (#11023)
* Bump go libraries

* Fix update codegen execution

* Fix errors on klog

* Fix gzip test

* Bump libraries on webhook certgen

* Fix webhook-certgen compilation
2024-02-27 09:52:42 -08:00
Khoo Hao Yit
4229acd689 add missing backend-protocol annotation option (#9545) 2024-02-27 09:41:09 -08:00
Bazze
4b8303ec83 Update controller-prometheusrules.yaml (#8902)
As fixed in pull request #7829 for the ServiceMonitor resource, this is also needed for the PrometheusRule. When
upgrading the ingress-nginx chart in our environment (via Pulumi) from a really old version to the latest (4.2.0) we
noticed it wanted to delete the PrometheusRule resource. This PR should fix that.
2024-02-27 09:27:48 -08:00
Ricardo Katz
a5d1f87f2c Stop reporting interrupted tests (#11027) 2024-02-27 07:50:45 -08:00
Samuel Vaillant
2675c37439 test(gzip): reach ingress (#9541) 2024-02-27 06:06:39 -08:00
Florian Schlichting
78ab951b23 fix datasource, $exported_namespace variable in grafana nginx dashboard (#9092)
* grafana/dashboards/nginx.json: re-add exported_namespace as a variable (was deleted entirely in #9523)

* dashboards/nginx.json: switch around ingress and namespace selectors, and rename "Exported Namespace" to "Ingress Namespace"

authored by tghartland at https://gist.github.com/tghartland/9147d88f991a95d4bab0fa7278c237eb

* dashboards/nginx.json: make "Ingress Request Volume" and "Ingress Success Rate" panels look at selected Ingress Namespaces only, and rename two panel titels to use the renamed variable

as suggested by tghartland in https://github.com/kubernetes/ingress-nginx/pull/9092#issuecomment-1285840900

* dashboards/nginx.json: apply Ingress Namespace selection to "Ingress Percentile Response Times and Transfer Rates" as well

this is from https://github.com/kubernetes/ingress-nginx/pull/9092#issuecomment-1287114743 also by tghartland
2024-02-27 05:58:42 -08:00
Artur Juraszek
61f3c33c3c Properly support a TLS-wrapped OCSP responder (#10164)
Current implementation of OCSP stapling makes use of the DNS caching machinery[^1],
which results in resty.http not seeing the actual host name of the OCSP responder.
On HTTP level, this is already mitigated via overriding the Host header, but
if a given responder operates on a HTTPS endpoint (a setup which, admittedly, isn't
very popular due to its chicken-and-egg caveats involved but is nonetheless legal[^2])
the connection will fail to be established. A relevant (and a bit redacted) excerpt from logs:

  2023/07/02 18:13:23 [info] 112#112: *29039 [lua] dns.lua:32: cache_set(): cache set for 'my.ocsp.responder' with value of [10.1.2.3, 10.4.5.6, 10.7.8.9] and ttl of 30., context: ngx.timer, client: 127.0.0.1, server: 0.0.0.0:442
  2023/07/02 18:13:23 [error] 112#112: *29039 lua ssl certificate does not match host "10.1.2.3", context: ngx.timer, client: 127.0.0.1, server: 0.0.0.0:442
  2023/07/02 18:13:23 [error] 112#112: *29039 [lua] certificate.lua:143: fetch_and_cache_ocsp_response(): could not get OCSP response: certificate host mismatch, context: ngx.timer, client: 127.0.0.1, server: 0.0.0.0:442

[^1]: https://github.com/kubernetes/ingress-nginx/blob/bc2a709/rootfs/etc/nginx/lua/certificate.lua#L81
[^2]: https://datatracker.ietf.org/doc/html/rfc2560#appendix-A.1.1
2024-02-27 05:56:40 -08:00
Hervé
f44a6b80c8 Fix print-e2e-suite (#9536)
Before:
```
$ make print-e2e-suite
Reached DIND check ELSE block, inside run-in-docker.sh
Compiled e2e.test
Reached DIND check ELSE block, inside run-in-docker.sh
+ set -o errexit
+ set -o nounset
+ set -o pipefail
+++ dirname hack/print-e2e-suite.sh
++ cd hack/..
++ pwd -P
+ DIR=/go/src/k8s.io/ingress-nginx
+ /go/src/k8s.io/ingress-nginx/test/e2e/e2e.test -ginkgo.noColor -ginkgo.dryRun
+ sed 's|/go/src/k8s.io/ingress-nginx/|File: |g'
+ sed s/•//g
+ + head -n-3tail -n+5

You're using deprecated Ginkgo functionality:
=============================================
  --ginkgo.dryRun is deprecated, use --ginkgo.dry-run instead
  Learn more at: https://onsi.github.io/ginkgo/MIGRATING_TO_V2#changed-command-line-flags
  --ginkgo.noColor is deprecated, use --ginkgo.no-color instead
  Learn more at: https://onsi.github.io/ginkgo/MIGRATING_TO_V2#changed-command-line-flags

To silence deprecations that can be silenced set the following environment variable:
  ACK_GINKGO_DEPRECATIONS=2.6.1

Will run 423 of 423 specs
```

After:
```
$ make print-e2e-suite
Reached DIND check ELSE block, inside run-in-docker.sh
Compiled e2e.test
Reached DIND check ELSE block, inside run-in-docker.sh

Will run 423 of 423 specs
------------------------------
[Annotations] service-upstream when using the default value (false) and enabling in the annotations should use the Service Cluster IP and Port
File: test/e2e/annotations/serviceupstream.go:41
 [0.000 seconds]
------------------------------
[...]
```

Signed-off-by: Hervé Werner <dud225@hotmail.com>
2024-02-27 05:41:04 -08:00
Ricardo Katz
a3afd3c1d4 Bump modsecurity on nginx 1.25 (#11024) 2024-02-26 17:08:45 -08:00
Ricardo Katz
a9fcf84ebb Bump grpc and reintroduce OTEL compilation (#11021)
* Bump grpc and reintroduce OTEL compilation

* Enable s390x again
2024-02-26 15:05:00 -08:00
Milas Bowman
b30a4c55a1 chore(deps): upgrade headers-more module to 0.37 (#10991)
https://github.com/openresty/headers-more-nginx-module/compare/v0.34...v0.37

Signed-off-by: Milas Bowman <devnull@milas.dev>
2024-02-26 04:32:18 -08:00
dependabot[bot]
fe1e90aa97 Bump github/codeql-action from 3.24.0 to 3.24.5 (#11017)
* Bump github/codeql-action from 3.24.0 to 3.24.5

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.0 to 3.24.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.24.0...v3.24.5)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update images.yaml

* Update scorecards.yml

* Update vulnerability-scans.yaml

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
2024-02-26 04:25:33 -08:00
dependabot[bot]
f6379c2daf Bump actions/dependency-review-action from 4.0.0 to 4.1.3 (#11016)
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 4.0.0 to 4.1.3.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](4901385134...9129d7d40b)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-26 03:17:40 -08:00
zengyuxing007
d00ec340f5 Update ingress-path-matching.md (#11008) 2024-02-21 22:07:07 -08:00
zengyuxing007
ed8819fa9b Update ingress-path-matching.md (#11007) 2024-02-21 19:00:17 -08:00
dependabot[bot]
5cbcfd1edc Bump dorny/paths-filter from 3.0.0 to 3.0.1 (#10994)
Bumps [dorny/paths-filter](https://github.com/dorny/paths-filter) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/dorny/paths-filter/releases)
- [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md)
- [Commits](0bc4621a31...ebc4d7e9eb)

---
updated-dependencies:
- dependency-name: dorny/paths-filter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-19 03:13:28 -08:00
dependabot[bot]
035074d3ca Bump github.com/prometheus/client_model from 0.5.0 to 0.6.0 (#10998)
Bumps [github.com/prometheus/client_model](https://github.com/prometheus/client_model) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/prometheus/client_model/releases)
- [Commits](https://github.com/prometheus/client_model/compare/v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_model
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-19 03:10:47 -08:00
dependabot[bot]
0c81cf5224 Bump actions/upload-artifact from 4.3.0 to 4.3.1 (#10978)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](26f96dfa69...5d5d22a312)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-12 04:31:31 -08:00
dependabot[bot]
a9a4d592c0 Bump actions/download-artifact from 4.1.1 to 4.1.2 (#10981)
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](6b208ae046...eaceaf801f)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-12 04:02:07 -08:00
dependabot[bot]
dcfc218f33 Bump aquasecurity/trivy-action from 0.16.1 to 0.17.0 (#10979)
Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](d43c1f16c0...84384bd6e7)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-12 03:59:07 -08:00
dependabot[bot]
7a4bd75cb1 Bump golangci/golangci-lint-action from 3.7.0 to 4.0.0 (#10980)
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3.7.0 to 4.0.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](3a91952989...3cfe3a4abb)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-12 03:53:12 -08:00
dependabot[bot]
2df5a9c1a2 Bump golang.org/x/crypto from 0.18.0 to 0.19.0 (#10976)
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.18.0 to 0.19.0.
- [Commits](https://github.com/golang/crypto/compare/v0.18.0...v0.19.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-12 03:50:16 -08:00
dependabot[bot]
9427570645 Bump github/codeql-action from 3.23.2 to 3.24.0 (#10971)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.2 to 3.24.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.23.2...v3.24.0)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-06 07:09:25 -08:00
Marco Ebert
507af54460 E2E Tests: Explicitly enable metrics. (#10962) 2024-02-02 05:45:03 -08:00
Marco Ebert
a5bb6e4e95 Chart: Set --enable-metrics depending on controller.metrics.enabled. (#10959) 2024-02-01 22:55:15 -08:00
Marco Ebert
610607decd Chart: Remove useless default from _params.tpl. (#10957) 2024-02-01 15:03:48 -08:00
dependabot[bot]
16b0ef3448 Bump github.com/opencontainers/runc from 1.1.11 to 1.1.12 (#10951)
Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.11 to 1.1.12.
- [Release notes](https://github.com/opencontainers/runc/releases)
- [Changelog](https://github.com/opencontainers/runc/blob/v1.1.12/CHANGELOG.md)
- [Commits](https://github.com/opencontainers/runc/compare/v1.1.11...v1.1.12)

---
updated-dependencies:
- dependency-name: github.com/opencontainers/runc
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-01 05:42:39 -08:00
dependabot[bot]
413268ccf5 Bump google.golang.org/grpc from 1.60.1 to 1.61.0 (#10938)
Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.60.1 to 1.61.0.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.60.1...v1.61.0)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-29 06:21:01 -08:00
dependabot[bot]
b9e01a6460 Bump actions/upload-artifact from 4.2.0 to 4.3.0 (#10937)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](694cdabd8b...26f96dfa69)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-29 06:17:56 -08:00
dependabot[bot]
210103b343 Bump dorny/test-reporter from 1.7.0 to 1.8.0 (#10936)
Bumps [dorny/test-reporter](https://github.com/dorny/test-reporter) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/dorny/test-reporter/releases)
- [Changelog](https://github.com/dorny/test-reporter/blob/main/CHANGELOG.md)
- [Commits](afe6793191...eaa763f6ff)

---
updated-dependencies:
- dependency-name: dorny/test-reporter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-29 06:15:01 -08:00
dependabot[bot]
17cdea792c Bump github/codeql-action from 3.23.1 to 3.23.2 (#10935)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.1 to 3.23.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.23.1...v3.23.2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-29 06:12:05 -08:00
dependabot[bot]
11ce1e5fc3 Bump dorny/paths-filter from 2.11.1 to 3.0.0 (#10934)
Bumps [dorny/paths-filter](https://github.com/dorny/paths-filter) from 2.11.1 to 3.0.0.
- [Release notes](https://github.com/dorny/paths-filter/releases)
- [Changelog](https://github.com/dorny/paths-filter/blob/master/CHANGELOG.md)
- [Commits](4512585405...0bc4621a31)

---
updated-dependencies:
- dependency-name: dorny/paths-filter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-29 03:08:34 -08:00
Ricardo Katz
819dbc9bfa Fix golang makefile var name (#10932) 2024-01-28 15:59:52 -08:00
Ricardo Katz
232d5114ec Fixing image push (#10931) 2024-01-28 19:49:15 -03:00
Ricardo Katz
89c67d98d2 Bump alpine to 3.19.1 (#10930) 2024-01-28 13:53:29 -08:00
Adam Jones
cb47c44670 fix: live-docs script (#10928)
This commit updates the live-docs script in the Makefile to install the necessary dependencies for running mkdocs, before starting it.
2024-01-28 12:30:10 -08:00
Adam Jones
701fc531d5 docs: Add vouch-proxy OAuth example (#10929) 2024-01-28 08:32:47 -08:00
Ricardo Katz
451d0d6140 Bump go to v1.21.6 and set a single source of truth (#10926) 2024-01-27 17:15:14 -08:00
Ricardo Katz
915070453d Add OTEL build test and for NGINX v1.25 (#10889)
* Add OTEL build test

* Simplify otel compilation

* Remove http2 deprecated arg

* Move image build to CI

* Turn image from scratch to optimize usage

* rollback image from scratch

* Final reviews on nginx v1.25 image

* Remove s390x from final image
2024-01-27 07:33:50 -08:00
Tore Stendal Lønøy
3d1cbb803b docs: update annotations docs with missing session-cookie section (#10917) 2024-01-27 03:40:35 -08:00
James Strong
f9ed991eca Release controller 1.9.6 and helm 4.9.1 (#10919)
Signed-off-by: James Strong <strong.james.e@gmail.com>
2024-01-26 23:45:19 -08:00
James Strong
0f636a876a Merge pull request #10922 from strongjz/update-e2e-image
update e2e to latest
2024-01-26 15:52:27 -05:00
James Strong
e5723090f9 update e2e to latest
Signed-off-by: James Strong <strong.james.e@gmail.com>
2024-01-26 15:49:09 -05:00
Long Wu Yuan
c6291f9d3d fix run command in dockerfile of test-runner-image (#10921) 2024-01-26 19:21:16 +01:00
Long Wu Yuan
c48e85b5d3 changed testrunner image-sha for ginkgo-2-15-0 (#10906) 2024-01-23 08:34:27 +01:00
dependabot[bot]
63ed0bf18f Bump actions/dependency-review-action from 3.1.5 to 4.0.0 (#10894)
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.1.5 to 4.0.0.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](c74b580d73...4901385134)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-22 22:50:35 +01:00
dependabot[bot]
77f60975f9 Bump github/codeql-action from 3.23.0 to 3.23.1 (#10892)
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.0 to 3.23.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Commits](https://github.com/github/codeql-action/compare/v3.23.0...v3.23.1)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-22 22:47:12 +01:00
James Strong
04785c9a0f Merge pull request #10902 from longwuyuan/bump-ginkgo-to-2-15-0
bump pinned ginkgo to 2-15-0
2024-01-22 15:12:56 -05:00
longwuyuan
30b48be5a7 bump ginkgo to 2-15-0 2024-01-23 00:15:40 +05:30
dependabot[bot]
529b5ac5de Bump actions/download-artifact from 3.0.2 to 4.1.1 (#10895)
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3.0.2 to 4.1.1.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3.0.2...6b208ae046db98c579e8a3aa621ab581ff575935)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-01-22 19:27:51 +01:00