[WIP] chore: bump NGINX version v1.21.4

[tao12345666333]

Signed-off-by: Jintao Zhang [email protected]

What this PR does / why we need it:

Types of changes

• [x] Bug fix (non-breaking change which fixes an issue)
• [ ] New feature (non-breaking change which adds functionality)
• [ ] Breaking change (fix or feature that would cause existing functionality to change)
• [ ] Documentation only

Which issue/s this PR fixes

fixes: https://github.com/kubernetes/ingress-nginx/issues/8799

How Has This Been Tested?

Checklist:

• [ ] My change requires a change to the documentation.
• [ ] I have updated the documentation accordingly.
• [ ] I've read the CONTRIBUTION guide
• [ ] I have added tests to cover my changes.
• [ ] All new and existing tests passed.

[strongjz]

/kind feature /priority important-soon /triage accepted /ok-to-test

[strongjz]

@tao12345666333 we need to merge this to kick of the cloud build or are you doing that on your own?

[tao12345666333]

@strongjz Actually I haven't finished this PR I would test locally first

[loveRhythm1990]

hi, I want to upgrade NGINX to 1.22.0，will it work if i only change "export NGINX_VERSION=1.19.10" to "export NGINX_VERSION=1.22.0" and change its sha256 hash value ? I always build failure and never success，the common error is following: #26 1694.1 objs/ngx_http_auth_digest_module_modules.c #26 1694.2 /tmp/build/nginx_ajp_module-a964a0bcc6a9f2bfb82a13752d7794a36319ffac/ngx_http_ajp.c: In function 'sc_for_req_get_uri': #26 1694.2 /tmp/build/nginx_ajp_module-a964a0bcc6a9f2bfb82a13752d7794a36319ffac/ngx_http_ajp.c:139:29: error: 'ngx_http_request_t' {aka 'struct ngx_http_request_s'} has no member named 'space_in_uri'; did you mean 'plus_in_uri'? #26 1694.2 139 | if (r->quoted_uri || r->space_in_uri || r->internal) { #26 1694.2 | ^~~~~~~~~~~~ #26 1694.2 | plus_in_uri #26 1694.2 make[1]: *** [objs/Makefile:2818: objs/addon/nginx_ajp_module-a964a0bcc6a9f2bfb82a13752d7794a36319ffac/ngx_http_ajp.o] Error 1 #26 1694.2 make[1]: *** Waiting for unfinished jobs.... #26 1695.0 make[1]: Leaving directory '/tmp/build/nginx-1.22.0' #26 1695.0 make: *** [Makefile:10: build] Error 2 I need some help, plz, @tao12345666333

[tao12345666333]

hi, I want to upgrade NGINX to 1.22.0，will it work if i only change "export NGINX_VERSION=1.19.10" to "export NGINX_VERSION=1.22.0" and change its sha256 hash value ?

no, also need to change all module dependencies. As I am modifying other modules in this PR

[loveRhythm1990]

hi, I want to upgrade NGINX to 1.22.0，will it work if i only change "export NGINX_VERSION=1.19.10" to "export NGINX_VERSION=1.22.0" and change its sha256 hash value ?

no, also need to change all module dependencies. As I am modifying other modules in this PR

Are there any hints to find the target versions of dependencies ? I am not work on NGINX and this seems hard to me

[tao12345666333]

ref: https://github.com/openresty/openresty/blob/master/util/mirror-tarballs#L557-L560

[loveRhythm1990]

ref: https://github.com/openresty/openresty/blob/master/util/mirror-tarballs#L557-L560

you are so great

[tao12345666333]

Next I just need to update the patch

[tao12345666333]

