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

Backport Kuma updates to 0.39 #1017

Merged
merged 5 commits into from
Mar 29, 2024
Merged

Backport Kuma updates to 0.39 #1017

merged 5 commits into from
Mar 29, 2024

Conversation

rainest
Copy link
Contributor

@rainest rainest commented Mar 27, 2024

Backport fe761fa and 7816472 to 0.39 and release 0.39.2.

Update CI to test on PRs to release branches. Update license handling for this release branch.


KIC 2.12 is able to pass E2E with this in place: Kong/kubernetes-ingress-controller#5760 (comment)


This technically breaks semver, but we don't really have anywhere else to stuff it. Maybe you can call the addon not supporting version args and not supporting 2.6 "bugs" for the sake of discussion 🤷

Updating KIC 2.x to use the latest KTF causes all sorts of conflicts due to dependency hell with packages that both KTF and KIC import. We don't have a compelling need to actually update those in 2.x, so trying to make a backported KTF version that can run Kuma tests without pulling updates is much simpler.

@randmonkey can you confirm the exact nature of the Kuma failures? Was it just that it was trying to use latest without the 2.6 fix? IDK if we'd also need to pin the Kuma version in the 2.x KIC tests after this.

Co-authored-by: Jakub Warczarek <jakub.warczarek@konghq.com>
@codecov-commenter
Copy link

codecov-commenter commented Mar 27, 2024

Codecov Report

Attention: Patch coverage is 47.36842% with 10 lines in your changes are missing coverage. Please review.

Project coverage is 59.84%. Comparing base (0389356) to head (481e0ba).

Files Patch % Lines
pkg/clusters/addons/kuma/addon.go 46.66% 6 Missing and 2 partials ⚠️
pkg/clusters/addons/kuma/builder.go 0.00% 1 Missing ⚠️
pkg/environments/builder.go 0.00% 1 Missing ⚠️
Additional details and impacted files
@@                Coverage Diff                 @@
##           release/0.39.x    #1017      +/-   ##
==================================================
- Coverage           59.88%   59.84%   -0.05%     
==================================================
  Files                  48       48              
  Lines                3914     3925      +11     
==================================================
+ Hits                 2344     2349       +5     
- Misses               1275     1279       +4     
- Partials              295      297       +2     
Flag Coverage Δ
integration-test 59.84% <47.36%> (-0.05%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rainest rainest changed the base branch from main to release/0.39.x March 27, 2024 20:31
@randmonkey
Copy link
Contributor

According to @czeslavo discovered, After we add the allowAllTrafficPermission settings, the test could pass with kuma 2.6.x. But we still need to configure the version in the kuma addon, otherwise KTF cannot recognize the version thus it will not add the settings.

randmonkey
randmonkey previously approved these changes Mar 29, 2024
@czeslavo czeslavo merged commit e87868f into release/0.39.x Mar 29, 2024
37 checks passed
@czeslavo czeslavo deleted the chore/backport-kuma branch March 29, 2024 08:52
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.

4 participants