Repository navigation
[Backport release-1.6] feat(etcd-operator): bump to v0.5.5 and vendor EtcdDefragPolicy CRDs - #4151
Merged
Conversation
Author
|
Please cherry-pick the changes locally and resolve any conflicts. git fetch origin backport-3968-to-release-1.6
git worktree add --checkout .worktree/backport-3968-to-release-1.6 backport-3968-to-release-1.6
cd .worktree/backport-3968-to-release-1.6
git reset --hard HEAD^
git cherry-pick -x 85cbb3d7cbed73d959e011e8448c1ba20dada432 5896484c4a29467594798d128ba42766046a6cef 6afe69b35b2c90f02fd601ccf16d253af85ab5f9
git push --force-with-lease |
1 task done
v0.5.5 ships the EtcdDefrag and EtcdDefragPolicy API types (a controller plus a cron that stamps scheduled defrag runs). Vendor both CRDs into the etcd-operator-crds package and grant the manager ClusterRole the verbs the new controllers need: defragpolicies read/patch, defrags full CRUD, the two new /status subresources, and cluster-scoped event emission. Backport of #3968 to release-1.6. The automatic cherry-pick could not merge the etcd-operator-crds Makefile and left the conflict markers in the file; resolved by taking the five-CRD list the two new CRDs require. The comment that came with it on main describes an update target that counts annotations and swaps templates/ atomically — this branch has neither, so it is left out rather than carried in as a false description. Everything else applied unchanged. Signed-off-by: Andrey Kolkov <[email protected]> Signed-off-by: Andrei Kvapil <[email protected]>
Andrei Kvapil (kvaps)
force-pushed
the
backport-3968-to-release-1.6
branch
from
September 7, 2026 22:13
002e6f9 to
cf9c77d
Compare
github-actions
Bot
added
area/release
Andrei Kvapil (kvaps)
approved these changes
Sep 7, 2026
Andrei Kvapil (kvaps)
left a comment
Andrei Kvapil (kvaps)
left a comment
Member
There was a problem hiding this comment.
Backport verified against release-1.6.
The automatic cherry-pick left conflict markers in packages/system/etcd-operator-crds/Makefile and produced a commit with no message and no sign-off. Rewritten: markers resolved to the five-CRD list the two new CRDs require, original commit message and authorship restored, sign-offs added.
The comment that accompanies that line on main was deliberately left out — it describes an update target that counts annotations and swaps templates/ atomically, and this branch has neither.
Diff against release-1.6 is now the intended backport and nothing else; helm unittest passes for both touched packages (18 tests).
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.
Description
Backport of #3968 to
release-1.6.