Skip to content

clustermesh: fix MCS-API need update CRD#44738

Merged
MrFreezeex merged 3 commits intocilium:mainfrom
MrFreezeex:fix-mcs-api-crd-updates
Mar 16, 2026
Merged

clustermesh: fix MCS-API need update CRD#44738
MrFreezeex merged 3 commits intocilium:mainfrom
MrFreezeex:fix-mcs-api-crd-updates

Conversation

@MrFreezeex
Copy link
Copy Markdown
Member

@MrFreezeex MrFreezeex commented Mar 11, 2026

The two first commits are mainly cleanups, the real bugfix is on the third commit

clustermesh: fix a bug in the MCS-API CRD installl that could attempt a CRD downgrade when the version label is higher

@MrFreezeex MrFreezeex added release-note/bug This PR fixes an issue in a previous release of Cilium. area/clustermesh Relates to multi-cluster routing functionality in Cilium. needs-backport/1.19 This PR / issue needs backporting to the v1.19 branch labels Mar 11, 2026
@MrFreezeex
Copy link
Copy Markdown
Member Author

/test

@MrFreezeex MrFreezeex marked this pull request as ready for review March 11, 2026 21:36
@MrFreezeex MrFreezeex requested a review from a team as a code owner March 11, 2026 21:36
@MrFreezeex MrFreezeex requested a review from giorio94 March 11, 2026 21:36
@cilium-ariane
Copy link
Copy Markdown

cilium-ariane bot commented Mar 11, 2026

/test

@MrFreezeex MrFreezeex force-pushed the fix-mcs-api-crd-updates branch from 044beab to 6f4f676 Compare March 11, 2026 23:16
@MrFreezeex
Copy link
Copy Markdown
Member Author

/test

@MrFreezeex MrFreezeex force-pushed the fix-mcs-api-crd-updates branch from 6f4f676 to d4e6819 Compare March 11, 2026 23:24
@MrFreezeex
Copy link
Copy Markdown
Member Author

/test

1 similar comment
@cilium-ariane
Copy link
Copy Markdown

cilium-ariane bot commented Mar 11, 2026

/test

@MrFreezeex MrFreezeex force-pushed the fix-mcs-api-crd-updates branch from d4e6819 to 32df665 Compare March 12, 2026 18:08
@MrFreezeex MrFreezeex requested a review from a team as a code owner March 12, 2026 18:08
@MrFreezeex MrFreezeex requested a review from joamaki March 12, 2026 18:08
@MrFreezeex MrFreezeex force-pushed the fix-mcs-api-crd-updates branch from 32df665 to c6bab53 Compare March 12, 2026 18:27
@MrFreezeex MrFreezeex changed the title clustermesh: fix inverted arg in CRD update check clustermesh: fix MCS-API need update CRD Mar 12, 2026
@MrFreezeex
Copy link
Copy Markdown
Member Author

/test

@MrFreezeex MrFreezeex requested a review from giorio94 March 12, 2026 18:31
@cilium-ariane
Copy link
Copy Markdown

cilium-ariane bot commented Mar 12, 2026

/test

Try to make this function a bit more readable by always adding the
current/target prefix depending on what CRD we are reading the info
from.

Signed-off-by: Arthur Outhenin-Chalandre <git@mrfreezeex.fr>
Everything calls the interface with the inverted arg as what was
currently declared here.

Signed-off-by: Arthur Outhenin-Chalandre <git@mrfreezeex.fr>
The MCS-API CRDs version label is supposed to increase while the schema
version is reset on each version label upgrade.

The previous version of this function was not stopping if the version label was
higher and continued to check if the schema revision was higher or not.
We also add new tests for this function to ensure that the behavior is
correct.

This commit also adapt the schema revision for the updated code style of
the version check while not changing the underlying logic.

Signed-off-by: Arthur Outhenin-Chalandre <git@mrfreezeex.fr>
@MrFreezeex MrFreezeex force-pushed the fix-mcs-api-crd-updates branch from c6bab53 to 557bc47 Compare March 12, 2026 23:34
@MrFreezeex
Copy link
Copy Markdown
Member Author

/test

1 similar comment
@cilium-ariane
Copy link
Copy Markdown

cilium-ariane bot commented Mar 12, 2026

/test

Copy link
Copy Markdown
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

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

Thanks!

@MrFreezeex MrFreezeex enabled auto-merge March 13, 2026 15:34
@MrFreezeex MrFreezeex added this pull request to the merge queue Mar 16, 2026
@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Mar 16, 2026
Merged via the queue into cilium:main with commit dd16dab Mar 16, 2026
78 of 79 checks passed
@MrFreezeex MrFreezeex deleted the fix-mcs-api-crd-updates branch March 16, 2026 16:04
@smagnani96 smagnani96 mentioned this pull request Mar 16, 2026
10 tasks
@smagnani96 smagnani96 added backport-pending/1.19 The backport for Cilium 1.19.x for this PR is in progress. and removed needs-backport/1.19 This PR / issue needs backporting to the v1.19 branch labels Mar 16, 2026
@github-actions github-actions bot added backport-done/1.19 The backport for Cilium 1.19.x for this PR is done. and removed backport-pending/1.19 The backport for Cilium 1.19.x for this PR is in progress. labels Mar 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/clustermesh Relates to multi-cluster routing functionality in Cilium. backport-done/1.19 The backport for Cilium 1.19.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants