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

vcluster config convert statefulSet.affinity bugfix #2329

Merged
merged 4 commits into from
Dec 18, 2024

Conversation

hidalgopl
Copy link
Contributor

What issue type does this pull request address? (keep at least one, remove the others)
/kind bugfix

What does this pull request do? Which issues does it resolve? (use resolves #<issue_number> if possible)
resolves ENG-5301

Please provide a short message that should be published in the vcluster release notes
Fixed an issue where vcluster convert config skipped statefulset affinity rules

What else do we need to know?

Signed-off-by: Paweł Bojanowski <[email protected]>
@hidalgopl hidalgopl marked this pull request as draft December 13, 2024 10:41
Copy link

netlify bot commented Dec 13, 2024

Deploy Preview for vcluster-docs canceled.

Built without sensitive environment variables

Name Link
🔨 Latest commit 909d123
🔍 Latest deploy log https://app.netlify.com/sites/vcluster-docs/deploys/67628c083de3990008c59139

… prune ephemeral-storage null values

Signed-off-by: Paweł Bojanowski <[email protected]>
@hidalgopl hidalgopl marked this pull request as ready for review December 13, 2024 13:01
@hidalgopl hidalgopl requested review from a team December 13, 2024 13:02
config/diff.go Outdated Show resolved Hide resolved
config/diff.go Outdated Show resolved Hide resolved
Signed-off-by: Paweł Bojanowski <[email protected]>
Copy link
Member

@FabianKramm FabianKramm left a comment

Choose a reason for hiding this comment

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

See comments above

@FabianKramm FabianKramm merged commit b4baae9 into loft-sh:main Dec 18, 2024
61 checks passed
loft-bot pushed a commit that referenced this pull request Dec 18, 2024
* add test case reproducing convert bug

Signed-off-by: Paweł Bojanowski <[email protected]>

* fix vcluster config convert overwritting statefulSet affinity; do not prune ephemeral-storage null values

Signed-off-by: Paweł Bojanowski <[email protected]>

* do not prune default null values

Signed-off-by: Paweł Bojanowski <[email protected]>

* prune keys for empty maps etc. but keep them for null values

Signed-off-by: Paweł Bojanowski <[email protected]>

---------

Signed-off-by: Paweł Bojanowski <[email protected]>
(cherry picked from commit b4baae9)
loft-bot pushed a commit that referenced this pull request Dec 18, 2024
* add test case reproducing convert bug

Signed-off-by: Paweł Bojanowski <[email protected]>

* fix vcluster config convert overwritting statefulSet affinity; do not prune ephemeral-storage null values

Signed-off-by: Paweł Bojanowski <[email protected]>

* do not prune default null values

Signed-off-by: Paweł Bojanowski <[email protected]>

* prune keys for empty maps etc. but keep them for null values

Signed-off-by: Paweł Bojanowski <[email protected]>

---------

Signed-off-by: Paweł Bojanowski <[email protected]>
(cherry picked from commit b4baae9)
@loft-bot
Copy link

💔 Some backports could not be created

Status Branch Result
v0.20 Backport failed because of merge conflicts
v0.21
v0.22

Manual backport

To create the backport manually run:

backport --pr 2329

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

hidalgopl added a commit to hidalgopl/vcluster that referenced this pull request Dec 18, 2024
* add test case reproducing convert bug

Signed-off-by: Paweł Bojanowski <[email protected]>

* fix vcluster config convert overwritting statefulSet affinity; do not prune ephemeral-storage null values

Signed-off-by: Paweł Bojanowski <[email protected]>

* do not prune default null values

Signed-off-by: Paweł Bojanowski <[email protected]>

* prune keys for empty maps etc. but keep them for null values

Signed-off-by: Paweł Bojanowski <[email protected]>

---------

Signed-off-by: Paweł Bojanowski <[email protected]>
FabianKramm pushed a commit that referenced this pull request Dec 18, 2024
* add test case reproducing convert bug



* fix vcluster config convert overwritting statefulSet affinity; do not prune ephemeral-storage null values



* do not prune default null values



* prune keys for empty maps etc. but keep them for null values



---------

Signed-off-by: Paweł Bojanowski <[email protected]>
FabianKramm pushed a commit that referenced this pull request Dec 19, 2024
* add test case reproducing convert bug

Signed-off-by: Paweł Bojanowski <[email protected]>

* fix vcluster config convert overwritting statefulSet affinity; do not prune ephemeral-storage null values

Signed-off-by: Paweł Bojanowski <[email protected]>

* do not prune default null values

Signed-off-by: Paweł Bojanowski <[email protected]>

* prune keys for empty maps etc. but keep them for null values

Signed-off-by: Paweł Bojanowski <[email protected]>

---------

Signed-off-by: Paweł Bojanowski <[email protected]>
(cherry picked from commit b4baae9)

Co-authored-by: Paweł Bojanowski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants