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(*) prepare 3.2.3 patch release #6346

Merged
merged 4 commits into from
Jul 24, 2024
Merged

Conversation

rainest
Copy link
Contributor

@rainest rainest commented Jul 23, 2024

What this PR does / why we need it:

3.2.3 for cross-namespace plugin ref fix. Also includes an internal perf fix cause why not.

Special notes for your reviewer:

Release issue #6344

Kong/docs.konghq.com#7578 for the associated doc FWIW.

Changelog to main with backport at #6345

@rainest rainest requested a review from a team as a code owner July 23, 2024 23:52
@rainest rainest enabled auto-merge (rebase) July 23, 2024 23:52
@rainest rainest force-pushed the prepare-release/3.2.3 branch from 35b20ba to 2b27f2b Compare July 24, 2024 01:47
randmonkey and others added 4 commits July 23, 2024 19:07
Fix the plugin reference check. This was originally providing reference
information backwards of how the reference check functions expected it.

Add util function TypeMetaFromGVK.

Add unit tests for plugin reference checks.
* chore(*) create logging package

Move log utilities out of util into their own package, to avoid import
cycles.

* chore(*) update generator and re-generate code

---------

Co-authored-by: Travis Raines <[email protected]>
Add trace logs for ReferenceGrant checks.

Add comments for ReferenceGrant utilities.

Consolidate duplicated utility function.
Convert some logs to use the logging package. These lines were moved
elsewhere in a feature commit in main, so they weren't updated by
6dd9031 in the 3.2.x branch.
@rainest rainest force-pushed the prepare-release/3.2.3 branch from 2b27f2b to 36b9265 Compare July 24, 2024 02:07
@pmalek
Copy link
Member

pmalek commented Jul 24, 2024

Any reason to not cherry pick each commit 1 by 1 and creating separate PRs for easier history inspection in the future?

@rainest
Copy link
Contributor Author

rainest commented Jul 24, 2024

Any reason to not cherry pick each commit 1 by 1 and creating separate PRs for easier history inspection in the future?

Extra reviews and maybe merge conflicts depending on the order (not in this case though).

What workflow/history review would need them separate? As long as we rebase merge the commits remain separate, so AFAIK all we lose is the title indication we'd get if we squashed and retitled to include the PR. Origin PR is still available in the click-through view (e.g. 641c73c has no title, but still lists it in the Github metadata), which IMO is good enough for something we probably don't check that often.

@pmalek
Copy link
Member

pmalek commented Jul 24, 2024

Extra reviews and maybe merge conflicts depending on the order (not in this case though).

I see extra reviews as a good thing rather than a problem since there's more opportunities to spot a potential issue ( even though such a thing shouldn't happen with simple cherry picking).

Conflicts shouldn't arise either if the patches are applied in chronological order.

What workflow/history review would need them separate? As long as we rebase merge the commits remain separate, so AFAIK all we lose is the title indication we'd get if we squashed and retitled to include the PR. Origin PR is still available in the click-through view (e.g. 641c73c has no title, but still lists it in the Github metadata), which IMO is good enough for something we probably don't check that often.

GitHub's UI to review each commit from a PR somewhat works but comments from each of them is bound in a weird way which makes tracing back the commented commit hard.


I do see this as a shortcut which can save some review back and forth but at the same time it can make error slipping through the review cracks easier.

CHANGELOG.md Show resolved Hide resolved
@pmalek pmalek added this to the KIC v3.2.x milestone Jul 24, 2024
@rainest rainest merged commit aa84635 into release/3.2.x Jul 24, 2024
36 checks passed
@rainest rainest deleted the prepare-release/3.2.3 branch July 24, 2024 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants