Update stable branching instructions for v1.20 - #415
Draft
joestringer wants to merge 13 commits into
Draft
Conversation
joestringer
force-pushed
the
pr/joe/v1.20-feedback
branch
from
July 10, 2026 23:49
dbbe081 to
fd5e94b
Compare
joestringer
commented
Jul 14, 2026
Comment on lines
+104
to
+108
| - [ ] Create a commit to update the release notes in preparation for the | ||
| upcoming stable and main branch development. | ||
| - `git mv Documentation/operations/upgrade-{next,current}.rst` | ||
| - `git cp Documentation/operations/upgrade-{template.txt,next.rst}` | ||
| - `git commit -sam "Prepare for vX.Y branch"` |
joestringer
force-pushed
the
pr/joe/v1.20-feedback
branch
from
July 14, 2026 23:10
667ce28 to
d5426bf
Compare
The branch preparation commits end up with hundreds of thousands of lines of deletions across the workflows and CLI removal steps, which can be hard to review through the GitHub UI due to the sheer scale of the changes. None of these are particularly interesting for deep review, so it's easier if we split the file cleanup steps out from the workflow modifications. Document the branch name creation and how to create separate commits for the cleanup commits. Signed-off-by: Joe Stringer <joe@cilium.io>
The unnecessary GitHub workflows are deleted in a later step, delete that note earlier in the instructions. Other steps can be combined for easier execution during the creation of the branch. While we're at it, indent some text to format it correctly. No functional changes to the instructions in this commit. Signed-off-by: Joe Stringer <joe@cilium.io>
Many of the changes to workflows consist of a simple branch substitution from the previous stable branch to the current stable branch. Ignore these using `git diff --ignore-matching-lines`. Signed-off-by: Joe Stringer <joe@cilium.io>
The previous step just greps for affected files, this adds an explicit prompt for the release manager to open the files and make changes. The expected pattern is to find every instance of the previous stable branch, and then add the new stable branch as another item in those target lists. Signed-off-by: Joe Stringer <joe@cilium.io>
This makes the step clear for when to create the custom branch, and gives it a consistent name that can be potentially referred to later in the instructions. The instructions do not currently refer to this branch name. Signed-off-by: Joe Stringer <joe@cilium.io>
Add instructions to prepare the CI image build workflow for the stable branch, according to the way that it's currently expected to work. Signed-off-by: Joe Stringer <joe@cilium.io>
During the v1.20 stable branch preparation, we encountered constant issues where the stable branch PR fell out of date (and conflicted) compared to the workflows on main. Therefore I think it's better for us to grant only case-by-case exception to feature freeze for CI work rather than a general exemption, in order to more closely coordinate with the release managers. Signed-off-by: Joe Stringer <joe@cilium.io>
The logout would fail with fatal error:
please provide a registry to log out from
Fix it by specifying the registry to log out from, similar to the login.
Signed-off-by: Joe Stringer <joe@cilium.io>
Ariane was refusing to trigger CI builds because of a missing dependency, which is specified in the Ariane config on the branch. Signed-off-by: Joe Stringer <joe@cilium.io>
When the branch is actually created, there may be various PRs in flight that need their labels updated to ensure that fixes land into the stable branch as expected. We can proactively apply these labels to reduce the likelihood that we inadvertently miss some fixes in the final release. Signed-off-by: Joe Stringer <joe@cilium.io>
This pattern ensures that both 'main' and the next stable release have a consistent view of the "upgrade-current.md" release notes file, which means that it is easier to backport changes to these notes that happen after the stable branch creation. At the same time, developers can begin documenting new functionality in the newly created "upgrade-next.md" file, keeping those release notes separate from the ones in the stable release. A subsequent step could remove the "upgrade-current.md" file from main, or alternatively we can just keep it there for the whole following development cycle and only move it around at the next branch creation. Signed-off-by: Joe Stringer <joe@cilium.io>
joestringer
force-pushed
the
pr/joe/v1.20-feedback
branch
from
July 14, 2026 23:12
d5426bf to
05baf86
Compare
This was referenced Jul 14, 2026
During branch setup we should also update the code that scrapes the stable branches for CI workflow results. Signed-off-by: Joe Stringer <joe@cilium.io>
This is taken care of in the feature (minor) release process. Signed-off-by: Joe Stringer <joe@cilium.io>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update the RC / branching instructions to include all the new and changed
steps performed while preparing the v1.20 stable branch.
Review commit by commit.