fix(gce): dont return error for nodes without providerID

mweibel · Nov 11, 2020 · 94749d1 · 94749d1
1 parent da455d5
commit 94749d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go b/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider.go
@@ -91,6 +91,10 @@ func (gce *GceCloudProvider) NodeGroups() []cloudprovider.NodeGroup {
 
 // NodeGroupForNode returns the node group for the given node.
 func (gce *GceCloudProvider) NodeGroupForNode(node *apiv1.Node) (cloudprovider.NodeGroup, error) {
+	if node.Spec.ProviderID == "" {
+		klog.V(6).Infof("Skipping the search for node group for the node '%s' because it has no spec.ProviderID", node.ObjectMeta.Name)
+		return nil, nil
+	}
 	ref, err := GceRefFromProviderId(node.Spec.ProviderID)
 	if err != nil {
 		klog.Errorf("Error extracting node.Spec.ProviderID for node %v: %v", node.Name, err)

diff --git a/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider_test.go b/cluster-autoscaler/cloudprovider/gce/gce_cloud_provider_test.go
@@ -137,6 +137,16 @@ func TestNodeGroupForNode(t *testing.T) {
 	mock.AssertExpectationsForObjects(t, gceManagerMock)
 }
 
+func TestNodeGroupForNodeWithNoProviderId(t *testing.T) {
+	gce := &GceCloudProvider{}
+	n := BuildTestNode("n1", 1000, 1000)
+	n.Spec.ProviderID = ""
+
+	nodeGroup, err := gce.NodeGroupForNode(n)
+	assert.NoError(t, err)
+	assert.Nil(t, nodeGroup)
+}
+
 func TestGetResourceLimiter(t *testing.T) {
 	gceManagerMock := &gceManagerMock{}
 	resourceLimiter := cloudprovider.NewResourceLimiter(