Skip to content

Commit

Permalink
add fallback
Browse files Browse the repository at this point in the history
  • Loading branch information
@timmy-wright
timmy-wright committed Feb 4, 2025
1 parent 86189fc commit e5870e0
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 38 deletions.
80 changes: 45 additions & 35 deletions parts/linux/cloud-init/artifacts/components.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
"latestVersion": "1.8.22",
"previousLatestVersion": "1.8.20"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/windows/servercore/iis:*",
Expand Down Expand Up @@ -107,7 +108,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/coredns",
"latestVersion": "v1.9.4-hotfix.20240704"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/v2/kubernetes/coredns:*",
Expand All @@ -121,7 +123,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/v2/kubernetes/coredns",
"latestVersion": "v1.9.4-5"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/containernetworking/azure-cni:*",
Expand Down Expand Up @@ -279,7 +282,8 @@
}
}
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/containernetworking/cni-dropgz:*",
Expand All @@ -296,7 +300,8 @@
}
}
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/containernetworking/azure-npm:*",
Expand All @@ -306,7 +311,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=containernetworking/azure-npm",
"latestVersion": "v1.5.34"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/containernetworking/cilium/cilium:*",
Expand All @@ -322,7 +328,8 @@
"latestVersion": "v1.16.5-250110",
"previousLatestVersion": "v1.16.2-241024"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/kubernetes/apiserver-network-proxy/agent:*",
Expand All @@ -336,7 +343,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/apiserver-network-proxy/agent",
"latestVersion": "v0.30.3-hotfix.20240819"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/kubernetes-csi/secrets-store/driver:*",
Expand All @@ -347,13 +355,6 @@
"latestVersion": "v1.4.7",
"previousLatestVersion": "v1.4.5"
}
],
"windowsVersions": [
{
"renovateTag": "<DO_NOT_UPDATE>",
"latestVersion": "v1.4.7",
"previousLatestVersion": "v1.4.5"
}
]
},
{
Expand All @@ -376,18 +377,13 @@
},
{
"downloadURL": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:*",
"windowsDownloadURL": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-*",
"amd64OnlyVersions": [],
"multiArchVersionsV2": [
{
"renovateTag": "registry=https://mcr.microsoft.com, name=azuremonitor/containerinsights/ciprod",
"latestVersion": "3.1.25"
}
],
"windowsVersions": [
{
"renovateTag": "<DO_NOT_UPDATE>",
"latestVersion": "win-3.1.25"
}
]
},
{
Expand All @@ -398,7 +394,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=aks/msi/addon-token-adapter",
"latestVersion": "master.221118.2"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/azuremonitor/containerinsights/ciprod/prometheus-collector/images:*",
Expand All @@ -416,7 +413,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=azuremonitor/containerinsights/ciprod/prometheus-collector/images",
"latestVersion": "6.14.0-main-01-16-2025-8d52acfe-cfg"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/kubernetes/kube-state-metrics:*",
Expand All @@ -426,7 +424,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/kube-state-metrics",
"latestVersion": "v2.11.0"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/kubernetes/azure-cloud-node-manager:*",
Expand Down Expand Up @@ -494,7 +493,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/autoscaler/cluster-proportional-autoscaler",
"latestVersion": "v1.8.9"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/aks/ip-masq-agent-v2:*",
Expand All @@ -505,7 +505,8 @@
"latestVersion": "v0.1.15",
"previousLatestVersion": "v0.1.14"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/kubernetes-csi/azuredisk-csi:*",
Expand Down Expand Up @@ -597,7 +598,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes-csi/blob-csi",
"latestVersion": "v1.25.1"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/kubernetes-csi/livenessprobe:*",
Expand Down Expand Up @@ -639,7 +641,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/v2/open-policy-agent/gatekeeper",
"latestVersion": "v3.17.1-5"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/open-policy-agent/gatekeeper:*",
Expand All @@ -649,17 +652,20 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/open-policy-agent/gatekeeper",
"latestVersion": "v3.17.1"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/aks/aks-app-routing-operator:*",
"amd64OnlyVersions": [],
"multiArchVersionsV2": []
"multiArchVersionsV2": [],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/virtual-kubelet/virtual-kubelet:*",
"amd64OnlyVersions": [],
"multiArchVersionsV2": []
"multiArchVersionsV2": [],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/azure-policy/policy-kubernetes-addon-prod:*",
Expand All @@ -670,7 +676,8 @@
"latestVersion": "1.9.1",
"previousLatestVersion": "1.8.0"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/azure-policy/policy-kubernetes-webhook:*",
Expand All @@ -681,7 +688,8 @@
"latestVersion": "1.9.1",
"previousLatestVersion": "1.8.0"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/azure-application-gateway/kubernetes-ingress:*",
Expand All @@ -696,7 +704,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=aks/aks-node-ca-watcher",
"latestVersion": "master.241021.1"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/kubernetes/windows-gmsa-webhook:*",
Expand All @@ -706,7 +715,8 @@
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/windows-gmsa-webhook",
"latestVersion": "v0.7.1"
}
]
],
"windowsVersions": []
},
{
"downloadURL": "mcr.microsoft.com/oss/kubernetes/kube-proxy:*",
Expand Down
1 change: 1 addition & 0 deletions schemas/components.cue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ package components

#ContainerImage: {
downloadURL: string
windowsDownloadURL?: string
amd64OnlyVersions: [...string]
multiArchVersionsV2: [...#VersionV2]
windowsVersions?: [...#WindowsVersion]
Expand Down
16 changes: 13 additions & 3 deletions vhdbuilder/packer/windows/components_json_helpers.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,27 @@ function GetComponentsFromComponentsJson

foreach ($containerImage in $componentsJsonContent.ContainerImages)
{
foreach ($windowsVersion in $containerImage.windowsVersions)
$versions = $containerImage.windowsVersions
if ($versions -eq $null) {
$versions = $containerImage.multiArchVersionsV2
}

$downloadUrl = $containerImage.windowsDownloadUrl
if ($downloadUrl -eq $null) {
$downloadUrl = $containerImage.downloadUrl
}

foreach ($windowsVersion in $versions)
{
$skuMatch = $windowsVersion.windowsSkuMatch
if ($skuMatch -eq $null -or $windowsSku -eq $null -or $windowsSku -Like $skuMatch)
{
$url = $containerImage.downloadUrl.replace("*", $windowsVersion.latestVersion)
$url = $downloadUrl.replace("*", $windowsVersion.latestVersion)
$output += $url

if (-not [string]::IsNullOrEmpty($windowsVersion.previousLatestVersion))
{
$url = $containerImage.downloadUrl.replace("*", $windowsVersion.previousLatestVersion)
$url = $downloadUrl.replace("*", $windowsVersion.previousLatestVersion)
$output += $url
}
}
Expand Down
6 changes: 6 additions & 0 deletions vhdbuilder/packer/windows/components_json_helpers.tests.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,12 @@ Describe 'Tests of components.json' {
$components | Should -Contain "mcr.microsoft.com/oss/kubernetes/pause:3.9"
}

it 'has the right version of ciprod' {
$components = GetComponentsFromComponentsJson $componentsJson

$components | Should -Contain "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.1.25"
}

It 'has the latest 2 versions of windows scripts and cgmaplugin' {
$packages = GetPackagesFromComponentsJson $componentsJson

Expand Down

0 comments on commit e5870e0

Please sign in to comment.