38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
From 657e3e5c9bcc0fac3a079f51842d59a9e6b5e163 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yuhang Wei <weiyuhang3@huawei.com>
|
||
|
|
Date: Mon, 14 Aug 2023 09:53:16 +0800
|
||
|
|
Subject: [PATCH 10/17] KubeOS: fix proxy requeue bug
|
||
|
|
|
||
|
|
fix the bug that proxy may work after resuming normal from error status
|
||
|
|
|
||
|
|
Signed-off-by: Yuhang Wei <weiyuhang3@huawei.com>
|
||
|
|
---
|
||
|
|
cmd/proxy/controllers/os_controller.go | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/cmd/proxy/controllers/os_controller.go b/cmd/proxy/controllers/os_controller.go
|
||
|
|
index 09d61c0..30f9839 100644
|
||
|
|
--- a/cmd/proxy/controllers/os_controller.go
|
||
|
|
+++ b/cmd/proxy/controllers/os_controller.go
|
||
|
|
@@ -94,7 +94,7 @@ func (r *OSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Re
|
||
|
|
if err = r.refreshNode(ctx, &node, osInstance, osCr.Spec.SysConfigs.Version, values.SysConfigName); err != nil {
|
||
|
|
return values.RequeueNow, err
|
||
|
|
}
|
||
|
|
- return values.RequeueNow, nil
|
||
|
|
+ return values.Requeue, nil
|
||
|
|
}
|
||
|
|
if configOps == values.UpdateConfig {
|
||
|
|
osInstance.Spec.SysConfigs = osCr.Spec.SysConfigs
|
||
|
|
@@ -124,7 +124,7 @@ func (r *OSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Re
|
||
|
|
values.UpgradeConfigName); err != nil {
|
||
|
|
return values.RequeueNow, err
|
||
|
|
}
|
||
|
|
- return values.RequeueNow, nil
|
||
|
|
+ return values.Requeue, nil
|
||
|
|
}
|
||
|
|
if err := r.setConfig(ctx, osInstance, values.UpgradeConfigName); err != nil {
|
||
|
|
return values.RequeueNow, err
|
||
|
|
--
|
||
|
|
2.39.0
|
||
|
|
|