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

Sure DHCP will work on VLAN interface if VLAN is configured (backport #879) #881

Merged
merged 3 commits into from
Nov 29, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 7, 2024

Problem:

DHCP looks to have flaws with VLAN interfaces.

Solution:

Sure the DHCP is working on VLAN interface if VLAN is configured.

This PR has 3 commits:

(1) Use VLAN interface if VLAN is configured to do DHCP
(2) Avoid preflight check if node goes to dashboard directly
(3) Pass VID

PR #878 is merged to this one.

Co-authored-by: Kiefer Chang [email protected]

Related Issue:

harvester/harvester#6959
harvester/harvester#3428

Test plan:

Per issue description

Local test:

Installer with this fix, the DHCP discovery frame is encaped with VLAN 100 ( and we did not set a DHCP server on VLAN 100)
image

Original installer without this fix, the DHCP discovery frame is NOT encaped with VLAN 100
image


This is an automatic backport of pull request #879 done by Mergify.

@mergify mergify bot added the conflicts label Nov 7, 2024
Copy link
Author

mergify bot commented Nov 7, 2024

Cherry-pick of 9e1027f has failed:

On branch mergify/bp/v1.3/pr-879
Your branch is ahead of 'origin/v1.3' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9e1027f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/console/install_panels.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: Jian Wang <[email protected]>

Co-authored-by: Kiefer Chang <[email protected]>
(cherry picked from commit 9e1027f)
@w13915984028 w13915984028 force-pushed the mergify/bp/v1.3/pr-879 branch from 547e52f to 8c58df9 Compare November 25, 2024 10:10
@w13915984028 w13915984028 self-assigned this Nov 25, 2024
@w13915984028
Copy link
Member

The mergify conflicts have been fixed manually.

Copy link
Member

@starbops starbops left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thank you.

@starbops starbops merged commit 32fc64a into v1.3 Nov 29, 2024
7 checks passed
@bk201 bk201 deleted the mergify/bp/v1.3/pr-879 branch December 23, 2024 00:49
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