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

docs: Automated CherryPick Update for release-v4.4 #4046

Merged
merged 1 commit into from
Oct 9, 2023

Conversation

sealos-ci-robot
Copy link
Member

@sealos-ci-robot sealos-ci-robot commented Oct 9, 2023

πŸ€– Generated by Copilot at f09f754

Summary

πŸ› οΈπŸŒπŸ“¦

Enhanced local IP detection in isLocal function. Used iputils package to parse and compare host addresses in pkg/exec/exec.go.

isLocal knows the truth of your domain
No port or scheme can hide your wicked game
You can't deceive the iputils in the dark
They'll expose your lies and tear your network apart

Walkthrough

  • Import iputils package to use GetHostIP function for extracting host IP from address strings (link)
  • Refactor isLocal function to use GetHostIP instead of net.SplitHostPort for more robust and consistent address parsing (link)

Automated changes by create-pull-request GitHub action

@codecov
Copy link

codecov bot commented Oct 9, 2023

Codecov Report

All modified lines are covered by tests βœ…

πŸ“’ Thoughts on this report? Let us know!.

@cuisongliu cuisongliu added this to the v4.3 milestone Oct 9, 2023
@cuisongliu cuisongliu merged commit 105a74c into release-v4.4 Oct 9, 2023
126 checks passed
@cuisongliu cuisongliu deleted the cherry-pick-release-v4.4-4045 branch October 9, 2023 07:42
@sealos-ci-robot
Copy link
Member Author

/cherry-pick release-v4.3

@sealos-ci-robot
Copy link
Member Author

πŸ€– says: Error cherry-picking.

CONFLICT (modify/delete): pkg/exec/exec.go deleted in HEAD and modified in 105a74c (fix: if string addr has not colon (#4045) (#4046)). Version 105a74c (fix: if string addr has not colon (#4045) (#4046)) of pkg/exec/exec.go left in tree.
error: could not apply 105a74c... fix: if string addr has not colon (#4045) (#4046)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", 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".

@sealos-ci-robot
Copy link
Member Author

πŸ€– says: ‼️ cherry pick action failed.
See: https://github.com/labring/sealos/actions/runs/6453723121

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants