From fafa956ba48fb18860175a1f2adb577294e5a1d1 Mon Sep 17 00:00:00 2001 From: Fabio Tranchitella Date: Wed, 1 Nov 2023 18:15:58 +0100 Subject: [PATCH] Upgrade to Mender version `3.6.3`. Signed-off-by: Fabio Tranchitella --- .gitlab-ci.yml | 16 ++++++++-------- README.md | 2 +- mender/CHANGELOG.md | 1 + mender/Chart.yaml | 2 +- mender/values.yaml | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80f55383..c33a43e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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}" \ @@ -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}" \ @@ -386,7 +386,7 @@ 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 \ @@ -394,7 +394,7 @@ test:helm_chart_upgrade_from_current_lts_to_current_release: -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}" \ @@ -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}" \ diff --git a/README.md b/README.md index 3a7e837c..1e607733 100644 --- a/README.md +++ b/README.md @@ -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` | diff --git a/mender/CHANGELOG.md b/mender/CHANGELOG.md index 0cee0422..4c1f7d69 100644 --- a/mender/CHANGELOG.md +++ b/mender/CHANGELOG.md @@ -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`. diff --git a/mender/Chart.yaml b/mender/Chart.yaml index f44e19b5..2b558877 100644 --- a/mender/Chart.yaml +++ b/mender/Chart.yaml @@ -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 diff --git a/mender/values.yaml b/mender/values.yaml index 8e0dd395..2e2102c7 100644 --- a/mender/values.yaml +++ b/mender/values.yaml @@ -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: ""