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

v1.17: Stops pushing legacy snapshot hashes to crds (backport of #33576) #33581

Merged
merged 1 commit into from
Oct 10, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 7, 2023

This is an automatic backport of pull request #33576 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@brooksprumo
Copy link
Contributor

I really should've had this in master before the v1.17 branch was cut, but I forgot about it...

Anyway, this remove legacy snapshot hashes that is only used by v1.14. Since v1.17 will only co-exist with v1.16 and not v1.14, we're all good.

Please refer to the original PR, and its linked Issue for more context/background. This comment may also be helpful: #33576 (comment)

@brooksprumo
Copy link
Contributor

brooksprumo commented Oct 7, 2023

(Update: all good)

This PR is blocked until #33573 is merged.

channel version check | 2s
-- | --
  | latest channel tag: v1.17.1
  | current version: v1.17.1
  | Error: A release has been tagged since your feature branch was last rebased. <current version> must be greater than <latest channel tag>..
  | Possible solutions (in the order they should be tried):
  | 1. rebase your feature branch on the base branch
  | 2. merge the PR: "Bump Version to ..." once it has passed ci/checks, then rebase
  | 3. ask for help in #devops on discord
  | 🚨 Error: The command exited with status 1

@brooksprumo
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Oct 7, 2023

rebase

✅ Branch has been successfully rebased

@brooksprumo brooksprumo force-pushed the mergify/bp/v1.17/pr-33576 branch from cb668e3 to 46832bb Compare October 7, 2023 18:40
@brooksprumo brooksprumo requested a review from willhickey October 7, 2023 19:25
@codecov
Copy link

codecov bot commented Oct 7, 2023

Codecov Report

Merging #33581 (46832bb) into v1.17 (542b53e) will decrease coverage by 0.1%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##            v1.17   #33581     +/-   ##
=========================================
- Coverage    81.8%    81.7%   -0.1%     
=========================================
  Files         804      804             
  Lines      217987   217964     -23     
=========================================
- Hits       178319   178259     -60     
- Misses      39668    39705     +37     

Copy link
Contributor

@willhickey willhickey left a comment

Choose a reason for hiding this comment

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

This is fine for v1.17

@brooksprumo brooksprumo merged commit c45c9dc into v1.17 Oct 10, 2023
16 checks passed
@brooksprumo brooksprumo deleted the mergify/bp/v1.17/pr-33576 branch October 10, 2023 15: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.

2 participants