diff --git a/.trivyignore b/.trivyignore index 9b5540db1..de6dfc5a2 100644 --- a/.trivyignore +++ b/.trivyignore @@ -1,3 +1 @@ -CVE-2024-34156 -CVE-2024-34158 -CVE-2024-34155 +CVE-2024-51744 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/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go b/test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go index 9f6566637..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) @@ -82,12 +78,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) 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