From c449ae0260d4e48cab646e0d94ee2d08d8a6d496 Mon Sep 17 00:00:00 2001 From: Siegfried Weber Date: Wed, 18 Sep 2024 13:49:09 +0200 Subject: [PATCH] chore(vector): update versions for 24.11 (#867) --- CHANGELOG.md | 3 ++- airflow/versions.py | 4 +-- java-base/versions.py | 10 +++---- opa/versions.py | 4 +-- spark-k8s/versions.py | 4 +-- superset/versions.py | 2 +- vector/upload_new_vector_version.sh | 41 ++++++++++++++++++++++++----- vector/versions.py | 2 +- 8 files changed, 50 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1354ba3..b53b3273 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ All notable changes to this project will be documented in this file. - ci: Add mirror workflow, add new helper scripts ([#819]). - opa: Add version `0.67.1` ([#797]). -- vector: Add version `0.40.1` ([#802], [#815]). +- vector: Add version `0.41.1` ([#802], [#815], [#867]). - airflow: Add version `2.9.3` ([#809]). - kafka: Add version `3.8.0` ([#813]). - hive: Add version `4.0.0` ([#818]). @@ -61,6 +61,7 @@ All notable changes to this project will be documented in this file. [#852]: https://github.com/stackabletech/docker-images/pull/852 [#853]: https://github.com/stackabletech/docker-images/pull/853 [#866]: https://github.com/stackabletech/docker-images/pull/866 +[#867]: https://github.com/stackabletech/docker-images/pull/867 ## [24.7.0] - 2024-07-24 diff --git a/airflow/versions.py b/airflow/versions.py index 548cdded..77486875 100644 --- a/airflow/versions.py +++ b/airflow/versions.py @@ -5,7 +5,7 @@ "git_sync": "v4.2.4", "statsd_exporter": "0.27.0", "tini": "0.19.0", - "vector": "0.40.1", + "vector": "0.41.1", }, { "product": "2.9.3", @@ -13,6 +13,6 @@ "git_sync": "v4.2.4", "statsd_exporter": "0.27.0", "tini": "0.19.0", - "vector": "0.40.1", + "vector": "0.41.1", }, ] diff --git a/java-base/versions.py b/java-base/versions.py index 28362168..46b6e9fd 100644 --- a/java-base/versions.py +++ b/java-base/versions.py @@ -1,22 +1,22 @@ versions = [ { "product": "1.8.0", - "vector": "0.40.1", + "vector": "0.41.1", }, { "product": "11", - "vector": "0.40.1", + "vector": "0.41.1", }, { "product": "17", - "vector": "0.40.1", + "vector": "0.41.1", }, { "product": "21", - "vector": "0.40.1", + "vector": "0.41.1", }, { "product": "22", - "vector": "0.40.1", + "vector": "0.41.1", }, ] diff --git a/opa/versions.py b/opa/versions.py index 10a820f6..cb233ebb 100644 --- a/opa/versions.py +++ b/opa/versions.py @@ -1,13 +1,13 @@ versions = [ { "product": "0.66.0", - "vector": "0.40.1", + "vector": "0.41.1", "bundle_builder_version": "1.1.2", "stackable-base": "1.0.0", }, { "product": "0.67.1", - "vector": "0.40.1", + "vector": "0.41.1", "bundle_builder_version": "1.1.2", "stackable-base": "1.0.0", }, diff --git a/spark-k8s/versions.py b/spark-k8s/versions.py index 850860b2..bb9ad5b7 100644 --- a/spark-k8s/versions.py +++ b/spark-k8s/versions.py @@ -11,7 +11,7 @@ "jackson_dataformat_xml": "2.15.2", # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.1 "stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2 "woodstox_core": "6.5.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2 - "vector": "0.40.1", + "vector": "0.41.1", "jmx_exporter": "1.0.1", "tini": "0.19.0", }, @@ -27,7 +27,7 @@ "jackson_dataformat_xml": "2.15.2", # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.1 "stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2 "woodstox_core": "6.5.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2 - "vector": "0.40.1", + "vector": "0.41.1", "jmx_exporter": "1.0.1", "tini": "0.19.0", }, diff --git a/superset/versions.py b/superset/versions.py index 7bd79825..29bb627f 100644 --- a/superset/versions.py +++ b/superset/versions.py @@ -2,7 +2,7 @@ { "product": "4.0.2", "python": "3.9", - "vector": "0.40.1", + "vector": "0.41.1", "statsd_exporter": "0.27.0", "authlib": "1.2.1", # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.4.1/requirements/extra.txt#L7 }, diff --git a/vector/upload_new_vector_version.sh b/vector/upload_new_vector_version.sh index 703cc376..4ec13cf4 100755 --- a/vector/upload_new_vector_version.sh +++ b/vector/upload_new_vector_version.sh @@ -1,28 +1,57 @@ #!/usr/bin/env bash +# +# Example usage: +# upload_new_vector_version.sh 0.41.1 1 nexus-username /var/lib/rpm set -euo pipefail VERSION=${1:?"Missing version number argument (arg 1)"} RELEASE=${2:?"Missing release number argument (arg 2)"} NEXUS_USER=${3:?"Missing Nexus username argument (arg 3)"} +RPM_PACKAGE_DB_PATH=${4:-"/var/lib/rpm"} ARCHITECTURES=( x86_64 aarch64 ) +major_version="${VERSION%%.*}" + read -r -s -p "Nexus Password: " NEXUS_PASSWORD echo "" -# Vector does not currently publish signatures or SBOMs (as of -# 2023-10-11, latest version at this point 0.33.0) -# But there are SHA256 sums in Github Releases. Maybe we should download from there? - for arch in "${ARCHITECTURES[@]}"; do file="vector-$VERSION-$RELEASE.$arch.rpm" - echo "Downloading $file from timber.io" - curl -LOs "https://packages.timber.io/vector/$VERSION/$file" + echo "Downloading $file from yum.vector.dev" + curl \ + --fail \ + --location \ + --remote-name \ + --silent \ + "https://yum.vector.dev/stable/vector-$major_version/$arch/$file" + + echo "Validating signature" + echo "--> NOTE: Make sure you have downloaded and added Datadog's \ +public key (https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public) \ +to the RPM package database: +rpmkeys --import --dbpath $RPM_PACKAGE_DB_PATH DATADOG_APT_KEY_CURRENT.public" + + EXIT_STATUS=0 + # `rpmkeys --checksig` also succeeds if the digests of an unsigned + # package are okay. Therefore, test explicitly if the output + # contains "digests signatures OK" to ensure that the package is + # signed. + rpmkeys \ + --checksig \ + --dbpath "$RPM_PACKAGE_DB_PATH" \ + "$file" | \ + grep "^$file: digests signatures OK\$" || \ + EXIT_STATUS=$? + if [ $EXIT_STATUS -ne 0 ]; then + echo "ERROR: The signature could not be verified." + exit 1 + fi echo "Uploading $file to Nexus" curl --fail -u "$NEXUS_USER:$NEXUS_PASSWORD" \ diff --git a/vector/versions.py b/vector/versions.py index 82eae59f..496a56fa 100644 --- a/vector/versions.py +++ b/vector/versions.py @@ -1,6 +1,6 @@ versions = [ { - "product": "0.40.1", + "product": "0.41.1", "rpm_release": "1", "stackable-base": "1.0.0", "inotify_tools": "3.22.1.0-1.el9",