diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 580eb9ba93..8b802001df 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -13,4 +13,4 @@ jobs: with: check_filenames: true skip: ./.git,./.github/workflows/codespell.yml,.git,*.png,*.jpg,*.svg,*.sum,./vendor,go.sum,crd-csi-snapshot-ga.yaml,crd-csi-snapshot.yaml - ignore_words_list: "AKS,aks,complies,ro" + ignore_words_list: "AKS,aks,complies,ro,NotIn" diff --git a/.github/workflows/trivy.yaml b/.github/workflows/trivy.yaml index cb5bad96a8..1463847929 100644 --- a/.github/workflows/trivy.yaml +++ b/.github/workflows/trivy.yaml @@ -12,7 +12,7 @@ jobs: - name: Set up Go 1.x uses: actions/setup-go@v4 with: - go-version: 1.22.3 + go-version: 1.22.4 id: go - name: Checkout code diff --git a/.trivyignore b/.trivyignore index 3337b65ab2..edf50a2f93 100644 --- a/.trivyignore +++ b/.trivyignore @@ -1,2 +1,2 @@ -CVE-2023-45288 -CVE-2020-8559 +CVE-2024-24789 +CVE-2024-24790 diff --git a/pkg/azurefileplugin/Dockerfile b/pkg/azurefileplugin/Dockerfile index 76856153d0..302f074f30 100644 --- a/pkg/azurefileplugin/Dockerfile +++ b/pkg/azurefileplugin/Dockerfile @@ -21,9 +21,9 @@ COPY ${binary} /azurefileplugin RUN apt update && apt upgrade -y && apt-mark unhold libcap2 && clean-install ca-certificates cifs-utils util-linux e2fsprogs mount udev xfsprogs nfs-common netbase wget # install azcopy -ARG azcopyURL=https://azcopyvnext.azureedge.net/releases/release-10.24.0-20240326/azcopy_linux_amd64_10.24.0.tar.gz +ARG azcopyURL=https://azcopyvnext.azureedge.net/releases/release-10.25.0-20240522/azcopy_linux_amd64_10.25.0.tar.gz RUN if [ "$ARCH" == "arm64" ] ; then \ - azcopyURL=https://azcopyvnext.azureedge.net/releases/release-10.24.0-20240326/azcopy_linux_arm64_10.24.0.tar.gz; fi + azcopyURL=https://azcopyvnext.azureedge.net/releases/release-10.25.0-20240522/azcopy_linux_arm64_10.25.0.tar.gz; fi RUN wget -O azcopy.tar.gz ${azcopyURL} && \ tar xvzf azcopy.tar.gz -C . && rm azcopy.tar.gz && \ mv ./azcopy_linux_$ARCH_*/azcopy /usr/local/bin/azcopy && \ diff --git a/test/sanity/run-test.sh b/test/sanity/run-test.sh index 54bed6d748..7576c39e1d 100755 --- a/test/sanity/run-test.sh +++ b/test/sanity/run-test.sh @@ -40,7 +40,7 @@ azcopyPath="/usr/local/bin/azcopy" if [ ! -f "$azcopyPath" ]; then echo 'Downloading azcopy...' azcopyTarFile="azcopy.tar.gz" - wget -O $azcopyTarFile azcopyvnext.azureedge.net/releases/release-10.24.0-20240326/azcopy_linux_amd64_10.24.0.tar.gz + wget -O $azcopyTarFile azcopyvnext.azureedge.net/releases/release-10.25.0-20240522/azcopy_linux_amd64_10.25.0.tar.gz tar -zxvf $azcopyTarFile mv ./azcopy*/azcopy /usr/local/bin/azcopy rm -rf ./$azcopyTarFile