From 6821832e311148ded58d774837ed9502aa036354 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Mon, 27 Nov 2023 14:36:08 -0800 Subject: [PATCH] Don't set upgrade details when creating upgrade marker --- internal/pkg/agent/application/upgrade/step_mark.go | 3 +-- internal/pkg/agent/application/upgrade/upgrade.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/internal/pkg/agent/application/upgrade/step_mark.go b/internal/pkg/agent/application/upgrade/step_mark.go index b5743582317..1c9d062d01b 100644 --- a/internal/pkg/agent/application/upgrade/step_mark.go +++ b/internal/pkg/agent/application/upgrade/step_mark.go @@ -106,7 +106,7 @@ func newMarkerSerializer(m *UpdateMarker) *updateMarkerSerializer { } // markUpgrade marks update happened so we can handle grace period -func (u *Upgrader) markUpgrade(_ context.Context, log *logger.Logger, hash string, action *fleetapi.ActionUpgrade, upgradeDetails *details.Details) error { +func (u *Upgrader) markUpgrade(_ context.Context, log *logger.Logger, hash string, action *fleetapi.ActionUpgrade) error { prevVersion := release.Version() prevHash := release.Commit() if len(prevHash) > hashLen { @@ -119,7 +119,6 @@ func (u *Upgrader) markUpgrade(_ context.Context, log *logger.Logger, hash strin PrevVersion: prevVersion, PrevHash: prevHash, Action: action, - Details: upgradeDetails, } markerBytes, err := yaml.Marshal(newMarkerSerializer(marker)) diff --git a/internal/pkg/agent/application/upgrade/upgrade.go b/internal/pkg/agent/application/upgrade/upgrade.go index 4e9eb72bacd..1dd5845b63a 100644 --- a/internal/pkg/agent/application/upgrade/upgrade.go +++ b/internal/pkg/agent/application/upgrade/upgrade.go @@ -188,8 +188,7 @@ func (u *Upgrader) Upgrade(ctx context.Context, version string, sourceURI string return nil, err } - det.SetState(details.StateWatching) - if err := u.markUpgrade(ctx, u.log, newHash, action, det); err != nil { + if err := u.markUpgrade(ctx, u.log, newHash, action); err != nil { u.log.Errorw("Rolling back: marking upgrade failed", "error.message", err) rollbackInstall(ctx, u.log, newHash) return nil, err