From 680e30d2cab11ce5ca3321ff17087f0955736e78 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Thu, 7 Nov 2024 14:21:50 +0000 Subject: [PATCH 1/4] feat: upgrade to azcopy v10.27.0 for volume clone --- .trivyignore | 3 --- pkg/blobplugin/Dockerfile | 2 +- test/sanity/run-test.sh | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 .trivyignore diff --git a/.trivyignore b/.trivyignore deleted file mode 100644 index 9b5540db1..000000000 --- a/.trivyignore +++ /dev/null @@ -1,3 +0,0 @@ -CVE-2024-34156 -CVE-2024-34158 -CVE-2024-34155 diff --git a/pkg/blobplugin/Dockerfile b/pkg/blobplugin/Dockerfile index 0188bda11..a65dcf280 100644 --- a/pkg/blobplugin/Dockerfile +++ b/pkg/blobplugin/Dockerfile @@ -32,7 +32,7 @@ RUN if [ "$ARCH" = "arm64" ]; then \ fi # install azcopy -RUN curl -Ls https://azcopyvnext.azureedge.net/releases/release-10.26.0-20240731/azcopy_linux_${ARCH}_10.26.0.tar.gz \ +RUN curl -Ls https://azcopyvnext.azureedge.net/releases/release-10.27.0-20241030/azcopy_linux_${ARCH}_10.27.0.tar.gz \ | tar xvzf - --strip-components=1 -C /usr/local/bin/ --wildcards "*/azcopy" # download blobfuse deb diff --git a/test/sanity/run-test.sh b/test/sanity/run-test.sh index 1485865e2..31298db1d 100755 --- a/test/sanity/run-test.sh +++ b/test/sanity/run-test.sh @@ -36,7 +36,7 @@ azcopyPath="/usr/local/bin/azcopy" if [ ! -f "$azcopyPath" ]; then azcopyTarFile="azcopy.tar.gz" echo 'Downloading azcopy...' - wget -O $azcopyTarFile azcopyvnext.azureedge.net/releases/release-10.26.0-20240731/azcopy_linux_amd64_10.26.0.tar.gz + wget -O $azcopyTarFile azcopyvnext.azureedge.net/releases/release-10.27.0-20241030/azcopy_linux_amd64_10.27.0.tar.gz tar -zxvf $azcopyTarFile mv ./azcopy*/azcopy /usr/local/bin/azcopy rm -rf ./$azcopyTarFile From cdd11fd6bd245f101e787a8b05c2bffb565cc077 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sat, 9 Nov 2024 02:32:09 +0000 Subject: [PATCH 2/4] test: ignore azcopy CVE-2024-51744 --- .trivyignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .trivyignore diff --git a/.trivyignore b/.trivyignore new file mode 100644 index 000000000..de6dfc5a2 --- /dev/null +++ b/.trivyignore @@ -0,0 +1 @@ +CVE-2024-51744 From 1d47d2a534e3e052b8ba53fdf445e0c152dfa64b Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sun, 10 Nov 2024 02:43:23 +0000 Subject: [PATCH 3/4] test: remove blobfuse test in restart test --- .../dynamically_provisioned_restart_driver_tester.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go b/test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go index 9f6566637..8ba86ac82 100644 --- a/test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go +++ b/test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go @@ -82,12 +82,6 @@ func (t *DynamicallyProvisionedRestartDriverTest) Run(ctx context.Context, clien if useBlobfuseProxy { t.StorageClassParameters["skuName"] = "Standard_LRS" - ginkgo.By("run for blobfuse") - t.StorageClassParameters["protocol"] = "fuse" - wg.Add(1) - wgPodReady.Add(1) - go run() - ginkgo.By("run for blobfuse2") t.StorageClassParameters["protocol"] = "fuse2" wg.Add(1) From de071fae7ccb0c98df41fc576cdb82a50e3ba489 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sun, 10 Nov 2024 05:16:42 +0000 Subject: [PATCH 4/4] test: fix pv deletion verification failure in driver restart case --- .../dynamically_provisioned_restart_driver_tester.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go b/test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go index 8ba86ac82..b8d7dae45 100644 --- a/test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go +++ b/test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go @@ -46,11 +46,7 @@ func (t *DynamicallyProvisionedRestartDriverTest) Run(ctx context.Context, clien defer wg.Done() defer ginkgo.GinkgoRecover() - tDeployment, cleanup, _ := t.Pod.SetupDeployment(ctx, client, namespace, t.CSIDriver, t.StorageClassParameters) - // defer must be called here for resources not get removed before using them - for i := range cleanup { - defer cleanup[i](ctx) - } + tDeployment, _, _ := t.Pod.SetupDeployment(ctx, client, namespace, t.CSIDriver, t.StorageClassParameters) ginkgo.By("creating the deployment for the pod") tDeployment.Create(ctx)