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.

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

move components.json to parts/common/ #5808

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
204 changes: 162 additions & 42 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
"config:base"
],
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"enabledManagers": ["custom.regex"],
"enabledManagers": [
"custom.regex"
],
"prConcurrentLimit": 50,
"prHourlyLimit": 50,
"branchConcurrentLimit": 50,
"separateMinorPatch": true,
"recreateWhen": "never",
"labels": ["renovate"],
"labels": [
"renovate"
],
"rebaseWhen": "behind-base-branch",
"schedule": [
"after 10pm and before 5am every weekday",
Expand Down Expand Up @@ -60,109 +64,225 @@
"enabled": false
},
{
"matchDatasources": ["docker"],
"matchDatasources": [
"docker"
],
"matchUpdateTypes": [
"patch"
],
"automerge": false,
"enabled": true
},
{
"matchDatasources": ["custom.deb1804"],
"matchDatasources": [
"custom.deb1804"
],
"matchUpdateTypes": [
"patch"
],
"automerge": false,
"enabled": true
},
{
"matchDatasources": ["custom.deb2004"],
"matchDatasources": [
"custom.deb2004"
],
"matchUpdateTypes": [
"patch"
],
"automerge": false,
"enabled": true
},
{
"matchDatasources": ["custom.deb2204"],
"matchDatasources": [
"custom.deb2204"
],
"matchUpdateTypes": [
"patch"
],
"automerge": false,
"enabled": true
},
{
"matchDatasources": ["custom.deb2404"],
"matchDatasources": [
"custom.deb2404"
],
"matchUpdateTypes": [
"patch"
],
"automerge": false,
"enabled": true
},
{
"matchPackageNames": ["moby-runc", "moby-containerd"],
"matchPackageNames": [
"moby-runc",
"moby-containerd"
],
"matchUpdateTypes": [
"patch"
],
"automerge": true,
"enabled": true,
"groupName" : "runc-containerd",
"assignees": ["devinwong", "anujmaheshwari1", "cameronmeissner", "AlisonB319", "lilypan26", "djsly", "jason1028kr", "UtheMan", "zachary-bailey", "ganeshkumarashok"],
"reviewers": ["devinwong", "anujmaheshwari1", "cameronmeissner", "AlisonB319", "lilypan26", "djsly", "jason1028kr", "UtheMan", "zachary-bailey", "ganeshkumarashok"]
"groupName": "runc-containerd",
"assignees": [
"devinwong",
"anujmaheshwari1",
"cameronmeissner",
"AlisonB319",
"lilypan26",
"djsly",
"jason1028kr",
"UtheMan",
"zachary-bailey",
"ganeshkumarashok"
],
"reviewers": [
"devinwong",
"anujmaheshwari1",
"cameronmeissner",
"AlisonB319",
"lilypan26",
"djsly",
"jason1028kr",
"UtheMan",
"zachary-bailey",
"ganeshkumarashok"
]
},
{
"matchPackageNames": ["azure-cni", "azure-cns", "containernetworking/azure-cni", "containernetworking/azure-cns", "containernetworking/cilium/cilium"],
"groupName" : "azure-cni-cns-cilium",
"assignees": ["rbtr", "behzad-mir", "QxBytes", "jpayne3506"],
"reviewers": ["rbtr", "behzad-mir", "QxBytes", "jpayne3506"]
"matchPackageNames": [
"azure-cni",
"azure-cns",
"containernetworking/azure-cni",
"containernetworking/azure-cns",
"containernetworking/cilium/cilium"
],
"groupName": "azure-cni-cns-cilium",
"assignees": [
"rbtr",
"behzad-mir",
"QxBytes",
"jpayne3506"
],
"reviewers": [
"rbtr",
"behzad-mir",
"QxBytes",
"jpayne3506"
]
},
{
"matchPackageNames": ["aks/aks-node-ca-watcher"],
"assignees": ["UtheMan"],
"reviewers": ["UtheMan"]
"matchPackageNames": [
"aks/aks-node-ca-watcher"
],
"assignees": [
"UtheMan"
],
"reviewers": [
"UtheMan"
]
},
{
"matchPackageNames": ["oss/kubernetes/coredns", "oss/v2/kubernetes/coredns"],
"groupName" : "coredns",
"assignees": ["SriHarsha001"],
"reviewers": ["SriHarsha001"]
"matchPackageNames": [
"oss/kubernetes/coredns",
"oss/v2/kubernetes/coredns"
],
"groupName": "coredns",
"assignees": [
"SriHarsha001"
],
"reviewers": [
"SriHarsha001"
]
},
{
"matchPackageNames": ["oss/binaries/kubernetes/azure-acr-credential-provider"],
"matchPackageNames": [
"oss/binaries/kubernetes/azure-acr-credential-provider"
],
"groupName": "acr-credential-provider",
"assignees": ["mainred"],
"reviewers": ["mainred"]
"assignees": [
"mainred"
],
"reviewers": [
"mainred"
]
},
{
"matchPackageNames": ["oss/kubernetes-csi/*"],
"groupName" : "csi",
"assignees": ["andyzhangx"],
"reviewers": ["andyzhangx"]
"matchPackageNames": [
"oss/kubernetes-csi/*"
],
"groupName": "csi",
"assignees": [
"andyzhangx"
],
"reviewers": [
"andyzhangx"
]
},
{
"matchPackageNames": ["oss/binaries/kubernetes/kubernetes-node", "oss/kubernetes/kube-proxy"],
"matchPackageNames": [
"oss/binaries/kubernetes/kubernetes-node",
"oss/kubernetes/kube-proxy"
],
"groupName": "kube-components",
"assignees": ["haitch", "wenhug", "gaopenghigh"],
"reviewers": ["haitch", "wenhug", "gaopenghigh"]
"assignees": [
"haitch",
"wenhug",
"gaopenghigh"
],
"reviewers": [
"haitch",
"wenhug",
"gaopenghigh"
]
},
{
"matchPackageNames": ["containernetworking/azure-ipam"],
"matchPackageNames": [
"containernetworking/azure-ipam"
],
"groupName": "azure-ipam"
},
{
"matchDatasources": ["docker"],
"matchPackageNames": ["oss/binaries/kubernetes/kubernetes-node", "oss/binaries/kubernetes/azure-acr-credential-provider", "oss/binaries/deislabs/containerd-wasm-shims"],
"matchPackageNames": [
"windows/nanoserver",
"windows/servercore",
"containernetworking/azure-npm",
"windows/servercore/iis"
],
"groupName": "windowsbase",
"assignees": [
"timmy-wright"
],
"reviewers": [
"timmy-wright"
]
},
{
"matchDatasources": [
"docker"
],
"matchPackageNames": [
"oss/binaries/kubernetes/kubernetes-node",
"oss/binaries/kubernetes/azure-acr-credential-provider",
"oss/binaries/deislabs/containerd-wasm-shims"
],
"extractVersion": "^(?P<version>.*?)-[^-]*-[^-]*$"
},
{
"matchPackageNames": ["moby-runc", "moby-containerd"],
"matchPackageNames": [
"moby-runc",
"moby-containerd"
],
"extractVersion": "^v?(?<version>.+)$"
},
{
"matchPackageNames": ["aks/aks-gpu-cuda", "aks/aks-gpu-grid"],
"groupName" : "nvidia-gpu",
{
"matchPackageNames": [
"aks/aks-gpu-cuda",
"aks/aks-gpu-grid"
],
"groupName": "nvidia-gpu",
"versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)-(?<prerelease>\\d{14})$",
"automerge": true,
"automerge": true,
"enabled": true,
"ignoreUnstable": false
}
Expand Down Expand Up @@ -220,7 +340,7 @@
],
"datasourceTemplate": "custom.deb2004",
"versioningTemplate": "deb",
"autoReplaceStringTemplate": "\"renovateTag\": \"name={{{packageName}}}, os=ubuntu, release=20.04\",\n \"latestVersion\": \"{{{newValue}}}\"{{#if depType}},\n \"previousLatestVersion\": \"{{{currentValue}}}\"{{/if}}"
"autoReplaceStringTemplate": "\"renovateTag\": \"name={{{packageName}}}, os=ubuntu, release=20.04\",\n \"latestVersion\": \"{{{newValue}}}\"{{#if depType}},\n \"previousLatestVersion\": \"{{{currentValue}}}\"{{/if}}"
},
{
"customType": "regex",
Expand Down Expand Up @@ -250,7 +370,7 @@
"versioningTemplate": "deb",
"autoReplaceStringTemplate": "\"renovateTag\": \"name={{{packageName}}}, os=ubuntu, release=24.04\",\n \"latestVersion\": \"{{{newValue}}}\"{{#if depType}},\n \"previousLatestVersion\": \"{{{currentValue}}}\"{{/if}}"
},
{
{
"customType": "regex",
"description": "update version line in any cse_*.sh",
"fileMatch": [
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/validate-windows-binary-signature.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ on:
paths:
- '.github/workflows/validate-windows-binary-signature.yaml'
- 'vhdbuilder/packer/test/windows-files-check.ps1'
- '../../vhdbuilder/packer/windows'
- 'parts/linux/cloud-init/artifacts/components.json'
- 'vhdbuilder/packer/windows/**'
- 'vhdbuilder/packer/windows/windows-vhd-configuration.ps1'
- 'vhdbuilder/packer/windows/windows_settings.json'
- 'vhdbuilder/packer/windows/components_json_helpers.ps1'

jobs:
check-files-for-ws2019:
Expand Down
5 changes: 5 additions & 0 deletions .pipelines/.vsts-vhd-builder-release-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ parameters:
displayName: VHD Debug
type: boolean
default: False
- name: skipExtensionCheck
displayName: Skip Extension Check
type: boolean
default: False

# Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build"
# Use variable group "ab-windows-ame-tenant" and link it to the pipeline "AKS Windows VHD Build - PR check-in gate"
Expand All @@ -54,3 +58,4 @@ stages:
build2022containerdgen2: ${{ parameters.build2022containerdgen2 }}
build23H2: ${{ parameters.build23H2 }}
build23H2gen2: ${{ parameters.build23H2gen2 }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ parameters:
- name: hyperVGeneration
type: string
displayName: V1 or V2.
- name: skipExtensionCheck
displayName: Skip Extension Check
type: boolean
default: False
- name: windowsBaseImageUrl
displayName: Windows Base Image URL Override
Expand Down Expand Up @@ -58,6 +61,7 @@ stages:
echo '##vso[task.setvariable variable=HYPERV_GENERATION]${{ parameters.hyperVGeneration }}'
echo '##vso[task.setvariable variable=AZURE_VM_SIZE]${{ parameters.buildVmSize }}'
echo '##vso[task.setvariable variable=WINDOWS_SKU]${{ parameters.windowsSku }}'
echo '##vso[task.setvariable variable=SKIP_EXTENSION_CHECK]${{ parameters.skipExtensionCheck }}'
echo '##vso[task.setvariable variable=WINDOWS_BASE_IMAGE_URL]${{ parameters.windowsBaseImageUrl }}'
echo '##vso[task.setvariable variable=WINDOWS_NANO_IMAGE_URL]${{ parameters.windowsNanoImageUrl }}'
echo '##vso[task.setvariable variable=WINDOWS_CORE_IMAGE_URL]${{ parameters.windowsCoreImageUrl }}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ parameters:
displayName: VHD Debug
type: boolean
default: False
- name: skipExtensionCheck
displayName: Skip Extension Check
type: boolean
default: False

stages:
- template: ./.build-and-test-windows-vhd-template.yaml
Expand All @@ -34,6 +38,7 @@ stages:
build: ${{ parameters.build2019containerd }}
vhddebug: ${{ parameters.vhddebug }}
dryrun: ${{ parameters.dryrun }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_2019_BASE_IMAGE_URL)
windowsNanoImageUrl: $(WINDOWS_2019_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2019_CORE_IMAGE_URL)
Expand All @@ -48,6 +53,7 @@ stages:
build: ${{ parameters.build2022containerd }}
vhddebug: ${{ parameters.vhddebug }}
dryrun: ${{ parameters.dryrun }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_2022_BASE_IMAGE_URL)
windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
Expand All @@ -62,6 +68,7 @@ stages:
build: ${{ parameters.build2022containerdgen2 }}
vhddebug: ${{ parameters.vhddebug }}
dryrun: ${{ parameters.dryrun }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)
windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
Expand All @@ -76,6 +83,7 @@ stages:
build: ${{ parameters.build23H2 }}
vhddebug: ${{ parameters.vhddebug }}
dryrun: ${{ parameters.dryrun }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_23H2_BASE_IMAGE_URL)
windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
Expand All @@ -90,6 +98,7 @@ stages:
build: ${{ parameters.build23H2gen2 }}
vhddebug: ${{ parameters.vhddebug }}
dryrun: ${{ parameters.dryrun }}
skipExtensionCheck: ${{ parameters.skipExtensionCheck }}
windowsBaseImageUrl: $(WINDOWS_23H2_GEN2_BASE_IMAGE_URL)
windowsNanoImageUrl: $(WINDOWS_2022_NANO_IMAGE_URL)
windowsCoreImageUrl: $(WINDOWS_2022_CORE_IMAGE_URL)
Expand Down
Loading