From 89ab01a08247765533c0790dbd476855dd6a41ec Mon Sep 17 00:00:00 2001
From: "flowzone-app[bot]"
 <124931076+flowzone-app[bot]@users.noreply.github.com>
Date: Thu, 7 Nov 2024 13:34:08 +0000
Subject: [PATCH] v16.7.5

---
 .versionbot/CHANGELOG.yml | 29 +++++++++++++++++++++++++++++
 CHANGELOG.md              |  5 +++++
 VERSION                   |  2 +-
 balena.yml                |  2 +-
 package-lock.json         |  4 ++--
 package.json              |  4 ++--
 6 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 945b0a8e..b65b266d 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,32 @@
+- commits:
+    - subject: Delete apps not in target from db by appUuid instead of appId
+      hash: 3d3f659f1616cc291824d1f46da08583c138f39c
+      body: >
+        Resolve an issue in balenaMachine instances that were installed at
+        <v14.1.0,
+
+        in which a Supervisor app with random UUID is kept in the target db due
+        to its appId
+
+        being the same, even after the BM instance has upgraded to v14.1.0 which
+        patches
+
+        the correct reserved Supervisor app UUIDs in. This results in two
+        Supervisors running
+
+        on devices under the BM instance which persists after BM upgrade.
+      footer:
+        See: https://balena.fibery.io/search/T7ozi#Inputs/Pattern/Two-supervisors-are-running-on-device-3370
+        see: https://balena.fibery.io/search/T7ozi#Inputs/Pattern/Two-supervisors-are-running-on-device-3370
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Christina Ying Wang <christina@balena.io>
+        signed-off-by: Christina Ying Wang <christina@balena.io>
+      author: Christina Ying Wang
+      nested: []
+  version: 16.7.5
+  title: ""
+  date: 2024-11-07T13:34:05.062Z
 - commits:
     - subject: Update express to v4.20.0 [SECURITY]
       hash: f2aaf7372d0716e3b62118ed3102a7eac0f169a5
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d87c751..c5ead686 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v16.7.5
+## (2024-11-07)
+
+* Delete apps not in target from db by appUuid instead of appId [Christina Ying Wang]
+
 # v16.7.4
 ## (2024-10-28)
 
diff --git a/VERSION b/VERSION
index 2539d1f6..fec9b025 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.7.4
\ No newline at end of file
+16.7.5
\ No newline at end of file
diff --git a/balena.yml b/balena.yml
index 6123bea4..ca734bef 100644
--- a/balena.yml
+++ b/balena.yml
@@ -2,6 +2,6 @@ name: balena-supervisor
 description: 'Balena Supervisor: balena''s agent on devices.'
 joinable: false
 type: sw.application
-version: 16.7.4
+version: 16.7.5
 provides:
   - slug: sw.compose.long-volume-syntax
diff --git a/package-lock.json b/package-lock.json
index e7239d78..f990c0ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "balena-supervisor",
-  "version": "16.7.4",
+  "version": "16.7.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "balena-supervisor",
-      "version": "16.7.4",
+      "version": "16.7.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@balena/systemd": "^0.5.0",
diff --git a/package.json b/package.json
index 72b9cb17..58629012 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "balena-supervisor",
   "description": "This is balena's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as the balena API informs it to.",
-  "version": "16.7.4",
+  "version": "16.7.5",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -135,6 +135,6 @@
     "yargs": "^17.7.2"
   },
   "versionist": {
-    "publishedAt": "2024-10-28T14:40:43.210Z"
+    "publishedAt": "2024-11-07T13:34:05.582Z"
   }
 }