Skip to content

[main] Added logic to attach vnetsubnetid to nodepool #1195

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.

Sign up for GitHub

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[main] Added logic to attach vnetsubnetid to nodepool #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5581b8
[main] Added logic to attach vnetsubnetid to nodepool
swastik959 Nov 11, 2025
5328b12
updated unit tests
swastik959 Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controller/aks-cluster-config-handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ func (h *Handler) updateUpstreamClusterState(ctx context.Context, config *aksv1.
if config.Status.Phase != aksConfigUpdatingPhase {
return h.enqueueUpdate(config)
}
err = aks.CreateOrUpdateAgentPool(ctx, h.azureClients.agentPoolsClient, &config.Spec, np)
err = aks.CreateOrUpdateAgentPool(ctx, &h.azureClients.credentials, h.azureClients.agentPoolsClient, &config.Spec, np)
if err != nil {
return config, fmt.Errorf("failed to update cluster [%s (id: %s)]: %v", config.Spec.ClusterName, config.Name, err)
}
Expand Down
15 changes: 14 additions & 1 deletion pkg/aks/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ func createManagedCluster(ctx context.Context, cred *Credentials, workplacesClie

// CreateOrUpdateAgentPool creates a new pool(s) in AKS. If one already exists it updates the upstream node pool with
// any provided updates.
func CreateOrUpdateAgentPool(ctx context.Context, agentPoolClient services.AgentPoolsClientInterface, spec *aksv1.AKSClusterConfigSpec, np *aksv1.AKSNodePool) error {
func CreateOrUpdateAgentPool(ctx context.Context, cred *Credentials, agentPoolClient services.AgentPoolsClientInterface, spec *aksv1.AKSClusterConfigSpec, np *aksv1.AKSNodePool) error {
if np.AvailabilityZones != nil && len(*np.AvailabilityZones) > 0 && !CheckAvailabilityZonesSupport(spec.ResourceLocation) {
return fmt.Errorf("availability zones are not supported in region %s", spec.ResourceLocation)
}
Expand All @@ -330,6 +330,19 @@ func CreateOrUpdateAgentPool(ctx context.Context, agentPoolClient services.Agent
NodeLabels: np.NodeLabels,
NodeTaints: utils.ConvertToSliceOfPointers(np.NodeTaints),
}
if hasCustomVirtualNetwork(spec) {
virtualNetworkResourceGroup := spec.ResourceGroup
if String(spec.VirtualNetworkResourceGroup) != "" {
virtualNetworkResourceGroup = String(spec.VirtualNetworkResourceGroup)
}
agentProfile.VnetSubnetID = to.Ptr(fmt.Sprintf(
"/subscriptions/%s/resourceGroups/%s/providers/Microsoft.Network/virtualNetworks/%s/subnets/%s",
cred.SubscriptionID,
virtualNetworkResourceGroup,
String(spec.VirtualNetwork),
String(spec.Subnet),
))
}

if np.MaxSurge != nil {
agentProfile.UpgradeSettings = &armcontainerservice.AgentPoolUpgradeSettings{
Expand Down
7 changes: 4 additions & 3 deletions pkg/aks/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,22 +540,23 @@ var _ = Describe("CreateOrUpdateAgentPool", func() {
UpgradeSettings: &armcontainerservice.AgentPoolUpgradeSettings{
MaxSurge: nodePoolSpec.MaxSurge,
},
VnetSubnetID: nodePoolSpec.VnetSubnetID,
},
}).Return(&runtime.Poller[armcontainerservice.AgentPoolsClientCreateOrUpdateResponse]{}, nil)
Expect(CreateOrUpdateAgentPool(ctx, agentPoolClientMock, clusterSpec, nodePoolSpec)).To(Succeed())
Expect(CreateOrUpdateAgentPool(ctx, &Credentials{}, agentPoolClientMock, clusterSpec, nodePoolSpec)).To(Succeed())
})

It("should fail if agentPoolClient.CreateOrUpdate returns error", func() {
agentPoolClientMock.EXPECT().BeginCreateOrUpdate(
ctx, clusterSpec.ResourceGroup, clusterSpec.ClusterName, String(nodePoolSpec.Name), gomock.Any()).
Return(&runtime.Poller[armcontainerservice.AgentPoolsClientCreateOrUpdateResponse]{}, errors.New("test-error"))

Expect(CreateOrUpdateAgentPool(ctx, agentPoolClientMock, clusterSpec, nodePoolSpec)).ToNot(Succeed())
Expect(CreateOrUpdateAgentPool(ctx, &Credentials{}, agentPoolClientMock, clusterSpec, nodePoolSpec)).ToNot(Succeed())
})

It("should fail for region without avaibility zones", func() {
clusterSpec.ResourceLocation = "westus"
Expect(CreateOrUpdateAgentPool(ctx, agentPoolClientMock, clusterSpec, nodePoolSpec)).ToNot(Succeed())
Expect(CreateOrUpdateAgentPool(ctx, &Credentials{}, agentPoolClientMock, clusterSpec, nodePoolSpec)).ToNot(Succeed())
})
})

Expand Down
Loading