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

Preserve system annotations and labels during object update #568

Merged
merged 12 commits into from
Dec 13, 2024

Conversation

linyguo
Copy link
Contributor

@linyguo linyguo commented Nov 22, 2024

Fix #561
Fix #564 together

@linyguo linyguo force-pushed the users/lingyun/annotation branch from 366ab5f to 9e7725f Compare November 27, 2024 08:15
@linyguo linyguo changed the title Preserve system annotations during object update Preserve system annotations and labels during object update Dec 5, 2024
@linyguo linyguo force-pushed the users/lingyun/annotation branch from fbba5cb to 193d02d Compare December 9, 2024 07:09
msftcoderdjw
msftcoderdjw previously approved these changes Dec 10, 2024
Copy link
Contributor

@msftcoderdjw msftcoderdjw left a comment

Choose a reason for hiding this comment

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

Discussed with @RemindD before merging, still have some comments. @RemindD please post your comment here.

@msftcoderdjw msftcoderdjw dismissed their stale review December 10, 2024 07:33

Discussed with @RemindD before merging, still have some comments. @RemindD please post your comment here.

provider change detection change; Helm provider tag change (eclipse-symphony#575)

* provider change detection change; Helm provider tag change

* fix change state bug

* add version for helm

* remove no use code

---------

Co-authored-by: Haishi Bai <hbai@microsoft.com>
Co-authored-by: Jiawei Du <59427055+msftcoderdjw@users.noreply.github.com>

catalog sample fix with portal adjustment to new schema (eclipse-symphony#581)

fix retail scenario docs (eclipse-symphony#582)

fix eclipse-symphony#550 by allow the job to be requeued (eclipse-symphony#578)

Co-authored-by: Jiawei Du <59427055+msftcoderdjw@users.noreply.github.com>

update etag and test

fix ut

fix ut
@linyguo linyguo force-pushed the users/lingyun/annotation branch from 8dbcbcb to 6ce5ae7 Compare December 12, 2024 08:41
@msftcoderdjw msftcoderdjw merged commit fc3328f into eclipse-symphony:main Dec 13, 2024
5 of 6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants