Merge branch 'main' into dependabot/docker/build/docker-images-1df9ab…

…5438

build/Dockerfile

@@ -17,7 +17,7 @@ FROM ghcr.io/nginx/dependencies/nginx-ubi-ppc64le:nginx-1.27.3@sha256:4cda07664f
 FROM ghcr.io/nginx/alpine-fips:0.2.4-alpine3.17@sha256:73de48bf4ce75fe74c3b7169e63b28edeecafac8c14cc52509becb8b98f84202 AS alpine-fips-3.17
 FROM ghcr.io/nginx/alpine-fips:0.2.4-alpine3.20@sha256:d28eeb2c22f4ef223cd3e424943451a782aa0ba1a96a1dbd20c8d90e8c4341e0 AS alpine-fips-3.20
 FROM redhat/ubi9-minimal:9.5@sha256:b87097994ed62fbf1de70bc75debe8dacf3ea6e00dd577d74503ef66452c59d6 AS ubi-minimal
-FROM golang:1.23-alpine@sha256:c23339199a08b0e12032856908589a6d41a0dab141b8b3b21f156fc571a3f1d3 AS golang-builder
+FROM golang:1.23-alpine@sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596 AS golang-builder
 
 
 ############################################# Base image for Alpine #############################################

examples/ingress-resources/mergeable-ingress-types/README.md

@@ -17,6 +17,7 @@ Masters cannot contain the following annotations:
 - nginx.org/ssl-services
 - nginx.org/grpc-services
 - nginx.org/websocket-services
+- nginx.org/use-cluster-ip
 - nginx.com/sticky-cookie-services
 - nginx.com/health-checks
 - nginx.com/health-checks-mandatory
@@ -40,11 +41,17 @@ Minions cannot contain the following annotations:
 - nginx.org/listen-ports
 - nginx.org/listen-ports-ssl
 - nginx.org/server-snippets
+- appprotect.f5.com/app_protect_enable
+- appprotect.f5.com/app_protect_policy
+- appprotect.f5.com/app_protect_security_log_enable
+- appprotect.f5.com/app_protect_security_log
+- appprotectdos.f5.com/app-protect-dos-resource
 
 Minions inherent the following annotations from the master, unless they override them:
 
 - nginx.org/proxy-connect-timeout
 - nginx.org/proxy-read-timeout
+- nginx.org/proxy-send-timeout
 - nginx.org/client-max-body-size
 - nginx.org/proxy-buffering
 - nginx.org/proxy-buffers
@@ -54,7 +61,18 @@ Minions inherent the following annotations from the master, unless they override
 - nginx.org/lb-method
 - nginx.org/keepalive
 - nginx.org/max-fails
+- nginx.org/max-conns
 - nginx.org/fail-timeout
+- nginx.org/limit-req-rate
+- nginx.org/limit-req-key
+- nginx.org/limit-req-zone-size
+- nginx.org/limit-req-delay
+- nginx.org/limit-req-no-delay
+- nginx.org/limit-req-burst
+- nginx.org/limit-req-dry-run
+- nginx.org/limit-req-log-level
+- nginx.org/limit-req-reject-code
+- nginx.org/limit-req-scale
 
 Note: Ingress Resources with more than one host cannot be used.