From f40d2a47ad929047df2d7ddc3b97a970579ccabd Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 May 2024 11:36:46 +0300 Subject: [PATCH 1/2] [#236] CUA allow rollback when owner denies update Signed-off-by: Dimitar Dimitrov --- containerm/updateagent/update_operation.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/containerm/updateagent/update_operation.go b/containerm/updateagent/update_operation.go index 43fcc95..bb7c4c3 100644 --- a/containerm/updateagent/update_operation.go +++ b/containerm/updateagent/update_operation.go @@ -215,9 +215,10 @@ var baselineCommandHandlers = map[types.CommandType]struct { commandHandler: activate, }, types.CommandRollback: { - expectedBaselineStatus: []types.StatusType{types.BaselineStatusActivationFailure, types.BaselineStatusActivationSuccess}, - baselineFailureStatus: types.BaselineStatusRollbackFailure, - commandHandler: rollback, + expectedBaselineStatus: []types.StatusType{types.BaselineStatusDownloadSuccess, types.BaselineStatusUpdateSuccess, + types.BaselineStatusActivationFailure, types.BaselineStatusActivationSuccess}, + baselineFailureStatus: types.BaselineStatusRollbackFailure, + commandHandler: rollback, }, types.CommandCleanup: { baselineFailureStatus: types.BaselineStatusCleanup, From 248d4a0487c3db97251aafb6f4c5d7e78f7f7f75 Mon Sep 17 00:00:00 2001 From: Dimitar Dimitrov Date: Mon, 13 May 2024 11:43:13 +0300 Subject: [PATCH 2/2] Remove redundant dump Signed-off-by: Dimitar Dimitrov --- containerm/mgr/mgr_internal_init.go | 1 - 1 file changed, 1 deletion(-) diff --git a/containerm/mgr/mgr_internal_init.go b/containerm/mgr/mgr_internal_init.go index db9338e..3c545b5 100644 --- a/containerm/mgr/mgr_internal_init.go +++ b/containerm/mgr/mgr_internal_init.go @@ -47,7 +47,6 @@ func newContainerMgr(metaPath string, execPath string, defaultCtrsStopTimeout ti restartCtrsMgrCache: newRestartMgrCache(), containerRepository: &ctrRepository, } - fmt.Println("mgr:", defaultCtrsStopTimeout.String()) ctrClient.SetContainerExitHooks(manager.exitedAndRelease) return manager, nil