Skip to content

[release-1.26] krt: add assertions #56516

@istio-testing

Description

@istio-testing

Manual cherrypick required.

#56510 failed to apply on top of branch "release-1.26":

Applying: krt: add assertions
Using index info to reconstruct a base tree...
M	pkg/kube/krt/collection.go
M	pkg/kube/krt/collection_test.go
A	pkg/kube/krt/map.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/kube/krt/map.go deleted in HEAD and modified in krt: add assertions. Version krt: add assertions of pkg/kube/krt/map.go left in tree.
Auto-merging pkg/kube/krt/collection_test.go
CONFLICT (content): Merge conflict in pkg/kube/krt/collection_test.go
Auto-merging pkg/kube/krt/collection.go
CONFLICT (content): Merge conflict in pkg/kube/krt/collection.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 krt: add assertions

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions