Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): bump openresty from 1.21.4.1 to 1.21.4.2 #11360

Merged
merged 2 commits into from Sep 6, 2023

Conversation

bungle
Copy link
Member

@bungle bungle commented Aug 7, 2023

@github-actions github-actions bot added the chore Not part of the core functionality of kong, but still needed label Aug 7, 2023
@github-actions github-actions bot removed the chore Not part of the core functionality of kong, but still needed label Aug 7, 2023
@chronolaw
Copy link
Contributor

Need to fix dyn_upstream_keepalive.patch.

@bungle
Copy link
Member Author

bungle commented Aug 8, 2023

Need to fix dyn_upstream_keepalive.patch.

Yes, if it is because of it. Currently I cannot reproduce with my setup, and patch applies cleanly. But I can take another look at it. Perhaps things works differently on Linuxes.

@bungle bungle force-pushed the chore/openresty-1.21.4.2 branch 2 times, most recently from 5d979a9 to 0da3c4d Compare August 8, 2023 07:06
@kikito kikito requested a review from fffonion August 8, 2023 08:28
@fffonion
Copy link
Contributor

fffonion commented Aug 8, 2023

I rebased the patch by using patch tool and generate the patch again. The patch implementation for Bazel is not patch and somtimes it fails to apply for patches that are applied with fuzz

patching file ngx_lua-0.10.25/src/ngx_http_lua_balancer.c
Hunk #3 succeeded at 238 with fuzz 2.
Hunk #4 succeeded at 303 (offset 10 lines).
Hunk #5 succeeded at 354 (offset 10 lines).
Hunk #6 succeeded at 376 (offset 10 lines).
Hunk #7 succeeded at 415 (offset 10 lines).
Hunk #8 succeeded at 452 (offset 10 lines).
Hunk #9 succeeded at 490 (offset 10 lines).
Hunk #10 succeeded at 938 (offset 10 lines).
Hunk #11 succeeded at 952 (offset 10 lines).
Hunk #12 succeeded at 965 (offset 10 lines).
Hunk #13 succeeded at 997 (offset 10 lines).
Hunk #14 succeeded at 1020 (offset 10 lines).
Hunk #15 succeeded at 1032 (offset 10 lines).
Hunk #16 succeeded at 1107 (offset 10 lines).
Hunk #17 succeeded at 1138 (offset 10 lines).
Hunk #18 succeeded at 1195 (offset 10 lines).
Hunk #19 succeeded at 1224 (offset 10 lines).
Hunk #20 succeeded at 1250 (offset 10 lines).
Hunk #21 succeeded at 1278 (offset 10 lines).
patching file ngx_lua-0.10.25/src/ngx_http_lua_common.h
Hunk #1 succeeded at 247 with fuzz 2 (offset 7 lines).
Hunk #2 succeeded at 341 with fuzz 1 (offset 20 lines).
patching file ngx_lua-0.10.25/src/ngx_http_lua_module.c
Hunk #1 succeeded at 1158 with fuzz 1 (offset 41 lines).

@bungle
Copy link
Member Author

bungle commented Aug 8, 2023

I rebased the patch by using patch tool and generate the patch again. The patch implementation for Bazel is not patch and somtimes it fails to apply for patches that are applied with fuzz

Yes, it turned out that Mac patch tool was not complaining, so I installed brew install gpatch and could reproduce. Thanks for figuring it out, I fixed rest of the fuzz. Should be now ok, but lets see.

@bungle bungle force-pushed the chore/openresty-1.21.4.2 branch 2 times, most recently from 96d427a to 6fc0902 Compare August 10, 2023 07:08
@fffonion
Copy link
Contributor

looks like a cache expiry, rerunning the all tests again.

@fffonion
Copy link
Contributor

spec/02-integration/05-proxy/10-balancer/01-healthchecks_spec.lua:566: mTLS #postgres create active health checks -- global certificate
./spec/fixtures/balancer_utils.lua:442: timed out waiting for notlocalhost.test:15555 in d3f4d3b2-740b-420e-9aad-38de71c949e0 to become UNHEALTHY

stack traceback:
	./spec/fixtures/balancer_utils.lua:442: in function 'poll_wait_health'
	...ntegration/05-proxy/10-balancer/01-healthchecks_spec.lua:596: in function <...ntegration/05-proxy/10-balancer/01-healthchecks_spec.lua:566>

this fails in both psql and dbless, seems not a flaky one

@fffonion
Copy link
Contributor

fffonion commented Sep 5, 2023

@bungle The above error is because lua-resty-healthcheck uses sock:tlshandshake that is from our patch but is removed in this PR. Is this intentional and should we update lua-resty-healthcheck to use the new API or add the cosocket-mtls patch back?

@bungle
Copy link
Member Author

bungle commented Sep 5, 2023

@bungle The above error is because lua-resty-healthcheck uses sock:tlshandshake that is from our patch but is removed in this PR. Is this intentional and should we update lua-resty-healthcheck to use the new API or add the cosocket-mtls patch back?

@fffonion good catch! I tried to search for tlshandshake but didn't find anything, so I think it would be best to update lua-resty-healthcheck to use sslhandshake / setclientcert.

I made a PR:
Kong/lua-resty-healthcheck#133

### Summary

* Feature: Added support for https_sni [#49](Kong/lua-resty-healthcheck#49) (backport)
* Fix: Use OpenResty API for mTLS [#99](Kong/lua-resty-healthcheck#99) (backport)

Signed-off-by: Aapo Talvensaari <aapo.talvensaari@gmail.com>
### Summary

See: https://openresty.org/en/ann-1021004002.html

Signed-off-by: Aapo Talvensaari <aapo.talvensaari@gmail.com>
@github-actions github-actions bot removed the changelog label Sep 6, 2023
@bungle bungle merged commit 0408346 into master Sep 6, 2023
25 checks passed
@bungle bungle deleted the chore/openresty-1.21.4.2 branch September 6, 2023 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants