Merge branch 'master' into cameissner/prefetch-testdata

Azure · Sep 26, 2024 · d30476c · d30476c
2 parents 4b78a10 + 853906f
commit d30476c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/parts/linux/cloud-init/artifacts/components.json b/parts/linux/cloud-init/artifacts/components.json
@@ -65,8 +65,8 @@
         },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni",
-          "latestVersion": "v1.6.7",
-          "previousLatestVersion": "v1.6.5",
+          "latestVersion": "v1.6.10",
+          "previousLatestVersion": "v1.6.7",
           "containerImagePrefetch": {
             "latestVersion": {
               "binaries": [

diff --git a/vhdbuilder/prefetch/internal/containerimage/testdata/components.json b/vhdbuilder/prefetch/internal/containerimage/testdata/components.json
@@ -65,8 +65,8 @@
         },
         {
           "renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-cni",
-          "latestVersion": "v1.6.7",
-          "previousLatestVersion": "v1.6.5",
+          "latestVersion": "v1.6.10",
+          "previousLatestVersion": "v1.6.7",
           "containerImagePrefetch": {
             "latestVersion": {
               "binaries": [

diff --git a/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh b/vhdbuilder/prefetch/internal/containerimage/testdata/prefetch.sh
@@ -19,8 +19,8 @@ prefetch() {
 }
 prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.5.36" "/dropgz"
 prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.5.32" "/dropgz"
+prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.6.10" "/dropgz"
 prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.6.7" "/dropgz"
-prefetch "mcr.microsoft.com/containernetworking/azure-cni:v1.6.5" "/dropgz"
 prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.4.52" "/usr/local/bin/azure-cns"
 prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.5.35" "/usr/local/bin/azure-cns"
 prefetch "mcr.microsoft.com/containernetworking/azure-cns:v1.5.32" "/usr/local/bin/azure-cns"