From 7f462fe3bcb6ca53ca9dec68629edc6af657fd63 Mon Sep 17 00:00:00 2001 From: Daian Cardoso Sganderlla Date: Thu, 10 Feb 2022 13:23:17 -0500 Subject: [PATCH] Upgrade Trident to 22.01.0 version. Update version of Trident to 22.01.0 to keep compatibility with version 1.23 of Kubernetes. This supports Kubernetes 1.11 until 1.23. Test Plan: PASS: Tested Trident 22.01.0 installation and communication with Netapp simulator PASS: Tested the Trident update from version 21.04.1 to 22.01.0, upgrading tridentctl client version and rerunning the ansible-playbook to update the server version. Story: 2009860 Task: 44546 Change-Id: I327b4e3707de54006f2d90d53f7d343ca5cfeb43 Signed-off-by: Daian Cardoso Sganderlla --- centos_tarball-dl.lst | 2 +- .../trident-installer/centos/build_srpm.data | 2 +- .../trident-installer/centos/trident-installer.spec | 4 ++-- .../trident-installer/debian/deb_folder/changelog | 6 ++++++ .../trident-installer/debian/meta_data.yaml | 10 +++++----- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst index 7d098c8ba..3de474396 100644 --- a/centos_tarball-dl.lst +++ b/centos_tarball-dl.lst @@ -79,7 +79,7 @@ seastar-0cf6aa6b28d69210b271489c0778f226cde0f459.tar.gz#seastar#https://api.gith spawn-5f4742f647a5a33b9467f648a3968b3cd0a681ee.tar.gz#spawn#https://api.github.com/repos/ceph/spawn/tarball/5f4742f647a5a33b9467f648a3968b3cd0a681ee#https## spdk-fd292c568f72187e172b98074d7ccab362dae348.tar.gz#spdk#https://api.github.com/repos/ceph/spdk/tarball/fd292c568f72187e172b98074d7ccab362dae348#https## spectre-meltdown-checker-0.37+-5cc77741.tar.gz#spectre-meltdown-checker#https://github.com/speed47/spectre-meltdown-checker/tarball/5cc77741af1d2f52140aa9f89339f56b6c4b6783#http## -trident-installer-21.04.1.tar.gz#trident-installer-21.04.1#https://github.com/NetApp/trident/releases/download/v21.04.1/trident-installer-21.04.1.tar.gz#https## +trident-installer-22.01.0.tar.gz#trident-installer-22.01.0#https://github.com/NetApp/trident/releases/download/v22.01.0/trident-installer-22.01.0.tar.gz#https## !tss2-930.tar.gz#tss2-930#https://git.code.sf.net/p/ibmtpm20tss/tss#git#v930# xxHash-1f40c6511fa8dd9d2e337ca8c9bc18b3e87663c9.tar.gz#xxHash#https://api.github.com/repos/ceph/xxHash/tarball/1f40c6511fa8dd9d2e337ca8c9bc18b3e87663c9#https## zstd-b706286adbba780006a47ef92df0ad7a785666b6.tar.gz#zstd#https://api.github.com/repos/facebook/zstd/tarball/b706286adbba780006a47ef92df0ad7a785666b6#https## diff --git a/storage-drivers/trident-installer/centos/build_srpm.data b/storage-drivers/trident-installer/centos/build_srpm.data index d2a33be45..176dd85d9 100644 --- a/storage-drivers/trident-installer/centos/build_srpm.data +++ b/storage-drivers/trident-installer/centos/build_srpm.data @@ -1,2 +1,2 @@ -COPY_LIST="$CGCS_BASE/downloads/trident-installer-21.04.1.tar.gz" +COPY_LIST="$CGCS_BASE/downloads/trident-installer-22.01.0.tar.gz" TIS_PATCH_VER=PKG_GITREVCOUNT diff --git a/storage-drivers/trident-installer/centos/trident-installer.spec b/storage-drivers/trident-installer/centos/trident-installer.spec index 30c4a589a..281ad06e2 100644 --- a/storage-drivers/trident-installer/centos/trident-installer.spec +++ b/storage-drivers/trident-installer/centos/trident-installer.spec @@ -1,11 +1,11 @@ Summary: trident-installer Name: trident-installer -Version: 21.04.1 +Version: 22.01.0 Release: 0%{?_tis_dist}.%{tis_patch_ver} License: Apache-2.0 Group: base Packager: Wind River -URL: https://github.com/NetApp/trident/releases/download/v21.04.1/trident-installer-21.04.1.tar.gz +URL: https://github.com/NetApp/trident/releases/download/v22.01.0/trident-installer-22.01.0.tar.gz Source0: %{name}-%{version}.tar.gz Requires: nfs-utils diff --git a/storage-drivers/trident-installer/debian/deb_folder/changelog b/storage-drivers/trident-installer/debian/deb_folder/changelog index ebcda9004..4e4dc6ea0 100644 --- a/storage-drivers/trident-installer/debian/deb_folder/changelog +++ b/storage-drivers/trident-installer/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +trident-installer (22.01.0-0) unstable; urgency=medium + + * Initial release. + + -- Daian Cardoso Sganderlla Wed, 16 Mar 2022 08:41:00 -0400 + trident-installer (20.04.0-0) unstable; urgency=medium * Initial release. diff --git a/storage-drivers/trident-installer/debian/meta_data.yaml b/storage-drivers/trident-installer/debian/meta_data.yaml index 36ca0e5ba..003f775e0 100644 --- a/storage-drivers/trident-installer/debian/meta_data.yaml +++ b/storage-drivers/trident-installer/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- debname: trident-installer -debver: 20.04.0-0 +debver: 22.01.0-0 dl_path: - name: trident-installer-20.04.0.tar.gz - url: https://github.com/NetApp/trident/releases/download/v20.04.0/trident-installer-20.04.0.tar.gz - md5sum: a4517756893dc2f373a86048868c4b2f - sha256sum: 5e410f52bfa38dc50c375dd8132091c7861d2321fb934e22f7d67e228df2047b + name: trident-installer-22.01.0.tar.gz + url: https://github.com/NetApp/trident/releases/download/v22.01.0/trident-installer-22.01.0.tar.gz + md5sum: 9997421309e641f69ee7a9c52153a545 + sha256sum: 277a7557c63ddcf135c5b8489594f8e5d551df1f8f36c8ae78ccc0bb7b02d0ec revision: dist: $STX_DIST PKG_GITREVCOUNT: true