Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-02-02 18:44:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update operator role identification

Browse Source
This commit is contained in:
katexochen 2022-10-06 12:14:56 +02:00 committed by Paul Meyer
parent dbe9bf381c
commit 38498b1981
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
operators/constellation-node-operator/internal/azure/client/scalinggroup.go
View File

@ -89,15 +89,25 @@ func (c *Client) ListScalingGroups(ctx context.Context, uid string) (controlPlan
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("getting scaling group name: %w", err) return nil, nil, fmt.Errorf("getting scaling group name: %w", err)
} }
if scaleSet == "constellation-scale-set-controlplanes-"+uid { if isControlPlaneInstanceGroup(scaleSet) {
controlPlaneGroupIDs = append(controlPlaneGroupIDs, scaleSetID) controlPlaneGroupIDs = append(controlPlaneGroupIDs, scaleSetID)
} else if strings.HasPrefix(scaleSet, "constellation-scale-set-workers-"+uid) { } else if isWorkerInstanceGroup(scaleSet) {
workerGroupIDs = append(workerGroupIDs, scaleSetID) workerGroupIDs = append(workerGroupIDs, scaleSetID)
} }
} }
return controlPlaneGroupIDs, workerGroupIDs, nil return controlPlaneGroupIDs, workerGroupIDs, nil
} }
// isControlPlaneInstanceGroup returns true if the instance group is a control plane instance group.
func isControlPlaneInstanceGroup(instanceGroupName string) bool {
return strings.Contains(instanceGroupName, "control-plane")
}
// isWorkerInstanceGroup returns true if the instance group is a worker instance group.
func isWorkerInstanceGroup(instanceGroupName string) bool {
return strings.Contains(instanceGroupName, "worker")
}
func imageReferenceFromImage(img string) *armcompute.ImageReference { func imageReferenceFromImage(img string) *armcompute.ImageReference {
ref := &armcompute.ImageReference{} ref := &armcompute.ImageReference{}

4
operators/constellation-node-operator/internal/azure/client/scalinggroup_test.go
View File

@ -192,9 +192,9 @@ func TestListScalingGroups(t *testing.T) {
}{ }{
"listing control-plane works": { "listing control-plane works": {
scaleSet: armcomputev2.VirtualMachineScaleSet{ scaleSet: armcomputev2.VirtualMachineScaleSet{
ID: to.Ptr("/subscriptions/subscription-id/resourceGroups/resource-group/providers/Microsoft.Compute/virtualMachineScaleSets/constellation-scale-set-controlplanes-uid"), ID: to.Ptr("/subscriptions/subscription-id/resourceGroups/resource-group/providers/Microsoft.Compute/virtualMachineScaleSets/constellation-scale-set-control-planes-uid"),
}, },
wantControlPlanes: []string{"/subscriptions/subscription-id/resourceGroups/resource-group/providers/Microsoft.Compute/virtualMachineScaleSets/constellation-scale-set-controlplanes-uid"}, wantControlPlanes: []string{"/subscriptions/subscription-id/resourceGroups/resource-group/providers/Microsoft.Compute/virtualMachineScaleSets/constellation-scale-set-control-planes-uid"},
}, },
"listing worker works": { "listing worker works": {
scaleSet: armcomputev2.VirtualMachineScaleSet{ scaleSet: armcomputev2.VirtualMachineScaleSet{