From 0568d69e93cb0b8d6b365dbb1714f71a55d1259a Mon Sep 17 00:00:00 2001 From: Damon Barry Date: Mon, 12 Dec 2022 19:24:55 -0800 Subject: [PATCH] Prepare for release 1.1.19 (#6812) --- CHANGELOG.md | 19 +++++++++++++++++++ edge-modules/metrics-collector/CHANGELOG.md | 5 +++++ .../src/config/versionInfo.json | 2 +- .../EdgeModule.cs | 5 ++++- versionInfo.json | 2 +- 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58b267706be..31ad7d39181 100644 --- 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 index 975a2d0e59b..b06cb2534fd 100644 --- 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 index 5d1e397d7a2..5052556da31 100644 --- 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 index 0c02139773f..f50ff34b894 100644 --- a/test/Microsoft.Azure.Devices.Edge.Test.Common/EdgeModule.cs +++ b/test/Microsoft.Azure.Devices.Edge.Test.Common/EdgeModule.cs @@ -180,6 +180,8 @@ Dictionary 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); @@ -187,7 +189,8 @@ Dictionary ProcessJson(object obj, string rootPath) { string[] remove = labels .Children() - .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 index e4a1fb02461..e96271d85d0 100644 --- a/versionInfo.json +++ b/versionInfo.json @@ -1,5 +1,5 @@ { - "version": "1.1.18", + "version": "1.1.19", "build": "BUILDNUMBER", "commit": "COMMITID" }