Skip to content

Commit

Permalink
Prepare release 1.0.6 (#313)
Browse files Browse the repository at this point in the history
* Prepare the release

* Update documentation
  • Loading branch information
Mandur committed Jul 9, 2021
1 parent f263b3f commit 0ea904d
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ jobs:
REGION: "EU"
FACADE_SERVER_URL: "https://${{ needs.env_var.outputs.AZURE_FUNCTIONAPP_NAME }}.azurewebsites.net/api/"
FACADE_AUTH_CODE: ${{ secrets.FUNCTION_AUTH_CODE }}
EDGE_AGENT_VERSION: 1.2.0
EDGE_HUB_VERSION: 1.2.0
EDGE_AGENT_VERSION: 1.2.2
EDGE_HUB_VERSION: 1.2.2
EDGEHUB_OPTIMIZEFORPERFORMANCE: false
EDGEHUB_MQTTSETTINGS_ENABLED: false
EDGEHUB_HTTPSETTINGS_ENABLED: false
Expand Down
10 changes: 10 additions & 0 deletions Docs/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,16 @@ Log in to the gateway and use `sudo docker logs LoRaWanNetworkSrvModule -f` to f
| LOG_TO_CONSOLE | true | Log to docker logs (default if omitted) |
| | false | Does not log to docker logs |


## Local Processing and Routing

By default the network server does not use the local edge queue (edgeHub), sending directly messages to IoT Hub. If you need to do local processing, please set the following setting to true on the `LoRaWanNetworkSrvModule`.

| Variable | Value | Explanation |
|----------------|-------|---------------------------------------------------------------|
| ENABLE_GATEWAY | true | Messages go to edgeHub and then to IoT Hub |
| | false | Messages go directly to IoT Hub, skipping local edgeHub Queue |

## Customize the solution & Deep dive

Have a look at the [LoRaEngine folder](/LoRaEngine) for more in details explanation.
Expand Down
21 changes: 21 additions & 0 deletions Docs/upgrade.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
# Upgrade LoRaWAN to a new version

## Release 1.0.6

> Note that this version switch IoT Edge to use version 1.2 of IoT Edge that include major changes on the edge. Please follow this [documentation](https://docs.microsoft.com/azure/iot-edge/how-to-update-iot-edge?view=iotedge-2020-11&tabs=linux) to upgrade IoT Edge to 1.2.
To update from version 1.0.5, 1.0.4 or 1.0.3 you can follow the below instructions. If you want to update manually from a version prior to 1.0.3, please refer to the instructions in the [Release 1.0.3](#Release-1.0.3) section below.

### Updating from 1.0.5, 1.0.4 or 1.0.3

|Deployment Module|Image URI|
|-|-|
|LoRaWanNetworkSrvModule|loraedge/lorawannetworksrvmodule:1.0.6|
|LoRaWanPktFwdModule|loraedge/lorawanpktfwdmodule:1.0.6|

On the same `Set Modules` page, also update your current edge version to 1.2.2 by pressing the `Configure Advanced Edge Runtime settings` button. On the menu, ensure the edge hub and edge agent are using version 1.2.2 by respectively setting image name to mcr.microsoft.com/azureiotedge-hub:1.2.2 and mcr.microsoft.com/azureiotedge-agent:1.2.2.

### Updating the Azure Function Facade

There are no changes on the Azure function therefore you can use the same versioning as Release 1.0.5 just below.

## Release 1.0.5

To update from version 1.0.4 or 1.0.3 you can follow the below instructions. If you want to update manually from a version prior to 1.0.3, please refer to the instructions in the [Release 1.0.3](#Release-1.0.3) section below.

### Updating from 1.0.4 or 1.0.3

|Deployment Module|Image URI|
|-|-|
|LoRaWanNetworkSrvModule|loraedge/lorawannetworksrvmodule:1.0.5|
Expand Down
4 changes: 2 additions & 2 deletions LoRaEngine/deployment.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"edgeAgent": {
"type": "docker",
"settings": {
"image": "mcr.microsoft.com/azureiotedge-agent:1.2.0",
"image": "mcr.microsoft.com/azureiotedge-agent:1.2.2",
"createOptions": ""
}
},
Expand All @@ -30,7 +30,7 @@
"status": "running",
"restartPolicy": "always",
"settings": {
"image": "mcr.microsoft.com/azureiotedge-hub:1.2.0",
"image": "mcr.microsoft.com/azureiotedge-hub:1.2.2",
"createOptions": {
"HostConfig": {
"PortBindings": {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

[![Build Status](https://dev.azure.com/epicstuff/Azure%20IoT%20Edge%20LoRaWAN%20Starter%20Kit/_apis/build/status/CI-MultiGateway?branchName=master)](https://dev.azure.com/epicstuff/Azure%20IoT%20Edge%20LoRaWAN%20Starter%20Kit/_build/latest?definitionId=62&branchName=master)
[![LoRa CI](https://github.com/Azure/iotedge-lorawan-starterkit/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/Azure/iotedge-lorawan-starterkit/actions/workflows/ci.yaml)
[![LoRa CI](https://github.com/Azure/iotedge-lorawan-starterkit/actions/workflows/ci.yaml/badge.svg?branch=dev)](https://github.com/Azure/iotedge-lorawan-starterkit/actions/workflows/ci.yaml)

# Azure IoT Edge LoRaWAN Starter Kit
Expand Down
8 changes: 4 additions & 4 deletions Template/deviceConfiguration.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"edgeAgent": {
"type": "docker",
"settings": {
"image": "mcr.microsoft.com/azureiotedge-agent:1.0.9.5",
"image": "mcr.microsoft.com/azureiotedge-agent:1.2.2",
"createOptions": "{}"
}
},
"edgeHub": {
"type": "docker",
"settings": {
"image": "mcr.microsoft.com/azureiotedge-hub:1.0.9.5",
"image": "mcr.microsoft.com/azureiotedge-hub:1.2.2",
"createOptions": "{ \"HostConfig\": { \"PortBindings\": {\"8883/tcp\": [ {\"HostPort\": \"8883\" } ], \"443/tcp\": [ { \"HostPort\": \"443\" } ], \"5671/tcp\": [ { \"HostPort\": \"5671\" }] } }}"
},
"env": {
Expand All @@ -46,7 +46,7 @@
"LoRaWanNetworkSrvModule": {
"type": "docker",
"settings": {
"image": "loraedge/lorawannetworksrvmodule:1.0.5",
"image": "loraedge/lorawannetworksrvmodule:1.0.6",
"createOptions": "{\"ExposedPorts\": { \"1680/udp\": {}}, \"HostConfig\": { \"PortBindings\": {\"1680/udp\": [ { \"HostPort\": \"1680\", \"HostIp\":\"172.17.0.1\" } ]}}}"
},
"version": "1.0",
Expand All @@ -64,7 +64,7 @@
"LoRaWanPktFwdModule": {
"type": "docker",
"settings": {
"image": "loraedge/lorawanpktfwdmodule:1.0.5",
"image": "loraedge/lorawanpktfwdmodule:1.0.6",
"createOptions": " {\"HostConfig\": {\"NetworkMode\": \"host\", \"Privileged\": true }, \"NetworkingConfig\": {\"EndpointsConfig\": {\"host\": {} }}}"
},
"env": {
Expand Down

0 comments on commit 0ea904d

Please sign in to comment.