-
Notifications
You must be signed in to change notification settings - Fork 33
PCP-6208: Enhance MaaS machine handling during commissioning phase & add ip check before compose #324
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
Open
Kun483
wants to merge
4
commits into
spectro-master
Choose a base branch
from
PCP-6208
base: spectro-master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
PCP-6208: Enhance MaaS machine handling during commissioning phase & add ip check before compose #324
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
a638bac
Enhance MaaS machine handling during commissioning phase
Kun483 3687554
Update maas-client-go dependency to v0.1.4-beta2 and add mock methods…
Kun483 3bde1f2
restore to use fmt.Errorf
Kun483 37e3ebe
Remove redundant commissioning check in MaasMachineReconciler's recon…
Kun483 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,10 +26,10 @@ import ( | |
|
|
||
| // Service manages the MaaS machine | ||
| var ( | ||
| ErrBrokenMachine = errors.New("broken machine encountered") | ||
| ErrVMComposing = errors.New("vm composing/commissioning") | ||
| reHostID = regexp.MustCompile(`host (\d+)`) | ||
| reMachineID = regexp.MustCompile(`machine[s]? ([a-z0-9]{4,6})`) | ||
| ErrBrokenMachine = errors.New("broken machine encountered") | ||
| ErrVMComposing = errors.New("vm composing/commissioning") | ||
| reHostID = regexp.MustCompile(`host (\d+)`) | ||
| reMachineID = regexp.MustCompile(`machine[s]? ([a-z0-9]{4,6})`) | ||
| ) | ||
|
|
||
| const ( | ||
|
|
@@ -497,6 +497,26 @@ func (s *Service) PrepareLXDVM(ctx context.Context) (*infrav1beta1.Machine, erro | |
| } | ||
| } | ||
|
|
||
| // Before composing: check if the static IP is already allocated in MAAS | ||
| if s.scope.IsControlPlane() { | ||
| if staticIPToCheck := s.scope.GetStaticIP(); staticIPToCheck != "" { | ||
| s.scope.Info("Checking static IP availability before VM compose", "ip", staticIPToCheck) | ||
| existingIP, ipErr := s.maasClient.IPAddresses().GetAll(ctx, staticIPToCheck) | ||
| if ipErr == nil { | ||
| if ifaces := existingIP.InterfaceSet(); len(ifaces) > 0 { | ||
| return nil, fmt.Errorf("static IP %s is already in use (allocated to %d interface(s)); cannot compose VM — will retry when IP is available", staticIPToCheck, len(ifaces)) | ||
| } | ||
| // IP exists with no interfaces — stale/floating allocation; release before compose | ||
| s.scope.Info("Static IP has stale allocation with no interfaces; releasing before compose", "ip", staticIPToCheck) | ||
| if releaseErr := s.maasClient.IPAddresses().Release(ctx, staticIPToCheck); releaseErr != nil { | ||
| return nil, fmt.Errorf("static IP %s has a stale allocation that could not be released before compose: %w", staticIPToCheck, releaseErr) | ||
| } | ||
| s.scope.Info("Released stale IP allocation, proceeding with compose", "ip", staticIPToCheck) | ||
| } | ||
| // ipErr != nil means IP not found in MAAS — available, proceed normally | ||
| } | ||
| } | ||
|
|
||
| // Create the VM on the selected host | ||
| m, err := selectedHost.Composer().Compose(ctx, params) | ||
| if err != nil { | ||
|
|
@@ -827,7 +847,6 @@ func (s *Service) setMachineStaticIP(systemID string, config *infrav1beta1.Stati | |
| // Special handling for Commissioning state: skip static IP configuration to avoid blocking commissioning | ||
| if machineState == "Commissioning" { | ||
| s.scope.Info("Machine is commissioning, skipping static IP configuration to avoid interfering with commissioning process. Will configure after commissioning completes", "systemID", systemID) | ||
| // Return error to requeue - static IP will be configured after commissioning completes | ||
| return fmt.Errorf("machine is commissioning, static IP configuration will be retried after commissioning completes") | ||
| } | ||
|
Comment on lines
847
to
851
|
||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
any reason to go for beta2 naming instead of updating minor version?
Also, maas client go release looks wrong, its a public repo we can avoid PCP taging there.
v0.1.4-beta2: Merge pull request #44 from spectrocloud/PCP-6208There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got it. I'll add a new feature in maas-client-go and update the minor version