failed to cherry pick PR 4716 from cyclinder, to branch release-v0.9 #4720
Description
commits 97fa9e8 of cyclinder conflict when merging to branch release-v0.9, please manually cherry pick it by yourself.
PR #4716 , action https://github.com/spidernet-io/spiderpool/actions/runs/13669495843
Auto-merging docs/usage/spider-multus-config-zh_CN.md
CONFLICT (content): Merge conflict in docs/usage/spider-multus-config-zh_CN.md
Auto-merging docs/usage/spider-multus-config.md
Auto-merging pkg/constant/k8s.go
Auto-merging pkg/multuscniconfig/utils.go
Auto-merging test/e2e/spidermultus/spidermultus_test.go
CONFLICT (content): Merge conflict in test/e2e/spidermultus/spidermultus_test.go
error: could not apply 97fa9e834... SpiderMultusConfig: Fix error json tag for min/maxTxRateMbps (#4716)
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 set advice.mergeConflict false"