fix(controller): fix bug if cnr is not found in lister

Signed-off-by: caohe <caohe9603@gmail.com>
kubewharf · Jul 25, 2023 · a32e408 · a32e408
1 parent 1253f13
commit a32e408
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/pkg/controller/lifecycle/cnr.go b/pkg/controller/lifecycle/cnr.go
@@ -295,6 +295,9 @@ func (cl *CNRLifecycle) clearUnexpectedCNR() {
 
 func (cl *CNRLifecycle) updateOrCreateCNR(node *corev1.Node) error {
 	cnr, err := cl.cnrLister.Get(node.Name)
+	if err != nil && !errors.IsNotFound(err) {
+		return fmt.Errorf("failed to get cnr from lister %s: %v", node.Name, err)
+	}
 	if errors.IsNotFound(err) {
 		cnr = &apis.CustomNodeResource{
 			ObjectMeta: metav1.ObjectMeta{
@@ -308,6 +311,12 @@ func (cl *CNRLifecycle) updateOrCreateCNR(node *corev1.Node) error {
 		if err != nil && !errors.IsAlreadyExists(err) {
 			return fmt.Errorf("failed to create cnr %s: %v", cnr.Name, err)
 		}
+		if errors.IsAlreadyExists(err) {
+			cnr, err = cl.client.InternalClient.NodeV1alpha1().CustomNodeResources().Get(cl.ctx, node.Name, metav1.GetOptions{ResourceVersion: "0"})
+			if err != nil {
+				return fmt.Errorf("failed to get cnr from apiserver %s: %v", node.Name, err)
+			}
+		}
 	}
 
 	newCNR := cnr.DeepCopy()