Skip to content

Commit 20a3fc2

Browse files
authored
ci: windows profile container image (#1988)
1 parent e620685 commit 20a3fc2

File tree

3 files changed

+35
-22
lines changed

3 files changed

+35
-22
lines changed

.pipelines/containers/manifest-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
command: "logout"
3535
addPipelineData: false
3636

37-
- task: ManifestGeneratorTask@0
37+
- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0
3838
displayName: "Add SBOM Generator tool"
3939
inputs:
4040
BuildDropPath: "$(Build.ArtifactStagingDirectory)"

.pipelines/pipeline.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ stages:
264264
variables:
265265
TAG: $[ stagedependencies.setup.env.outputs['EnvironmentalVariables.Tag'] ]
266266
CURRENT_VERSION: $[ stagedependencies.containerize.check_tag.outputs['CurrentTagBuild.currentTagBuild'] ]
267+
Packaging.EnableSBOMSigning: false
267268
condition: and(succeeded(), eq(variables.TAG, variables.CURRENT_VERSION))
268269
jobs:
269270
- job: manifest

test/apimodels/cniWindows1903.json

+33-21
Original file line numberDiff line numberDiff line change
@@ -8,50 +8,62 @@
88
"kubernetesConfig": {
99
"networkPlugin": "azure",
1010
"networkPolicy": "azure",
11+
"containerRuntime": "containerd",
1112
"azureCNIVersion": "",
1213
"azureCNIURLWindows": "",
1314
"apiServerConfig": {
1415
"--tls-min-version": "VersionTLS12",
1516
"--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
1617
},
17-
"addons": [{
18-
"name": "azure-npm-daemonset",
19-
"enabled": true,
20-
"containers": [{
18+
"addons": [
19+
{
2120
"name": "azure-npm-daemonset",
22-
"image": ""
23-
}]
24-
}]
21+
"enabled": true,
22+
"containers": [
23+
{
24+
"name": "azure-npm-daemonset",
25+
"image": ""
26+
}
27+
]
28+
}
29+
]
2530
}
2631
},
2732
"masterProfile": {
2833
"count": 1,
2934
"dnsPrefix": "cniWindows",
3035
"vmSize": "Standard_D2_v2"
3136
},
32-
"agentPoolProfiles": [{
33-
"name": "windowspool2",
34-
"count": 2,
35-
"vmSize": "Standard_D2_v2",
36-
"availabilityProfile": "VirtualMachineScaleSets",
37-
"osType": "Windows"
38-
}],
37+
"agentPoolProfiles": [
38+
{
39+
"name": "windowspool2",
40+
"count": 2,
41+
"vmSize": "Standard_D2_v2",
42+
"availabilityProfile": "VirtualMachineScaleSets",
43+
"osType": "Windows"
44+
}
45+
],
3946
"windowsProfile": {
4047
"adminUsername": "azureuser",
4148
"adminPassword": "azureTest@!",
4249
"enableAutomaticUpdates": true,
4350
"sshEnabled": true,
44-
"windowsPublisher": "MicrosoftWindowsServer",
45-
"windowsOffer": "WindowsServer",
46-
"windowsSku": "Datacenter-Core-1903-with-Containers-smalldisk",
47-
"imageVersion": "latest"
51+
"imageReference": {
52+
"name": "containerVMImageDefinition",
53+
"resourceGroup": "container-images-rg",
54+
"subscriptionId": "d9eabe18-12f6-4421-934a-d7e2327585f5",
55+
"gallery": "containerImageComputeGallery",
56+
"version": "latest"
57+
}
4858
},
4959
"linuxProfile": {
5060
"adminUsername": "azureuser",
5161
"ssh": {
52-
"publicKeys": [{
53-
"keyData": ""
54-
}]
62+
"publicKeys": [
63+
{
64+
"keyData": ""
65+
}
66+
]
5567
}
5668
},
5769
"servicePrincipalProfile": {

0 commit comments

Comments
 (0)