Add support for Virtual Machine Scale Sets in the Boundary Azure Plugin (#22)
* first pass at pulling in VMSS data * infer vmss set id and external name from vmss data as none of these items are present by default * updated scale set name formatting to align with azure portal and json outputs * Update plugin/plugin.go Updated following code review Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com> * Update plugin/plugin.go Updated following code review Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com> * complete refactoring of initial implementation following code review, taking into accounts comments and common sense updates * updated README.md to reflect changes to support VMSS * fixed typo in README.md * WIP: initial updates following code review * refactored resource functions * removed instrumentation statements * resolve ifname comments * address formatting issues in accordance with style recommendations --------- Co-authored-by: Johan Brandhorst-Satzkorn <johan.brandhorst@gmail.com>
This commit is contained in:
1 parent
84ee22dcfd
commit
30ea98c877
12 files changed
+1598
-311
No files matched your search
@@ -0,0 +1,131 @@
|
||||
package plugin
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
|
||||
"github.com/Azure/azure-sdk-for-go/profiles/latest/resources/mgmt/resources"
|
||||
"golang.org/x/sync/errgroup"
|
||||
)
|
||||
|
||||
// vmJob represents a single VM processing job
|
||||
type vmJob struct {
|
||||
resource resources.GenericResourceExpanded
|
||||
resourceGroup string
|
||||
name string
|
||||
}
|
||||
|
||||
func (p *AzurePlugin) processStandardVMs(ctx context.Context, resourceInfos []resources.GenericResourceExpanded,
|
||||
clients *azureClients) (map[string]networkInfo, error) {
|
||||
|
||||
// Initialize the map that we'll return
|
||||
vmToNetworkMap := make(map[string]networkInfo)
|
||||
|
||||
// Pre-validate all resource IDs and create jobs slice
|
||||
jobs := make([]vmJob, 0, len(resourceInfos))
|
||||
for _, res := range resourceInfos {
|
||||
resourceGroup, name, err := splitId(*res.ID, constMsComputeService, constVirtualMachinesResource)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("invalid vm id %q: %w", *res.ID, err)
|
||||
}
|
||||
jobs = append(jobs, vmJob{
|
||||
resource: res,
|
||||
resourceGroup: resourceGroup,
|
||||
name: name,
|
||||
})
|
||||
}
|
||||
|
||||
// Create error group for worker management
|
||||
g, ctx := errgroup.WithContext(ctx)
|
||||
|
||||
// Create job channel
|
||||
jobsChan := make(chan vmJob)
|
||||
|
||||
// Result handling
|
||||
mu := &sync.Mutex{}
|
||||
|
||||
// Start worker pool
|
||||
for i := 0; i < constDefaultWorkers; i++ {
|
||||
g.Go(func() error {
|
||||
for job := range jobsChan {
|
||||
// Process single VM
|
||||
vm, err := clients.vmClient.Get(ctx, job.resourceGroup, job.name, "")
|
||||
if err != nil {
|
||||
return fmt.Errorf("error fetching vm with id %q: %w", *job.resource.ID, err)
|
||||
}
|
||||
|
||||
// Only process running VMs
|
||||
running, err := isVMRunning(ctx, clients.vmClient, job.resourceGroup, job.name)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !running {
|
||||
continue
|
||||
}
|
||||
|
||||
var netInfo networkInfo
|
||||
if err := processVMNetworkInterfaces(ctx, vm, clients, job.resourceGroup, &netInfo); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
mu.Lock()
|
||||
vmToNetworkMap[*job.resource.ID] = netInfo
|
||||
mu.Unlock()
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
// Send jobs to workers
|
||||
go func() {
|
||||
defer close(jobsChan)
|
||||
for _, job := range jobs {
|
||||
// Check context cancellation
|
||||
if ctx.Err() != nil {
|
||||
return
|
||||
}
|
||||
jobsChan <- job
|
||||
}
|
||||
}()
|
||||
|
||||
// Wait for all workers to complete
|
||||
if err := g.Wait(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return vmToNetworkMap, nil
|
||||
}
|
||||
|
||||
// VM Status Check
|
||||
func isVMRunning(
|
||||
ctx context.Context,
|
||||
vmClient *compute.VirtualMachinesClient,
|
||||
resourceGroup,
|
||||
name string,
|
||||
) (
|
||||
bool,
|
||||
error,
|
||||
) {
|
||||
|
||||
iv, err := vmClient.InstanceView(ctx, resourceGroup, name)
|
||||
if err != nil {
|
||||
return false, fmt.Errorf("error fetching instance view for vm %s: %w", name, err)
|
||||
}
|
||||
if iv.Statuses == nil {
|
||||
return false, fmt.Errorf("instance view statuses is null for vm %s", name)
|
||||
}
|
||||
|
||||
for _, s := range *iv.Statuses {
|
||||
if s.Code == nil {
|
||||
continue
|
||||
}
|
||||
state := strings.ToLower(*s.Code)
|
||||
if strings.HasPrefix(state, "powerstate/") && strings.TrimPrefix(state, "powerstate/") == "running" {
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
return false, nil
|
||||
}
|
||||
Reference in new issue
Block a user