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

Remove unnecessary JSON patches; fixes strategicMergePatch for tolerations #1478

Merged
merged 5 commits into from
Jan 19, 2021

Conversation

realshuting
Copy link
Member

@realshuting realshuting commented Jan 15, 2021

Signed-off-by: Shuting Zhao shutting06@gmail.com

Fixes #1216.
Fixes #1339.
Fixes #1419.

Signed-off-by: Shuting Zhao <shutting06@gmail.com>
@realshuting realshuting added wip work in progress and removed wip work in progress labels Jan 15, 2021
Signed-off-by: Shuting Zhao <shutting06@gmail.com>
Signed-off-by: Shuting Zhao <shutting06@gmail.com>
@realshuting realshuting changed the title Remove unnecessary JSON patches Remove unnecessary JSON patches; fixes strategicMergePatch for tolerations Jan 16, 2021
@JimBugwadia
Copy link
Member

@realshuting - does this also cover this issue? #1419

If so, do we have test coverage of it.

@realshuting
Copy link
Member Author

@realshuting - does this also cover this issue? #1419

If so, do we have test coverage of it.

It removes the nil patches, and I only see the log message once when creating the cronJob.

Tests are covered here.

Copy link
Member

@JimBugwadia JimBugwadia left a comment

Choose a reason for hiding this comment

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

please see comments / questions..

pkg/engine/mutate/patchesUtils.go Outdated Show resolved Hide resolved
pkg/engine/mutate/patchesUtils.go Outdated Show resolved Hide resolved
pkg/engine/mutate/patchesUtils.go Show resolved Hide resolved
Signed-off-by: Shuting Zhao <shutting06@gmail.com>
Copy link
Member

@JimBugwadia JimBugwadia left a comment

Choose a reason for hiding this comment

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

minor comments

pkg/engine/mutate/patchesUtils.go Outdated Show resolved Hide resolved
pkg/engine/mutate/patchesUtils.go Outdated Show resolved Hide resolved
Signed-off-by: Shuting Zhao <shutting06@gmail.com>
@realshuting realshuting merged commit 3bc3869 into kyverno:main Jan 19, 2021
@realshuting realshuting deleted the 1216_remove_additional_patches branch January 20, 2021 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants