Prepare for release 1.1.19 (#6812)

Azure · Dec 13, 2022 · 0568d69 · 0568d69
1 parent 3c0b5e1
commit 0568d69
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# 1.1.19 (2022-12-13-2022)
+
+This is the final patch release of 1.1. With this release, [IoT Edge 1.1 LTS has ended](https://docs.microsoft.com/lifecycle/products/azure-iot-edge). We recommend updating to [1.4 LTS](https://azure.microsoft.com/updates/generally-available-iot-edge-14-lts/) as soon as possible.
+
+## Edge Agent
+### Bug fixes
+* Update Newtonsoft.Json, Microsoft.AspNetCore.Http, and Microsoft.AspNetCore.Server.Kestrel.Core to patch security vulnerabilities [3c0b5e1](https://github.com/Azure/iotedge/commit/3c0b5e174ccc9fa0890255dec26858e6cc3b6338)
+
+## Edge Hub
+### Bug fixes
+* Update Newtonsoft.Json, Microsoft.AspNetCore.Http, and Microsoft.AspNetCore.Server.Kestrel.Core to patch security vulnerabilities [3c0b5e1](https://github.com/Azure/iotedge/commit/3c0b5e174ccc9fa0890255dec26858e6cc3b6338)
+
+## Base image updates
+The following Docker images were updated because their base images changed:
+   * azureiotedge-agent
+   * azureiotedge-hub
+   * azureiotedge-simulated-temperature-sensor
+   * azureiotedge-diagnostics
+
 # 1.1.18 (2022-11-08)
 
 ## Edge Hub

diff --git a/edge-modules/metrics-collector/CHANGELOG.md b/edge-modules/metrics-collector/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.0.12 (2022-12-13)
+
+The following Docker images were updated because their base images changed:
+* azureiotedge-metrics-collector
+
 # 1.0.11 (2022-11-08)
 ### Bug Fixes
 * Replace instances of Console.WriteLine with standard logging pattern [e33191b](https://github.com/Azure/iotedge/commit/e33191b775523bed32e30a34cc8f4bbb257dfe02)

diff --git a/edge-modules/metrics-collector/src/config/versionInfo.json b/edge-modules/metrics-collector/src/config/versionInfo.json
@@ -1,3 +1,3 @@
 {
-    "version": "1.0.11"
+    "version": "1.0.12"
 }
diff --git a/test/Microsoft.Azure.Devices.Edge.Test.Common/EdgeModule.cs b/test/Microsoft.Azure.Devices.Edge.Test.Common/EdgeModule.cs
@@ -180,14 +180,17 @@ Dictionary<string, JValue> ProcessJson(object obj, string rootPath)
                 // Remove "net.azure-devices.edge.*" labels because they can be deeply nested
                 // stringized JSON, making them difficult to compare. Besides, they're created by
                 // edge agent and iotedged for internal use; they're not related to the deployment.
+                // Remove "org.opencontainers.image.*" labels because we're not expecting them but
+                // also we don't care about them.
                 foreach (var key in agentKeys)
                 {
                     JObject createOptions = JObject.Parse((string)result[key].Value);
                     if (createOptions.TryGetValue("Labels", out JToken labels))
                     {
                         string[] remove = labels
                             .Children<JProperty>()
-                            .Where(label => label.Name.StartsWith("net.azure-devices.edge."))
+                            .Where(label => label.Name.StartsWith("net.azure-devices.edge.")
+                                || label.Name.StartsWith("org.opencontainers.image."))
                             .Select(label => label.Name)
                             .ToArray();
                         foreach (var name in remove)

diff --git a/versionInfo.json b/versionInfo.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.18",
+  "version": "1.1.19",
   "build": "BUILDNUMBER",
   "commit": "COMMITID"
 }