diff --git a/pkg/controller/cloud/node_lifecycle_controller.go b/pkg/controller/cloud/node_lifecycle_controller.go index 2a712ad21e1..809e85c55d9 100644 --- a/pkg/controller/cloud/node_lifecycle_controller.go +++ b/pkg/controller/cloud/node_lifecycle_controller.go @@ -146,18 +146,6 @@ func (c *CloudNodeLifecycleController) MonitorNodes() { continue } - // node condition is unknown so we should not try to update it - if status == v1.ConditionUnknown { - continue - } - - // status for NodeReady should be false at this point, this check - // is here as a fail safe in the case a new node condition is added - // without consideration of this controller - if status != v1.ConditionFalse { - continue - } - // we need to check this first to get taint working in similar in all cloudproviders // current problem is that shutdown nodes are not working in similar way ie. all cloudproviders // does not delete node from kubernetes cluster when instance it is shutdown see issue #46442 diff --git a/pkg/controller/cloud/node_lifecycle_controller_test.go b/pkg/controller/cloud/node_lifecycle_controller_test.go index ca9e8f90dbb..c6e395274c5 100644 --- a/pkg/controller/cloud/node_lifecycle_controller_test.go +++ b/pkg/controller/cloud/node_lifecycle_controller_test.go @@ -24,6 +24,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/informers" coreinformers "k8s.io/client-go/informers/core/v1" "k8s.io/client-go/kubernetes/fake" @@ -164,7 +165,9 @@ func Test_NodesDeleted(t *testing.T) { fakeCloud: &fakecloud.FakeCloud{ ExistsByProviderID: false, }, - deleteNodes: []*v1.Node{}, + deleteNodes: []*v1.Node{ + testutil.NewNode("node0"), + }, }, { name: "node ready condition is unknown, node exists", @@ -191,7 +194,11 @@ func Test_NodesDeleted(t *testing.T) { Clientset: fake.NewSimpleClientset(), }, fakeCloud: &fakecloud.FakeCloud{ + NodeShutdown: false, ExistsByProviderID: true, + ExtID: map[types.NodeName]string{ + types.NodeName("node0"): "foo://12345", + }, }, deleteNodes: []*v1.Node{}, },