Skip to content

Commit ceeb198

Browse files
authored
Merge branch 'main' into deps/image-update-main-01d2dc20
2 parents d15ffa9 + a904881 commit ceeb198

File tree

4 files changed

+152
-139
lines changed

4 files changed

+152
-139
lines changed

.github/scripts/variables.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ get_docker_md5() {
1818
}
1919

2020
get_go_code_md5() {
21-
find . -type f \( -name "*.go" -o -name go.mod -o -name go.sum -o -name "*.tmpl" -o -name "version.txt" -o -name "*.js" \) -not -path "./site*" -exec md5sum {} + | LC_ALL=C sort | md5sum | awk '{ print $1 }'
21+
find . -type f \( -name "*.go" -o -name go.mod -o -name go.sum -o -name "*.tmpl" -o -name "version.txt" -o -name "*.js" -o -name "*.conf" \) -not -path "./site*" -exec md5sum {} + | LC_ALL=C sort | md5sum | awk '{ print $1 }'
2222
}
2323

2424
get_tests_md5() {

internal/configs/oidc/oidc.conf

+8
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
# to construct the OpenID Connect token request, as per:
3838
# http://openid.net/specs/openid-connect-core-1_0.html#TokenRequest
3939
internal;
40+
41+
# Exclude client headers to avoid CORS errors with certain IdPs (e.g., Microsoft Entra ID)
42+
proxy_pass_request_headers off;
43+
4044
proxy_ssl_server_name on; # For SNI to the IdP
4145
proxy_set_header Content-Type "application/x-www-form-urlencoded";
4246
proxy_set_header Authorization $arg_secret_basic;
@@ -48,6 +52,10 @@
4852
# use the proxy_ directives to construct the OpenID Connect token request, as per:
4953
# https://openid.net/specs/openid-connect-core-1_0.html#RefreshingAccessToken
5054
internal;
55+
56+
# Exclude client headers to avoid CORS errors with certain IdPs (e.g., Microsoft Entra ID)
57+
proxy_pass_request_headers off;
58+
5159
proxy_ssl_server_name on; # For SNI to the IdP
5260
proxy_set_header Content-Type "application/x-www-form-urlencoded";
5361
proxy_set_header Authorization $arg_secret_basic;

site/content/overview/about.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ This document describes the F5 NGINX Ingress Controller, an Ingress Controller i
1010

1111
---
1212

13-
NGINX Ingress Controller is an [Ingress Controller]({{< relref "glossary.md#ingress-controller">}}) implementation for NGINX and NGINX Plus that can load balance Websocket, gRPC, TCP and UDP applications. It supports standard [Ingress]({{< relref "glossary.md#ingress">}}) features such as content-based routing and TLS/SSL termination. Several NGINX and NGINX Plus features are available as extensions to Ingress resources through [Annotations]({{< relref "configuration/ingress-resources/advanced-configuration-with-annotations">}}) and the [ConfigMap]({{< relref "configuration/global-configuration/configmap-resource">}}) resource.
13+
NGINX Ingress Controller is an [Ingress Controller]({{< relref "glossary.md#ingress-controller">}}) implementation for [NGINX](https://nginx.org) and [NGINX Plus](https://www.f5.com/products/nginx/nginx-plus) that can load balance Websocket, gRPC, TCP and UDP applications. NGINX Ingress Controller gives you a way to manage NGINX through the [Kubernetes](https://kubernetes.io/) API, and is built to handle the continuous change that happens in Kubernetes environments.
14+
15+
It supports standard [Ingress]({{< relref "glossary.md#ingress">}}) features such as content-based routing and TLS/SSL termination.Several NGINX and NGINX Plus features are available as extensions to Ingress resources through [Annotations]({{< relref "configuration/ingress-resources/advanced-configuration-with-annotations">}}) and the [ConfigMap]({{< relref "configuration/global-configuration/configmap-resource">}}) resource.
1416

1517
NGINX Ingress Controller supports the [VirtualServer and VirtualServerRoute resources]({{< relref "configuration/virtualserver-and-virtualserverroute-resources">}}) as alternatives to Ingress, enabling traffic splitting and advanced content-based routing. It also supports TCP, UDP and TLS Passthrough load balancing using [TransportServer resources]({{< relref "configuration/transportserver-resource">}}).
1618

0 commit comments

Comments
 (0)