Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kubernetes/autoscaler
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 123517215e3c75d4821371921d6322ad4f9ef38c
Choose a base ref
..
head repository: kubernetes/autoscaler
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e439dfbf9624fa7bae23c93895f90fe9f9c941b2
Choose a head ref
Original file line number Diff line number Diff line change
@@ -197,6 +197,21 @@ func (ts *cloudProviderTestSuite) TestExoscaleCloudProvider_NodeGroupForNode_Ins
nil,
)

ts.p.manager.client.(*exoscaleClientMock).
On("ListSKSClusters", ts.p.manager.ctx, ts.p.manager.zone).
Return(
[]*egoscale.SKSCluster{{
ID: &testSKSClusterID,
Name: &testSKSClusterName,
Nodepools: []*egoscale.SKSNodepool{{
ID: &testSKSNodepoolID,
InstancePoolID: &testInstancePoolID,
Name: &testSKSNodepoolName,
}},
}},
nil,
)

nodeGroup, err := ts.p.NodeGroupForNode(&apiv1.Node{
Spec: apiv1.NodeSpec{
ProviderID: toProviderID(testInstanceID),
@@ -280,7 +295,7 @@ func (ts *cloudProviderTestSuite) TestExoscaleCloudProvider_NodeGroupForNode_SKS
})
ts.Require().NoError(err)
ts.Require().NotNil(nodeGroup)
ts.Require().Equal(testInstancePoolID, nodeGroup.Id())
ts.Require().Equal(testSKSNodepoolID, nodeGroup.Id())
ts.Require().IsType(&sksNodepoolNodeGroup{}, nodeGroup)
}

@@ -359,6 +374,21 @@ func (ts *cloudProviderTestSuite) TestExoscaleCloudProvider_NodeGroups() {
nil,
)

ts.p.manager.client.(*exoscaleClientMock).
On("ListSKSClusters", ts.p.manager.ctx, ts.p.manager.zone).
Return(
[]*egoscale.SKSCluster{{
ID: &testSKSClusterID,
Name: &testSKSClusterName,
Nodepools: []*egoscale.SKSNodepool{{
ID: &testSKSNodepoolID,
InstancePoolID: &sksNodepoolInstancePoolID,
Name: &testSKSNodepoolName,
}},
}},
nil,
)

instancePoolNodeGroup, err := ts.p.NodeGroupForNode(&apiv1.Node{
Spec: apiv1.NodeSpec{
ProviderID: toProviderID(instancePoolInstanceID),
@@ -432,7 +462,11 @@ func (ts *cloudProviderTestSuite) TestExoscaleCloudProvider_NodeGroups() {

// ---------------------------------------------------------------

ts.Require().Len(ts.p.NodeGroups(), 2)
nodeGroups := ts.p.NodeGroups()
ts.Require().Len(nodeGroups, 2)
if len(nodeGroups) >= 2 {
ts.Require().Equal(nodeGroups[1].Id(), testSKSNodepoolID)
}
}

func TestSuiteExoscaleCloudProvider(t *testing.T) {
Original file line number Diff line number Diff line change
@@ -206,7 +206,7 @@ func (ts *cloudProviderTestSuite) TestSKSNodepoolNodeGroup_Id() {
maxSize: int(testComputeInstanceQuotaLimit),
}

ts.Require().Equal(testInstancePoolID, nodeGroup.Id())
ts.Require().Equal(testSKSNodepoolID, nodeGroup.Id())
}

func (ts *cloudProviderTestSuite) TestSKSNodepoolNodeGroup_Nodes() {