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

feat(patch) patch nginx to support stream upstream ssl function #582

Merged
merged 7 commits into from
Jan 3, 2023

Conversation

oowl
Copy link
Member

@oowl oowl commented Nov 2, 2022

patch Nginx code to support stream upstream SSL function
FTI-1479

@chronolaw
Copy link
Contributor

Do we need to maintain OpenResty 1.19.x now ?

@oowl oowl force-pushed the stream-upstream-tls branch 2 times, most recently from a6185f7 to 0c372a3 Compare December 12, 2022 03:16
@oowl oowl force-pushed the stream-upstream-tls branch from 0c372a3 to 20e1e82 Compare December 12, 2022 03:34
@oowl
Copy link
Member Author

oowl commented Dec 12, 2022

@chronolaw I also think this may cause compatibility issues, and I can remove the if kong don't need it

@oowl oowl force-pushed the stream-upstream-tls branch from 8c37a95 to d08c26d Compare December 12, 2022 16:32
@catbro666
Copy link
Contributor

LGTM.

@kikito
Copy link
Member

kikito commented Dec 21, 2022

Do we need to maintain OpenResty 1.19.x now ?

@hbagdi or @dndx , could you answer this one?

@dndx
Copy link
Member

dndx commented Dec 22, 2022

We do not need to support 1.19 for this feature. Suggest remove it.

@dndx dndx assigned chronolaw and unassigned fffonion Dec 22, 2022
@chronolaw
Copy link
Contributor

I checked the patch of 1.21.4.1, LGTM.

@bungle
Copy link
Member

bungle commented Dec 23, 2022

@attenuation Can you please remove 1.19 patches as mentioned by @dndx:
#582 (comment)

@oowl
Copy link
Member Author

oowl commented Dec 26, 2022

@bungle done

@fffonion
Copy link
Contributor

fffonion commented Jan 3, 2023

relying on Kong/kong#9947 to assure patch's validality

@fffonion fffonion enabled auto-merge (squash) January 3, 2023 06:28
@fffonion fffonion merged commit 8ffea65 into master Jan 3, 2023
@fffonion fffonion deleted the stream-upstream-tls branch January 3, 2023 22:47
@@ -150,7 +150,7 @@ pipeline {
environment {
GITHUB_SSH_KEY = credentials('github_bot_ssh_key')
PATH = "/home/ubuntu/bin/:${env.PATH}"
KONG_SOURCE = "3.0.0.0"
KONG_SOURCE = "master"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was this done? what purpose does this serve? did you understand the intent previously before you changed this or did you just change this to "make it work?"

We now have two stages that run against Kong EE master and none that run against 3.0.0.0 so we no longer have a backwards compatibility CI check. If we no longer care about backwards compatibility why not remove the entire check instead of run kong-ee@master twice?

Copy link
Contributor

@fffonion fffonion Jan 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "backward compat" is testing a behaviour introduced by a bug,
kbt is not pinned correctly https://github.com/Kong/kong-ee/pull/4238/files and always pointing to master. So I don't
understand what are we testing here to use the master branch of this
repo against 3.0.0.0; unless we intended to always build 3.0.0.0 with master kbt.
I saw a commit and PR (#622)
that doesn't tell me anything why it's being added, without knowing why
it was there, i'm not feeling comfortable to just remove it but instead make it pass. That being said, i'm okay to just remove this.

Patches will stay in kong/kong-ee repo in the future, hopefully at that time we don't need to try 5 different places to correctly bump/pin a dependency.

@oowl
Copy link
Member Author

oowl commented Jan 14, 2023

relying on Kong/kong#9947 to assure patch's validality

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants