From 5fa17d4d31111018ed487b37c856e03d3f7ec93a Mon Sep 17 00:00:00 2001 From: Stephen Levine Date: Mon, 3 Feb 2025 12:43:20 -0500 Subject: [PATCH] [teleport-update] Warn instead of erroring when disabling the deprecated updater (#51759) * Warn instead of erroring when disabling old updater * Update lib/service/service.go * Update lib/service/service.go --- lib/service/service.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/service/service.go b/lib/service/service.go index a5e2135e1e9..63757e9dfb5 100644 --- a/lib/service/service.go +++ b/lib/service/service.go @@ -1288,7 +1288,8 @@ func NewTeleport(cfg *servicecfg.Config) (*TeleportProcess, error) { return nil, trace.Wrap(err) } if err := driver.ForceNop(process.ExitContext()); err != nil { - return nil, trace.Wrap(err) + process.logger.WarnContext(process.ExitContext(), "Unable to disable the teleport-upgrade command provided by the deprecated teleport-ent-updater package.", "error", err) + process.logger.WarnContext(process.ExitContext(), "If the deprecated teleport-ent-updater package is installed, please ensure /etc/teleport-upgrade.d/schedule contains 'nop'.") } case types.UpgraderKindSystemdUnit: process.RegisterFunc("autoupdates.endpoint.export", func() error {