tao@moelove:~$ docker run  --entrypoint sh --rm -it gcr.io/k8s-staging-ingress-nginx/nginx:12345 
/ # nginx -V
nginx version: nginx/1.21.4
built by gcc 11.2.1 20220219 (Alpine 11.2.1_git20220219) 
built with OpenSSL 1.1.1q  5 Jul 2022
TLS SNI support enabled
configure arguments: --prefix=/usr/local/nginx --conf-path=/etc/nginx/nginx.conf --modules-path=/etc/nginx/modules --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --lock-path=/var/lock/nginx.lock --pid-path=/run/nginx.pid --http-client-body-temp-path=/var/lib/nginx/body --http-fastcgi-temp-path=/var/lib/nginx/fastcgi --http-proxy-temp-path=/var/lib/nginx/proxy --http-scgi-temp-path=/var/lib/nginx/scgi --http-uwsgi-temp-path=/var/lib/nginx/uwsgi --with-debug --with-compat --with-pcre-jit --with-http_ssl_module --with-http_stub_status_module --with-http_realip_module --with-http_auth_request_module --with-http_addition_module --with-http_geoip_module --with-http_gzip_static_module --with-http_sub_module --with-http_v2_module --with-stream --with-stream_ssl_module --with-stream_realip_module --with-stream_ssl_preread_module --with-threads --with-http_secure_link_module --with-http_gunzip_module --with-file-aio --without-mail_pop3_module --without-mail_smtp_module --without-mail_imap_module --without-http_uwsgi_module --without-http_scgi_module --with-cc-opt='-g -O2 -fPIE -fstack-protector-strong -Wformat -Werror=format-security -Wno-deprecated-declarations -fno-strict-aliasing -D_FORTIFY_SOURCE=2 --param=ssp-buffer-size=4 -DTCP_FASTOPEN=23 -fPIC -I/root/.hunter/_Base/d45d77d/d0c447a/3b7ee27/Install/include -Wno-cast-function-type -m64 -mtune=generic' --with-ld-opt='-fPIE -fPIC -pie -Wl,-z,relro -Wl,-z,now -L/root/.hunter/_Base/d45d77d/d0c447a/3b7ee27/Install/lib' --user=www-data --group=www-data --add-module=/tmp/build/ngx_devel_kit-0.3.1 --add-module=/tmp/build/set-misc-nginx-module-0.33 --add-module=/tmp/build/headers-more-nginx-module-0.33 --add-module=/tmp/build/ngx_http_substitutions_filter_module-b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0 --add-module=/tmp/build/lua-nginx-module-0.10.21 --add-module=/tmp/build/stream-lua-nginx-module-0.0.11 --add-module=/tmp/build/lua-upstream-nginx-module-8aa93ead98ba2060d4efd594ae33a35d153589bf --add-module=/tmp/build/nginx_ajp_module-fcbb2ccca4901d317ecd7a9dabb3fec9378ff40f --add-dynamic-module=/tmp/build/nginx-http-auth-digest-1.0.0 --add-dynamic-module=/tmp/build/nginx-influxdb-module-5b09391cb7b9a889687c0aa67964c06a2d933e8b --add-dynamic-module=/tmp/build/nginx-opentracing-0.19.0/opentracing --add-dynamic-module=/tmp/build/ModSecurity-nginx-1.0.2 --add-dynamic-module=/tmp/build/ngx_http_geoip2_module-a26c6beed77e81553686852dceb6c7fdacc5970d --add-dynamic-module=/tmp/build/ngx_brotli

[rikatz]

@tao12345666333 ready for some review? let me know, we can do live review! :D

[tao12345666333]

yes!

[rikatz]

yey nice. I guess this is good. I only wanted to know if we can use the last nginx patch :D

[rikatz]

/lgtm /hold Saw the changes from v1.21.6, not a big deal.

Unhold as you wish! Thanks Jintao!

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rikatz, tao12345666333

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• ~~images/OWNERS~~ [rikatz,tao12345666333]

Approvers can indicate their approval by writing /approve in a comment Approvers can cancel approval by writing /approve cancel in a comment

[tao12345666333]

As Openresty hasn't been updated to 1.21.6, although not much has changed between 1.21.4 and 1.21.6. But I want to merge this first, to test this. Then update to 1.21.6 in subsequent PRs

/unhold

[tao12345666333]

/hold cancel

[priyesh2609]

Hi @tao12345666333, @rikatz, the version upgrade in this PR 1.21.4 has reached an end of support since long time.

Is there any plan to upgrade to currently supported version like 1.22.1 or 1.23.2. As mentioned here