spiderpool
spiderpool copied to clipboard
failed to cherry pick PR 4168 from ty-dc, to branch release-v0.8
commits 709bfba247bfe5810c508e5278c9b67ee860e786 of ty-dc conflict when merging to branch release-v0.8, please manually cherry pick it by yourself. PR https://github.com/spidernet-io/spiderpool/pull/4168 , action https://github.com/spidernet-io/spiderpool/actions/runs/11510480719
Auto-merging cmd/spiderpool-controller/cmd/daemon.go
Auto-merging pkg/multuscniconfig/multusconfig_validate.go
CONFLICT (content): Merge conflict in pkg/multuscniconfig/multusconfig_validate.go
Auto-merging pkg/multuscniconfig/multusconfig_webhook.go
Auto-merging test/doc/spidermultus.md
CONFLICT (content): Merge conflict in test/doc/spidermultus.md
Auto-merging test/e2e/spidermultus/spidermultus_test.go
CONFLICT (content): Merge conflict in test/e2e/spidermultus/spidermultus_test.go
error: could not apply 709bfba2... Merge pull request #4168 from ty-dc/fix/multus-informer
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"