vSphere: support for VM Groups #1847
There are no files selected for viewing
This file contains 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 |
|---|---|---|
|
|
@@ -15,5 +15,5 @@ examples/*.srl | |
| /vendor | ||
| .vscode | ||
| .gitpod.yml | ||
| cmd/machine-controller/__debug_bin* | ||
| !pkg | ||
This file contains 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 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 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 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 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 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 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 |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| /* | ||
| Copyright 2024 The Machine Controller Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package vsphere | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strings" | ||
|
|
||
| clusterv1alpha1 "github.com/kubermatic/machine-controller/pkg/apis/cluster/v1alpha1" | ||
|
|
||
| "github.com/vmware/govmomi/vim25/types" | ||
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| func (p *provider) addToVMGroup(ctx context.Context, log *zap.SugaredLogger, session *Session, machine *clusterv1alpha1.Machine, config *Config) error { | ||
| lock.Lock() | ||
| defer lock.Unlock() | ||
|
|
||
| // Check if the VM group exists | ||
| vmGroup, err := findVMGroup(ctx, session, config.Cluster, config.VMGroup) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // We have to find all VMs in the folder and add them to the VM group. VMGroup only contains VM reference ID which is not enough to | ||
| // identify the VM by name. | ||
| machineSetName := machine.Name[:strings.LastIndex(machine.Name, "-")] | ||
| vmsInFolder, err := session.Finder.VirtualMachineList(ctx, strings.Join([]string{config.Folder, "*"}, "/")) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to find VMs in folder: %w", err) | ||
| } | ||
|
|
||
| var vmRefs []types.ManagedObjectReference | ||
| for _, vm := range vmsInFolder { | ||
| // Only add VMs with the same machineSetName to the rule and exclude the machine itself if it is being deleted | ||
| if strings.HasPrefix(vm.Name(), machineSetName) && !(vm.Name() == machine.Name && machine.DeletionTimestamp != nil) { | ||
| vmRefs = append(vmRefs, vm.Reference()) | ||
| } | ||
| } | ||
|
|
||
| var vmRefsToAdd []types.ManagedObjectReference | ||
| for _, vm := range vmRefs { | ||
| found := false | ||
| for _, existingVM := range vmGroup.Vm { | ||
| if existingVM.Value == vm.Value { | ||
| log.Debugf("VM %s already in VM group %s", machine.Name, config.VMGroup) | ||
| found = true | ||
| break | ||
| } | ||
| } | ||
| if !found { | ||
| vmRefsToAdd = append(vmRefsToAdd, vm) | ||
| } | ||
| } | ||
|
|
||
| // Add the VM to the VM group | ||
| vmGroup.Vm = append(vmGroup.Vm, vmRefsToAdd...) | ||
| cluster, err := session.Finder.ClusterComputeResource(ctx, config.Cluster) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| spec := &types.ClusterConfigSpecEx{ | ||
| GroupSpec: []types.ClusterGroupSpec{ | ||
| { | ||
| ArrayUpdateSpec: types.ArrayUpdateSpec{ | ||
| Operation: types.ArrayUpdateOperationEdit, | ||
| }, | ||
| Info: vmGroup, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| log.Debugf("Adding VM %s in VM group %s", machine.Name, config.VMGroup) | ||
|
There was a problem hiding this comment. Technically if something went wrong on vSphere side, this could result in adding multiple VMs to the group at the same time. We should eventually improve logging to reflect that edge case. |
||
| task, err := cluster.Reconfigure(ctx, spec, true) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| taskResult, err := task.WaitForResultEx(ctx) | ||
| if err != nil { | ||
| return fmt.Errorf("error waiting for cluster %v reconfiguration to complete", cluster.Name()) | ||
| } | ||
| if taskResult.State != types.TaskInfoStateSuccess { | ||
| return fmt.Errorf("cluster %v reconfiguration task was not successful", cluster.Name()) | ||
| } | ||
| log.Debugf("Successfully added VM %s in VM group %s", machine.Name, config.VMGroup) | ||
| return nil | ||
| } | ||
|
|
||
| func findVMGroup(ctx context.Context, session *Session, clusterName, vmGroup string) (*types.ClusterVmGroup, error) { | ||
| cluster, err := session.Finder.ClusterComputeResource(ctx, clusterName) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| clusterConfigInfoEx, err := cluster.Configuration(ctx) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| for _, group := range clusterConfigInfoEx.Group { | ||
| if clusterVMGroup, ok := group.(*types.ClusterVmGroup); ok { | ||
| if clusterVMGroup.Name == vmGroup { | ||
| return clusterVMGroup, nil | ||
| } | ||
| } | ||
| } | ||
| return nil, fmt.Errorf("cannot find VM group %s", vmGroup) | ||
| } | ||
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.
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.
What if both VMAntiAffinity and VMGroup are set, is that supported?