Skip to content

Commit 218dc71

Browse files
authored
Merge pull request #1678 from andyzhangx/upgrade-azcopy-10.27.0
feat: upgrade to azcopy v10.27.0 for volume clone
2 parents 7a94055 + 9e7e6de commit 218dc71

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

Diff for: .trivyignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
CVE-2024-34156
2-
CVE-2024-34158
3-
CVE-2024-34155
1+
CVE-2024-51744

Diff for: pkg/blobplugin/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN if [ "$ARCH" = "arm64" ]; then \
3232
fi
3333

3434
# install azcopy
35-
RUN curl -Ls https://azcopyvnext.azureedge.net/releases/release-10.26.0-20240731/azcopy_linux_${ARCH}_10.26.0.tar.gz \
35+
RUN curl -Ls https://azcopyvnext.azureedge.net/releases/release-10.27.0-20241030/azcopy_linux_${ARCH}_10.27.0.tar.gz \
3636
| tar xvzf - --strip-components=1 -C /usr/local/bin/ --wildcards "*/azcopy"
3737

3838
# download blobfuse deb

Diff for: test/e2e/testsuites/dynamically_provisioned_restart_driver_tester.go

+1-11
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,7 @@ func (t *DynamicallyProvisionedRestartDriverTest) Run(ctx context.Context, clien
4646
defer wg.Done()
4747
defer ginkgo.GinkgoRecover()
4848

49-
tDeployment, cleanup, _ := t.Pod.SetupDeployment(ctx, client, namespace, t.CSIDriver, t.StorageClassParameters)
50-
// defer must be called here for resources not get removed before using them
51-
for i := range cleanup {
52-
defer cleanup[i](ctx)
53-
}
49+
tDeployment, _, _ := t.Pod.SetupDeployment(ctx, client, namespace, t.CSIDriver, t.StorageClassParameters)
5450

5551
ginkgo.By("creating the deployment for the pod")
5652
tDeployment.Create(ctx)
@@ -82,12 +78,6 @@ func (t *DynamicallyProvisionedRestartDriverTest) Run(ctx context.Context, clien
8278
if useBlobfuseProxy {
8379
t.StorageClassParameters["skuName"] = "Standard_LRS"
8480

85-
ginkgo.By("run for blobfuse")
86-
t.StorageClassParameters["protocol"] = "fuse"
87-
wg.Add(1)
88-
wgPodReady.Add(1)
89-
go run()
90-
9181
ginkgo.By("run for blobfuse2")
9282
t.StorageClassParameters["protocol"] = "fuse2"
9383
wg.Add(1)

Diff for: test/sanity/run-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ azcopyPath="/usr/local/bin/azcopy"
3636
if [ ! -f "$azcopyPath" ]; then
3737
azcopyTarFile="azcopy.tar.gz"
3838
echo 'Downloading azcopy...'
39-
wget -O $azcopyTarFile azcopyvnext.azureedge.net/releases/release-10.26.0-20240731/azcopy_linux_amd64_10.26.0.tar.gz
39+
wget -O $azcopyTarFile azcopyvnext.azureedge.net/releases/release-10.27.0-20241030/azcopy_linux_amd64_10.27.0.tar.gz
4040
tar -zxvf $azcopyTarFile
4141
mv ./azcopy*/azcopy /usr/local/bin/azcopy
4242
rm -rf ./$azcopyTarFile

0 commit comments

Comments
 (0)