Skip to content

Commit

Permalink
Update default Edge runtime version to 1.4 LTS (#651)
Browse files Browse the repository at this point in the history
* Update default Edge runtime version to 1.4 LTS

* Simulated temperature module to 1.4

* Remove rc from version tag
  • Loading branch information
marianan authored Jan 9, 2023
1 parent e459b2e commit 066c502
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 16 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions assets/solution/deployment.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
}
},
Expand All @@ -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": {
Expand Down
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down
12 changes: 4 additions & 8 deletions src/common/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,11 @@ export class Versions {
public static getSchemaVersionMap(): Map<string, string> {
// Mapping between Edge Runtime version and module schema version
const edgeAgentSchemaVerMap: Map<string, string> = new Map([
["1.0", "1.0"],
["1.1", "1.1"],
["1.2", "1.1"],
["1.4", "1.4"],
]);

const edgeHubSchemaVerMap: Map<string, string> = new Map([
["1.0", "1.0"],
["1.1", "1.1"],
["1.2", "1.1"],
["1.4", "1.4"],
]);

const verMap: Map<string, string> = new Map();
Expand Down Expand Up @@ -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<string, string>) {
Expand Down Expand Up @@ -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, string>): string {
Expand Down

0 comments on commit 066c502

Please sign in to comment.