From 066c5028f75904b15e23758ef0789b96fc85c5b0 Mon Sep 17 00:00:00 2001 From: Mariana Mihova <10135329+marianan@users.noreply.github.com> Date: Mon, 9 Jan 2023 14:17:47 -0800 Subject: [PATCH] Update default Edge runtime version to 1.4 LTS (#651) * Update default Edge runtime version to 1.4 LTS * Simulated temperature module to 1.4 * Remove rc from version tag --- CHANGELOG.md | 4 ++++ README.md | 3 +++ assets/solution/deployment.template.json | 4 ++-- package.json | 10 ++++------ src/common/version.ts | 12 ++++-------- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c6731f3..4ad0b545 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Change Log +## 1.25.11 - 2022-12-12 +### Changed +* Update default Edge runtime version to 1.4 LTS + ## 1.25.10 - 2022-11-03 ### Changed * Snap to the latest simulator version 0.14.18 diff --git a/README.md b/README.md index 76430fc8..85993e11 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,9 @@ The Azure IoT Visual Studio Code extension is in a maintenance mode. Please see ![Added](images/multipleplatform.gif) +## What's New (v1.25.11) +* Update default Edge runtime version to 1.4 LTS + ## What's New (v1.25.10) * Snap to the latest simulator version 0.14.18 diff --git a/assets/solution/deployment.template.json b/assets/solution/deployment.template.json index eac9d158..695f6f1c 100644 --- a/assets/solution/deployment.template.json +++ b/assets/solution/deployment.template.json @@ -16,7 +16,7 @@ "edgeAgent": { "type": "docker", "settings": { - "image": "mcr.microsoft.com/azureiotedge-agent:1.2", + "image": "mcr.microsoft.com/azureiotedge-agent:1.4", "createOptions": {} } }, @@ -25,7 +25,7 @@ "status": "running", "restartPolicy": "always", "settings": { - "image": "mcr.microsoft.com/azureiotedge-hub:1.2", + "image": "mcr.microsoft.com/azureiotedge-hub:1.4", "createOptions": { "HostConfig": { "PortBindings": { diff --git a/package.json b/package.json index fbedecc5..ae380c33 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "azure-iot-edge", "displayName": "Azure IoT Edge", "description": "This extension is now a part of Azure IoT Tools extension pack. We highly recommend installing Azure IoT Tools to get full capabilities for Azure IoT development. Develop, deploy, debug, and manage your IoT Edge solution.", - "version": "1.25.10", + "version": "1.25.11", "publisher": "vsciot-vscode", "aiKey": "95b20d64-f54f-4de3-8ad5-165a75a6c6fe", "icon": "logo.png", @@ -209,7 +209,7 @@ "properties": { "azure-iot-edge.version.tempSensor": { "type": "string", - "default": "1.0", + "default": "1.4", "description": "Set the tempSensor image version, which will be referenced in deployment manifest." }, "azure-iot-edge.version.cmodule": { @@ -293,15 +293,13 @@ "azure-iot-edge.version.supported.edgeRuntime": { "type": "array", "default": [ - "1.0", - "1.1", - "1.2" + "1.4" ], "description": "List of supported Edge Runtime images versions" }, "azure-iot-edge.version.default.edgeRuntime": { "type": "string", - "default": "1.2", + "default": "1.4", "description": "Set the edgeAgent and edgeHub images version, which will be referenced in deployment manifest." }, "azure-iot-edge.3rdPartyModuleTemplates": { diff --git a/src/common/version.ts b/src/common/version.ts index 256205f2..09a6d442 100644 --- a/src/common/version.ts +++ b/src/common/version.ts @@ -14,15 +14,11 @@ export class Versions { public static getSchemaVersionMap(): Map { // Mapping between Edge Runtime version and module schema version const edgeAgentSchemaVerMap: Map = new Map([ - ["1.0", "1.0"], - ["1.1", "1.1"], - ["1.2", "1.1"], + ["1.4", "1.4"], ]); const edgeHubSchemaVerMap: Map = new Map([ - ["1.0", "1.0"], - ["1.1", "1.1"], - ["1.2", "1.1"], + ["1.4", "1.4"], ]); const verMap: Map = new Map(); @@ -72,7 +68,7 @@ export class Versions { } public static tempSensorVersion(): string { - return Versions.getValue(Constants.versionTempSensor, "1.0") as string; + return Versions.getValue(Constants.versionTempSensor, "1.4") as string; } public static updateSystemModuleImageVersion(templateJson: any, moduleName: string, versionMap: Map) { @@ -108,7 +104,7 @@ export class Versions { } private static getDefaultEdgeRuntimeVersion(): string { - return Versions.getValue(Constants.versionDefaultEdgeRuntime, "1.0") as string; + return Versions.getValue(Constants.versionDefaultEdgeRuntime, "1.4") as string; } private static getNewImageVersionJson(input: ImageJson, versionMap: Map): string {