Skip to content

Commit

Permalink
Merge pull request #1687 from k8s-infra-cherrypick-robot/cherry-pick-…
Browse files Browse the repository at this point in the history
…1678-to-release-1.23

[release-1.23] feat: upgrade to azcopy v10.27.0 for volume clone
  • Loading branch information
k8s-ci-robot authored Nov 10, 2024
2 parents 8bea94d + e43f2cb commit 441065c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
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
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

0 comments on commit 441065c

Please sign in to comment.