Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.25] feat: upgrade to azcopy v10.27.0 for volume clone #1685

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
CVE-2024-34156
CVE-2024-34158
CVE-2024-34155
CVE-2024-51744
2 changes: 1 addition & 1 deletion pkg/blobplugin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion test/sanity/run-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading