Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/Azure/AgentBaker into cameis…
Browse files Browse the repository at this point in the history
…sner/migration
  • Loading branch information
Cameron Meissner committed Nov 11, 2024
2 parents af110f0 + bc3a602 commit feeb502
Show file tree
Hide file tree
Showing 111 changed files with 63,036 additions and 13,275 deletions.
2 changes: 1 addition & 1 deletion .pipelines/.vsts-vhd-automation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ parameters:
- name: PRTargetBranch
displayName: PR Target Branch
type: string
default: master
default: dev
- name: ImageBump
displayName: Image Bump + Create Official Branch
type: boolean
Expand Down
4 changes: 2 additions & 2 deletions parts/linux/cloud-init/artifacts/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@
"multiArchVersionsV2": [
{
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/kube-proxy",
"latestVersion": "v1.27.100-akslts",
"previousLatestVersion": "v1.27.16"
"latestVersion": "v1.27.101-akslts",
"previousLatestVersion": "v1.27.100-akslts"
},
{
"renovateTag": "registry=https://mcr.microsoft.com, name=oss/kubernetes/kube-proxy",
Expand Down
2 changes: 1 addition & 1 deletion vhdbuilder/packer/generate-windows-vhd-configuration.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ $global:map = @{
# 2. Keep 1.18.10, 1.18.14, 1.18.17, 1.18.18
# 3. Keep v1.18.17-hotfix.20210322 when adding v1.18.17-hotfix.20210505
"c:\akse-cache\win-k8s\" = @(
"https://acs-mirror.azureedge.net/kubernetes/v1.27.15-hotfix.20240712/windowszip/v1.27.15-hotfix.20240712-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.27.16/windowszip/v1.27.16-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.27.100-akslts/windowszip/v1.27.100-akslts-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.27.101-akslts/windowszip/v1.27.101-akslts-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.28.13/windowszip/v1.28.13-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.28.14/windowszip/v1.28.14-1int.zip",
"https://acs-mirror.azureedge.net/kubernetes/v1.28.15/windowszip/v1.28.15-1int.zip",
Expand Down
Loading

0 comments on commit feeb502

Please sign in to comment.