Skip to content

Commit

Permalink
Merge pull request #218 from tranchitella/mender-3.6.3
Browse files Browse the repository at this point in the history
Upgrade to Mender version `3.6.3`.
  • Loading branch information
tranchitella authored Nov 2, 2023
2 parents 10f0505 + fafa956 commit a4fce09
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
16 changes: 8 additions & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,14 +268,14 @@ test:helm_chart_upgrade_from_previous_lts_to_current_lts:
mender/mender --version ${MENDER_LTS_HELM_VERSION:-5.0.1} || exit 3;
- bash tests/test-001-wait-for-pods-to-be-ready.sh
- |
echo "INFO - installing mender tag ${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.2}"
echo "INFO - installing mender tag ${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.3}"
helm upgrade -i mender \
-f mender/values.yaml \
-f tests/keys.yaml \
-f tests/values-helmci.yaml \
--wait \
--timeout=${HELM_UPGRADE_TIMEOUT:-15m} \
--set global.image.tag="${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.2}" \
--set global.image.tag="${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.3}" \
--set global.image.username=${REGISTRY_MENDER_IO_USERNAME} \
--set global.image.password="${REGISTRY_MENDER_IO_PASSWORD}" \
--set global.s3.AWS_ACCESS_KEY_ID="${MINIO_accessKey}" \
Expand Down Expand Up @@ -335,14 +335,14 @@ test:helm_chart_upgrade_from_previous_release_to_current_lts:
mender/mender --version ${MENDER_LTS_HELM_VERSION:-5.0.1} || exit 3;
- bash tests/test-001-wait-for-pods-to-be-ready.sh
- |
echo "INFO - installing mender tag ${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.2}"
echo "INFO - installing mender tag ${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.3}"
helm upgrade -i mender \
-f mender/values.yaml \
-f tests/keys.yaml \
-f tests/values-helmci.yaml \
--wait \
--timeout=${HELM_UPGRADE_TIMEOUT:-15m} \
--set global.image.tag="${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.2}" \
--set global.image.tag="${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.3}" \
--set global.image.username=${REGISTRY_MENDER_IO_USERNAME} \
--set global.image.password="${REGISTRY_MENDER_IO_PASSWORD}" \
--set global.s3.AWS_ACCESS_KEY_ID="${MINIO_accessKey}" \
Expand Down Expand Up @@ -386,15 +386,15 @@ test:helm_chart_upgrade_from_current_lts_to_current_release:
script:
- tests/ci-make-deps.sh
- |
echo "INFO - installing mender tag ${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.2}"
echo "INFO - installing mender tag ${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.3}"
source ./tests/variables.sh
helm upgrade -i mender \
-f mender/values.yaml \
-f tests/keys.yaml \
-f tests/values-helmci.yaml \
--wait \
--timeout=${HELM_UPGRADE_TIMEOUT:-15m} \
--set global.image.tag="${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.2}" \
--set global.image.tag="${MENDER_CURRENT_LTS_RELEASE_TAG:-mender-3.6.3}" \
--set global.image.username=${REGISTRY_MENDER_IO_USERNAME} \
--set global.image.password="${REGISTRY_MENDER_IO_PASSWORD}" \
--set global.s3.AWS_ACCESS_KEY_ID="${MINIO_accessKey}" \
Expand All @@ -403,14 +403,14 @@ test:helm_chart_upgrade_from_current_lts_to_current_release:
mender/mender || exit 3;
- bash tests/test-001-wait-for-pods-to-be-ready.sh
- |
echo "INFO - installing mender tag ${MENDER_CURRENT_RELEASE_TAG:-mender-3.6.2}"
echo "INFO - installing mender tag ${MENDER_CURRENT_RELEASE_TAG:-mender-3.6.3}"
helm upgrade -i mender \
-f mender/values.yaml \
-f tests/keys.yaml \
-f tests/values-helmci.yaml \
--wait \
--timeout=${HELM_UPGRADE_TIMEOUT:-15m} \
--set global.image.tag="${MENDER_CURRENT_RELEASE_TAG:-mender-3.6.2}" \
--set global.image.tag="${MENDER_CURRENT_RELEASE_TAG:-mender-3.6.3}" \
--set global.image.username=${REGISTRY_MENDER_IO_USERNAME} \
--set global.image.password="${REGISTRY_MENDER_IO_PASSWORD}" \
--set global.s3.AWS_ACCESS_KEY_ID="${MINIO_accessKey}" \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ The following table lists the global, default, and other parameters supported by
| `global.image.registry` | Global Docker image registry | `registry.mender.io` |
| `global.image.username` | Global Docker image registry username | `nil` |
| `global.image.password` | Global Docker image registry username | `password` |
| `global.image.tag` | Global Docker image registry tag | `mender-3.6.2` |
| `global.image.tag` | Global Docker image registry tag | `mender-3.6.3` |
| `global.mongodb.existingSecret` | MongoDB existing secret with keys: `MONGO` and `MONGO_URL` both with MongoDB connection string format | `null` |
| `global.mongodb.URL` | MongoDB URL | `mongodb://mongodb` |
| `global.nats.existingSecret` | NATS existing secret with key: `NATS_URI` and NATS connection string `nats://...` | `null` |
Expand Down
1 change: 1 addition & 0 deletions mender/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Version 5.3.0
* Split single db-migration job into multiple jobs
* Traefik updated to `v2.10.5`
* Upgrade to Mender version `3.6.3`.

## Version 5.2.6
* Add graceful shutdown for deviceconnect, defaults to `60s`.
Expand Down
2 changes: 1 addition & 1 deletion mender/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: "3.6.2"
appVersion: "3.6.3"
description: Mender is a robust and secure way to update all your software and deploy your IoT devices at scale with support for customization
name: mender
version: 5.3.0
Expand Down
2 changes: 1 addition & 1 deletion mender/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ global:
registry: registry.mender.io
username: null
password: null
tag: mender-3.6.2
tag: mender-3.6.3

mongodb:
existingSecret: ""
Expand Down

0 comments on commit a4fce09

Please sign in to comment.