Skip to content

Commit 8d365c2

Browse files
committed
add missing call to fetch autodiscovered nodegroups
1 parent 90bccb0 commit 8d365c2

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

cluster-autoscaler/cloudprovider/azure/azure_cloud_provider_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ func TestNodeGroupForNode(t *testing.T) {
135135

136136
registered := provider.azureManager.RegisterNodeGroup(
137137
newTestScaleSet(provider.azureManager, "test-asg"))
138+
provider.azureManager.explicitlyConfigured["test-asg"] = true
138139
assert.True(t, registered)
139140
assert.Equal(t, len(provider.NodeGroups()), 1)
140141

cluster-autoscaler/cloudprovider/azure/azure_manager.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ func (m *AzureManager) Refresh() error {
169169
}
170170

171171
func (m *AzureManager) forceRefresh() error {
172+
if err := m.fetchAutoNodeGroups(); err != nil {
173+
klog.Errorf("Failed to fetch autodiscovered nodegroups: %v", err)
174+
}
172175
if err := m.azureCache.regenerate(); err != nil {
173176
klog.Errorf("Failed to regenerate Azure cache: %v", err)
174177
return err

cluster-autoscaler/cloudprovider/azure/azure_scale_set_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ func TestIncreaseSizeOnVMSSUpdating(t *testing.T) {
194194
mockVMSSVMClient := mockvmssvmclient.NewMockInterface(ctrl)
195195
mockVMSSVMClient.EXPECT().List(gomock.Any(), manager.config.ResourceGroup, "vmss-updating", gomock.Any()).Return(expectedVMSSVMs, nil).AnyTimes()
196196
manager.azClient.virtualMachineScaleSetVMsClient = mockVMSSVMClient
197+
manager.explicitlyConfigured["vmss-updating"] = true
197198
registered := manager.RegisterNodeGroup(newTestScaleSet(manager, vmssName))
198199
assert.True(t, registered)
199200
manager.Refresh()
@@ -229,6 +230,7 @@ func TestBelongs(t *testing.T) {
229230

230231
scaleSet, ok := provider.NodeGroups()[0].(*ScaleSet)
231232
assert.True(t, ok)
233+
provider.azureManager.explicitlyConfigured["test-asg"] = true
232234
provider.azureManager.Refresh()
233235

234236
invalidNode := &apiv1.Node{
@@ -286,6 +288,7 @@ func TestDeleteNodes(t *testing.T) {
286288

287289
registered := manager.RegisterNodeGroup(
288290
newTestScaleSet(manager, "test-asg"))
291+
manager.explicitlyConfigured["test-asg"] = true
289292
assert.True(t, registered)
290293
err = manager.forceRefresh()
291294
assert.NoError(t, err)
@@ -385,6 +388,7 @@ func TestDeleteNoConflictRequest(t *testing.T) {
385388
assert.NoError(t, err)
386389

387390
registered := manager.RegisterNodeGroup(newTestScaleSet(manager, "test-asg"))
391+
manager.explicitlyConfigured["test-asg"] = true
388392
assert.True(t, registered)
389393
manager.Refresh()
390394

@@ -436,6 +440,7 @@ func TestScaleSetNodes(t *testing.T) {
436440

437441
registered := provider.azureManager.RegisterNodeGroup(
438442
newTestScaleSet(provider.azureManager, "test-asg"))
443+
provider.azureManager.explicitlyConfigured["test-asg"] = true
439444
provider.azureManager.Refresh()
440445
assert.True(t, registered)
441446
assert.Equal(t, len(provider.NodeGroups()), 1)

0 commit comments

Comments
 (0)