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

Prepare release/3.1.4 #5920

Merged
merged 2 commits into from
Apr 26, 2024
Merged

Prepare release/3.1.4 #5920

merged 2 commits into from
Apr 26, 2024

Conversation

randmonkey
Copy link
Contributor

What this PR does / why we need it:

Prepare for release 3.1.4, update CHANGELOG.

Which issue this PR fixes:

Part of #5911

Special notes for your reviewer:

PR Readiness Checklist:

Complete these before marking the PR as ready to review:

  • the CHANGELOG.md release notes have been updated to reflect any significant (and particularly user-facing) changes introduced by this PR

Copy link

codecov bot commented Apr 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (release/3.1.x@26abd3e). Click here to learn what that means.

Additional details and impacted files
@@               Coverage Diff               @@
##             release/3.1.x   #5920   +/-   ##
===============================================
  Coverage                 ?   72.0%           
===============================================
  Files                    ?     176           
  Lines                    ?   18306           
  Branches                 ?       0           
===============================================
  Hits                     ?   13183           
  Misses                   ?    4157           
  Partials                 ?     966           

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

@randmonkey randmonkey added the ci/run-e2e Trigger e2e test run from PR label Apr 25, 2024
@team-k8s-bot
Copy link
Collaborator

E2E (targeted) tests with KIND-based clusters were started at https:/Kong/kubernetes-ingress-controller/actions/runs/8829399670

@team-k8s-bot team-k8s-bot removed the ci/run-e2e Trigger e2e test run from PR label Apr 25, 2024
pmalek
pmalek previously approved these changes Apr 26, 2024
@pmalek
Copy link
Member

pmalek commented Apr 26, 2024

Shouldn't this target main branch instead of the release branch?

@randmonkey
Copy link
Contributor Author

randmonkey commented Apr 26, 2024

Shouldn't this target main branch instead of the release branch?

This does not include the entries that are not included in 3.1.x branch. Also, there are fixes that are specific to 3.1.x (bump golnag patch and x/net,protobuf packages).
Since the CHANGELOG is diverged in release/x.x.x and main, Can we fix changelogs in main after 3.1.4 released?

@pmalek
Copy link
Member

pmalek commented Apr 26, 2024

Since the CHANGELOG is diverged in release/x.x.x and main, Can we fix changelogs in main after 3.1.4 released?

We can do it this way 👍 I thought we aimed at maintaining the CHANGELOG only in main 🤔

@randmonkey randmonkey merged commit ebae7a5 into release/3.1.x Apr 26, 2024
35 checks passed
@randmonkey randmonkey deleted the prepare-release/3.1.4 branch April 26, 2024 12:53
@rainest rainest restored the prepare-release/3.1.4 branch April 26, 2024 20:49
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.

3 participants