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.

Sign up for GitHub

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

chore: cache azure-cni and azure-ipam #4256

Merged
merged 1 commit into from
Jun 5, 2024
Merged

chore: cache azure-cni and azure-ipam #4256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 31 additions & 10 deletions parts/linux/cloud-init/artifacts/components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,26 @@
"1.35"
]
},
{
"downloadURL": "mcr.microsoft.com/containernetworking/azure-cni:*",
"amd64OnlyVersions": [],
"multiArchVersions": [
"v1.5.28"
],
"prefetchOptimizations": [
{
"version": "v1.5.28",
"binaries": [
"dropgz"
]
}
]
},
{
"downloadURL": "mcr.microsoft.com/containernetworking/azure-cns:*",
"amd64OnlyVersions": [],
"multiArchVersions": [
"v1.4.52",
"v1.5.23",
"v1.5.26"
],
"prefetchOptimizations": [
Expand All @@ -60,24 +74,31 @@
]
},
{
"downloadURL": "mcr.microsoft.com/containernetworking/cni-dropgz:*",
"downloadURL": "mcr.microsoft.com/containernetworking/azure-ipam:*",
rbtr marked this conversation as resolved.
Show resolved Hide resolved
"amd64OnlyVersions": [],
"multiArchVersions": [
"v0.0.15",
"v0.1.3",
"v0.0.20",
"v0.1.4",
"v0.0.4.1"
"v0.2.0"
],
"prefetchOptimizations": [
{
"version": "v0.0.15",
"version": "v0.2.0",
"binaries": [
"dropgz"
]
},
}
]
},
{
"downloadURL": "mcr.microsoft.com/containernetworking/cni-dropgz:*",
"amd64OnlyVersions": [],
"multiArchVersions": [
"v0.0.13",
"v0.0.20",
"v0.1.4"
],
"prefetchOptimizations": [
{
"version": "v0.1.3",
"version": "v0.0.13",
"binaries": [
"dropgz"
]
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/vhd/cache/cache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
var _ = Describe("cache suite", func() {
Context("get cached data", func() {
It("should have the correct manifest and components data cached", func() {
//TODO: improve test logic
// TODO: improve test logic
manifest, err := getManifest()
Expect(err).NotTo(HaveOccurred())

Expand All @@ -18,7 +18,7 @@ var _ = Describe("cache suite", func() {
// The indices are hardcoded based on the current components.json.
// Add new components to the bottom of components.json, or update the indices.
pauseIndx := 2
azureCNSIndx := 5
azureCNSIndx := 6
cniPluginIndx := 0
azureCNIIndx := 1

Expand Down
4 changes: 2 additions & 2 deletions vhdbuilder/packer/generate-windows-vhd-configuration.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,9 @@ $global:imagesToPull += @(
# CNS (Container Networking Service) Owner: jaer-tsun (Jaeryn)
"mcr.microsoft.com/containernetworking/azure-cns:v1.4.52",
"mcr.microsoft.com/containernetworking/azure-cns:v1.5.26",
# Dropgz (init container to CNS). Owner: pjohnst5 (Paul Johnston)
"mcr.microsoft.com/containernetworking/cni-dropgz:v0.1.3"
# CNI installer for azure-vnet. Owner: evanbaker
"mcr.microsoft.com/containernetworking/cni-dropgz:v0.1.4"
"mcr.microsoft.com/containernetworking/azure-cni:v1.5.26"
)

$global:map = @{
Expand Down
Loading