[v14] Update updater inventory reporting after removal

lib/automaticupgrades/config.go

@@ -17,13 +17,15 @@ limitations under the License.
 package automaticupgrades
 
 import (
+	"bytes"
 	"context"
 	"os"
 	"os/exec"
 	"strconv"
-	"strings"
 
 	log "github.com/sirupsen/logrus"
+
+	"github.com/gravitational/teleport/lib/automaticupgrades/version"
 )
 
 const (
@@ -76,11 +78,14 @@ func GetUpgraderVersion(ctx context.Context) string {
 		out, err := exec.CommandContext(ctx, teleportUpgradeScript, "version").Output()
 		if err != nil {
 			log.WithError(err).Debug("Failed to exec /usr/sbin/teleport-upgrade version command.")
-		} else {
-			if version := strings.TrimSpace(string(out)); version != "" {
-				return version
-			}
+			return ""
+		}
+		ver, err := version.EnsureSemver(string(bytes.TrimSpace(out)))
+		if err != nil {
+			log.WithError(err).Debug("Unexpected teleport-upgrade version.")
+			return ""
 		}
+		return ver
 	}
 	return os.Getenv(EnvUpgraderVersion)
 }

lib/service/service.go

@@ -1038,6 +1038,9 @@ func NewTeleport(cfg *servicecfg.Config) (*TeleportProcess, error) {
 
 	upgraderKind := os.Getenv(automaticupgrades.EnvUpgrader)
 	upgraderVersion := automaticupgrades.GetUpgraderVersion(process.GracefulExitContext())
+	if upgraderVersion == "" {
+		upgraderKind = ""
+	}
 
 	// Instances deployed using the AWS OIDC integration are automatically updated
 	// by the proxy. The instance heartbeat should properly reflect that.