Skip to content

Commit

Permalink
use inclusive language (#5396)
Browse files Browse the repository at this point in the history
  • Loading branch information
vepatel authored Apr 15, 2024
1 parent 39bf194 commit d9bd380
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/content/installation/ingress-nginx.md
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ This table maps the Ingress-NGINX Controller annotations to NGINX Ingress Contro
{{% /bootstrap-table %}}

1. Ingress-NGINX Controller implements some of its load balancing algorithms with Lua, which may not have an equivalent in NGINX Ingress Controller.
1. To redirect HTTP (80) traffic to HTTPS (443), NGINX Ingress Controller uses native NGINX `if` conditions while Ingress-NGINX Controller uses Lua.
1. To redirect HTTP (80) traffic to HTTPS (443), NGINX Ingress Controller uses built-in NGINX `if` conditions while Ingress-NGINX Controller uses Lua.

The following two snippets outline Ingress-NGINX Controller annotations that correspond to annotations for NGINX Ingress Controller with NGINX Plus.

Expand Down
2 changes: 1 addition & 1 deletion examples/ingress-resources/custom-annotations/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Custom annotations enable you to quickly extend the Ingress resource to support many advanced features of NGINX, such as
rate limiting, caching, etc.

**Note**: Rate-limiting is now available with native annotation support, however this guide is still applicable for other
**Note**: Rate-limiting is now available with built-in annotation support, however this guide is still applicable for other
NGINX functionalities.

Let's create a set of custom annotations to support
Expand Down
2 changes: 1 addition & 1 deletion examples/ingress-resources/tcp-udp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ the DNS name frequently, so will update automatically when new pods are deployed
## Prerequisites

- We use `dig` for testing. Make sure it is installed on your machine.
- We use native NGINX configuration to configure TCP/UDP load balancing. If you'd like to better understand the example
- We use built-in NGINX configuration to configure TCP/UDP load balancing. If you'd like to better understand the example
configuration, read about [TCP/UDP load
balancing](https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-udp-load-balancer/) and [DNS service
discovery](https://www.nginx.com/blog/dns-service-discovery-nginx-plus/) in NGINX/NGINX Plus.
Expand Down
8 changes: 4 additions & 4 deletions internal/configs/annotations.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const AppProtectDosProtectedAnnotation = "appprotectdos.f5.com/app-protect-dos-r
// nginxMeshInternalRoute specifies if the ingress resource is an internal route.
const nginxMeshInternalRouteAnnotation = "nsm.nginx.com/internal-route"

var masterBlacklist = map[string]bool{
var masterDenylist = map[string]bool{
"nginx.org/rewrites": true,
"nginx.org/ssl-services": true,
"nginx.org/grpc-services": true,
Expand All @@ -46,7 +46,7 @@ var masterBlacklist = map[string]bool{
UseClusterIPAnnotation: true,
}

var minionBlacklist = map[string]bool{
var minionDenylist = map[string]bool{
"nginx.org/proxy-hide-headers": true,
"nginx.org/proxy-pass-headers": true,
"nginx.org/redirect-to-https": true,
Expand Down Expand Up @@ -552,7 +552,7 @@ func filterMasterAnnotations(annotations map[string]string) []string {
var removedAnnotations []string

for key := range annotations {
if _, notAllowed := masterBlacklist[key]; notAllowed {
if _, notAllowed := masterDenylist[key]; notAllowed {
removedAnnotations = append(removedAnnotations, key)
delete(annotations, key)
}
Expand All @@ -565,7 +565,7 @@ func filterMinionAnnotations(annotations map[string]string) []string {
var removedAnnotations []string

for key := range annotations {
if _, notAllowed := minionBlacklist[key]; notAllowed {
if _, notAllowed := minionDenylist[key]; notAllowed {
removedAnnotations = append(removedAnnotations, key)
delete(annotations, key)
}
Expand Down

0 comments on commit d9bd380

Please sign in to comment.