kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3057 from JoelSpeed/external-node-ids 

CAPI: Do not normalize Node IDs outside of CAPI provider
This commit is contained in:
Kubernetes Prow Robot 2020-05-27 07:28:40 -07:00 committed by GitHub
parent 0255c11527 5e0126ada5
commit 0f504d38c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster-autoscaler/cloudprovider/clusterapi/clusterapi_controller_test.go
View File

@ -987,7 +987,7 @@ func TestControllerMachineSetNodeNamesUsingProviderID(t *testing.T) {
}) })
for i := range testConfig.nodes { for i := range testConfig.nodes {
if nodeNames[i].Id != string(normalizedProviderString(testConfig.nodes[i].Spec.ProviderID)) { if nodeNames[i].Id != testConfig.nodes[i].Spec.ProviderID {
t.Fatalf("expected %q, got %q", testConfig.nodes[i].Spec.ProviderID, nodeNames[i].Id) t.Fatalf("expected %q, got %q", testConfig.nodes[i].Spec.ProviderID, nodeNames[i].Id)
} }
} }
@ -1035,7 +1035,7 @@ func TestControllerMachineSetNodeNamesUsingStatusNodeRefName(t *testing.T) {
}) })
for i := range testConfig.nodes { for i := range testConfig.nodes {
if nodeNames[i].Id != string(normalizedProviderString(testConfig.nodes[i].Spec.ProviderID)) { if nodeNames[i].Id != testConfig.nodes[i].Spec.ProviderID {
t.Fatalf("expected %q, got %q", testConfig.nodes[i].Spec.ProviderID, nodeNames[i].Id) t.Fatalf("expected %q, got %q", testConfig.nodes[i].Spec.ProviderID, nodeNames[i].Id)
} }
} }

6
cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup.go
View File

@ -195,10 +195,14 @@ func (ng *nodegroup) Nodes() ([]cloudprovider.Instance, error) {
return nil, err return nil, err
} }
// Nodes do not have normalized IDs, so do not normalize the ID here.
// The IDs returned here are used to check if a node is registered or not and
// must match the ID on the Node object itself.
// https://github.com/kubernetes/autoscaler/blob/a973259f1852303ba38a3a61eeee8489cf4e1b13/cluster-autoscaler/clusterstate/clusterstate.go#L967-L985
instances := make([]cloudprovider.Instance, len(nodes)) instances := make([]cloudprovider.Instance, len(nodes))
for i := range nodes { for i := range nodes {
instances[i] = cloudprovider.Instance{ instances[i] = cloudprovider.Instance{
Id: string(normalizedProviderString(nodes[i])), Id: nodes[i],
} }
} }

6
cluster-autoscaler/cloudprovider/clusterapi/clusterapi_nodegroup_test.go
View File

@ -659,7 +659,7 @@ func TestNodeGroupDeleteNodes(t *testing.T) {
}) })
for i := 0; i < len(nodeNames); i++ { for i := 0; i < len(nodeNames); i++ {
if nodeNames[i].Id != string(normalizedProviderString(testConfig.nodes[i].Spec.ProviderID)) { if nodeNames[i].Id != testConfig.nodes[i].Spec.ProviderID {
t.Fatalf("expected %q, got %q", testConfig.nodes[i].Spec.ProviderID, nodeNames[i].Id) t.Fatalf("expected %q, got %q", testConfig.nodes[i].Spec.ProviderID, nodeNames[i].Id)
} }
} }
@ -844,7 +844,7 @@ func TestNodeGroupDeleteNodesTwice(t *testing.T) {
}) })
for i := 0; i < len(nodeNames); i++ { for i := 0; i < len(nodeNames); i++ {
if nodeNames[i].Id != string(normalizedProviderString(testConfig.nodes[i].Spec.ProviderID)) { if nodeNames[i].Id != testConfig.nodes[i].Spec.ProviderID {
t.Fatalf("expected %q, got %q", testConfig.nodes[i].Spec.ProviderID, nodeNames[i].Id) t.Fatalf("expected %q, got %q", testConfig.nodes[i].Spec.ProviderID, nodeNames[i].Id)
} }
} }
@ -998,7 +998,7 @@ func TestNodeGroupWithFailedMachine(t *testing.T) {
nodeIndex = i nodeIndex = i
} }
if nodeNames[i].Id != string(normalizedProviderString(testConfig.nodes[nodeIndex].Spec.ProviderID)) { if nodeNames[i].Id != testConfig.nodes[nodeIndex].Spec.ProviderID {
t.Fatalf("expected %q, got %q", testConfig.nodes[nodeIndex].Spec.ProviderID, nodeNames[i].Id) t.Fatalf("expected %q, got %q", testConfig.nodes[nodeIndex].Spec.ProviderID, nodeNames[i].Id)
} }
} }