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.

Sign up for GitHub

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

Jump to bottom

[release-1.12 CP] Issue #6728: support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers #7049

Merged
merged 5 commits into from
Nov 17, 2023

Merge branch 'release-1.12' into cherry-pick-6917

5c44ed4
Select commit
Loading
Failed to load commit list.
Merged

[release-1.12 CP] Issue #6728: support JSON Merge Patch and Strategic Merge Patch in Resource Modifiers #7049

Merge branch 'release-1.12' into cherry-pick-6917
5c44ed4
Select commit
Loading
Failed to load commit list.
Codecov / codecov/patch succeeded Nov 17, 2023 in 0s

63.03% of diff hit (target 60.64%)

View this Pull Request on Codecov

63.03% of diff hit (target 60.64%)

Annotations

Check warning on line 24 in internal/resourcemodifiers/json_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/json_merge_patch.go#L23-L24 

Added lines #L23 - L24 were not covered by tests

Check warning on line 35 in internal/resourcemodifiers/json_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/json_merge_patch.go#L34-L35 

Added lines #L34 - L35 were not covered by tests

Check warning on line 42 in internal/resourcemodifiers/json_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/json_merge_patch.go#L41-L42 

Added lines #L41 - L42 were not covered by tests

Check warning on line 62 in internal/resourcemodifiers/json_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/json_patch.go#L62 

Added line #L62 was not covered by tests

Check warning on line 69 in internal/resourcemodifiers/json_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/json_patch.go#L68-L69 

Added lines #L68 - L69 were not covered by tests

Check warning on line 79 in internal/resourcemodifiers/json_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/json_patch.go#L78-L79 

Added lines #L78 - L79 were not covered by tests

Check warning on line 84 in internal/resourcemodifiers/json_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/json_patch.go#L83-L84 

Added lines #L83 - L84 were not covered by tests

Check warning on line 96 in internal/resourcemodifiers/resource_modifiers.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/resource_modifiers.go#L95-L96 

Added lines #L95 - L96 were not covered by tests

Check warning on line 148 in internal/resourcemodifiers/resource_modifiers.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/resource_modifiers.go#L147-L148 

Added lines #L147 - L148 were not covered by tests

Check warning on line 163 in internal/resourcemodifiers/resource_modifiers.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/resource_modifiers.go#L163 

Added line #L163 was not covered by tests

Check warning on line 191 in internal/resourcemodifiers/resource_modifiers.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/resource_modifiers.go#L191 

Added line #L191 was not covered by tests

Check warning on line 196 in internal/resourcemodifiers/resource_modifiers.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/resource_modifiers.go#L196 

Added line #L196 was not covered by tests

Check warning on line 46 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L45-L46 

Added lines #L45 - L46 were not covered by tests

Check warning on line 68 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L67-L68 

Added lines #L67 - L68 were not covered by tests

Check warning on line 75 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L74-L75 

Added lines #L74 - L75 were not covered by tests

Check warning on line 79 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L78-L79 

Added lines #L78 - L79 were not covered by tests

Check warning on line 96 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L95-L96 

Added lines #L95 - L96 were not covered by tests

Check warning on line 110 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L101-L110 

Added lines #L101 - L110 were not covered by tests

Check warning on line 117 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L113-L117 

Added lines #L113 - L117 were not covered by tests

Check warning on line 120 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L120 

Added line #L120 was not covered by tests

Check warning on line 126 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L123-L126 

Added lines #L123 - L126 were not covered by tests

Check warning on line 141 in internal/resourcemodifiers/strategic_merge_patch.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

internal/resourcemodifiers/strategic_merge_patch.go#L134-L141 

Added lines #L134 - L141 were not covered by tests

Check warning on line 1508 in pkg/restore/restore.go

See this annotation in the file changed.

@codecov codecov / codecov/patch

pkg/restore/restore.go#L1508 

Added line #L1508 was not covered by tests
View more details on Codecov