15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-25 17:12:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: error update playbook (#2660) 

Signed-off-by: joyceliu <joyceliu@yunify.com>
This commit is contained in:
liujian 2025-07-18 10:28:34 +08:00 committed by GitHub
parent d2e8e3699a
commit 873e4dda44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/executor/playbook_executor.go
View File

@ -64,8 +64,9 @@ type playbookExecutor struct {
// Exec playbook. covert playbook to block and executor it.
func (e playbookExecutor) Exec(ctx context.Context) (retErr error) {
old := e.playbook.DeepCopy()
defer func() {
e.syncStatus(ctx, retErr)
e.syncStatus(ctx, old, retErr)
}()
fmt.Fprint(e.logOutput, `
@ -122,8 +123,7 @@ func (e playbookExecutor) Exec(ctx context.Context) (retErr error) {
return nil
}
func (e playbookExecutor) syncStatus(ctx context.Context, err error) {
cp := e.playbook.DeepCopy()
func (e playbookExecutor) syncStatus(ctx context.Context, old *kkcorev1.Playbook, err error) {
if err != nil {
e.playbook.Status.Phase = kkcorev1.PlaybookPhaseFailed
e.playbook.Status.FailureReason = kkcorev1.PlaybookFailedReasonTaskFailed
@ -146,7 +146,7 @@ func (e playbookExecutor) syncStatus(ctx context.Context, err error) {
}
// update playbook status
if err := e.client.Status().Patch(ctx, e.playbook, ctrlclient.MergeFrom(cp)); err != nil {
if err := e.client.Status().Patch(ctx, e.playbook, ctrlclient.MergeFrom(old)); err != nil {
klog.ErrorS(err, "update playbook error", "playbook", ctrlclient.ObjectKeyFromObject(e.playbook))
}
}