From 9f0f03251a1bd0449f4e7e7ab5699e4771fbaa56 Mon Sep 17 00:00:00 2001 From: Yuhang Wei Date: Fri, 18 Aug 2023 17:19:53 +0800 Subject: [PATCH 1/2] KubeOS: update version Signed-off-by: Yuhang Wei --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7dea76ed..ee90284c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 +1.0.4 -- Gitee From a01e5ebfd9c314b840eb3a652cda71e33954a403 Mon Sep 17 00:00:00 2001 From: Yuhang Wei Date: Wed, 16 Aug 2023 22:41:44 +0800 Subject: [PATCH 2/2] KubeOS: modify code for clean code Signed-off-by: Yuhang Wei --- cmd/agent/server/config.go | 4 ++++ cmd/operator/controllers/os_controller.go | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmd/agent/server/config.go b/cmd/agent/server/config.go index 20af2673..a96370da 100644 --- a/cmd/agent/server/config.go +++ b/cmd/agent/server/config.go @@ -317,6 +317,10 @@ func createConfigPath(configPath string) error { if err != nil { return err } + err = f.Chmod(defaultKernelConPermission) + if err != nil { + return err + } f.Close() return nil } diff --git a/cmd/operator/controllers/os_controller.go b/cmd/operator/controllers/os_controller.go index 620739be..e152681b 100644 --- a/cmd/operator/controllers/os_controller.go +++ b/cmd/operator/controllers/os_controller.go @@ -94,7 +94,11 @@ func Reconcile(ctx context.Context, r common.ReadStatusWriter, req ctrl.Request) func (r *OSReconciler) SetupWithManager(mgr ctrl.Manager) error { if err := mgr.GetFieldIndexer().IndexField(context.Background(), &upgradev1.OSInstance{}, values.OsiStatusName, func(rawObj client.Object) []string { - osi := rawObj.(*upgradev1.OSInstance) + osi, ok := rawObj.(*upgradev1.OSInstance) + if !ok { + log.Error(nil, "failed to convert to osInstance") + return []string{} + } return []string{osi.Spec.NodeStatus} }); err != nil { return err -- Gitee