Skip to content

Commit

Permalink
Update examples and spec for new API version.
Browse files Browse the repository at this point in the history
  • Loading branch information
jingjlii committed May 26, 2023
1 parent 1480f5c commit 0c48669
Show file tree
Hide file tree
Showing 5 changed files with 205 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2157,6 +2157,9 @@
},
"CreatePool - VirtualMachineConfiguration Extensions": {
"$ref": "./examples/PoolCreate_VirtualMachineConfiguration_Extensions.json"
},
"CreatePool - accelerated networking": {
"$ref": "./examples/PoolCreate_AcceleratedNetworking.json"
}
},
"parameters": [
Expand Down Expand Up @@ -2367,6 +2370,9 @@
},
"GetPool - VirtualMachineConfiguration Extensions": {
"$ref": "./examples/PoolGet_VirtualMachineConfiguration_Extensions.json"
},
"GetPool - AcceleratedNetworking": {
"$ref": "./examples/PoolGet_AcceleratedNetworking.json"
}
},
"parameters": [
Expand Down Expand Up @@ -3115,7 +3121,7 @@
"properties": {
"keyIdentifier": {
"type": "string",
"description": "Full path to the versioned secret. Example https://mykeyvault.vault.azure.net/keys/testkey/6e34a81fef704045975661e297a4c053. To be usable the following prerequisites must be met:\n\n The Batch Account has a System Assigned identity\n The account identity has been granted Key/Get, Key/Unwrap and Key/Wrap permissions\n The KeyVault has soft-delete and purge protection enabled"
"description": "Full path to the secret with or without version. Example https://mykeyvault.vault.azure.net/keys/testkey/6e34a81fef704045975661e297a4c053. or https://mykeyvault.vault.azure.net/keys/testkey. To be usable the following prerequisites must be met:\n\n The Batch Account has a System Assigned identity\n The account identity has been granted Key/Get, Key/Unwrap and Key/Wrap permissions\n The KeyVault has soft-delete and purge protection enabled"
}
},
"description": "KeyVault configuration when using an encryption KeySource of Microsoft.KeyVault."
Expand Down Expand Up @@ -4754,7 +4760,8 @@
"type": "string",
"title": "The container technology to be used.",
"enum": [
"DockerCompatible"
"DockerCompatible",
"CriCompatible"
],
"x-ms-enum": {
"name": "ContainerType",
Expand All @@ -4763,6 +4770,10 @@
{
"value": "DockerCompatible",
"description": "A Docker compatible container technology will be used to launch the containers."
},
{
"value": "CriCompatible",
"description": "A CRI based technology will be used to launch the containers."
}
]
}
Expand Down Expand Up @@ -4851,6 +4862,10 @@
"type": "boolean",
"description": "Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true."
},
"enableAutomaticUpgrade": {
"type": "boolean",
"description": "Indicates whether the extension should be automatically upgraded by the platform if there is a newer version of the extension available."
},
"settings": {
"type": "object",
"title": "JSON formatted public settings for the extension."
Expand Down Expand Up @@ -5500,6 +5515,15 @@
"$ref": "#/definitions/PublicIPAddressConfiguration",
"title": "The Public IPAddress configuration for Compute Nodes in the Batch Pool.",
"description": "This property is only supported on Pools with the virtualMachineConfiguration property."
},
"enableAcceleratedNetworking": {
"type": "boolean",
"title": "Whether this pool should enable accelerated networking.",
"description": "Accelerated networking enables single root I/O virtualization (SR-IOV) to a VM, which may lead to improved networking performance. For more details, see: https://learn.microsoft.com/azure/virtual-network/accelerated-networking-overview.",
"externalDocs": {
"url": "https://learn.microsoft.com/azure/virtual-network/accelerated-networking-overview",
"description": "Create a VM with Accelerated Networking."
}
}
},
"description": "The network configuration for a pool."
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "default-azurebatch-japaneast",
"accountName": "sampleacct",
"poolName": "testpool",
"api-version": "2023-05-01",
"parameters": {
"properties": {
"vmSize": "STANDARD_D1_V2",
"networkConfiguration": {
"subnetId": "/subscriptions/subid/resourceGroups/rg1234/providers/Microsoft.Network/virtualNetworks/network1234/subnets/subnet123",
"enableAcceleratedNetworking": true
},
"deploymentConfiguration": {
"virtualMachineConfiguration": {
"imageReference": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2016-datacenter-smalldisk",
"version": "latest"
},
"nodeAgentSkuId": "batch.node.windows amd64"
}
},
"scaleSettings": {
"fixedScale": {
"targetDedicatedNodes": 1,
"targetLowPriorityNodes": 0
}
}
}
}
},
"responses": {
"200": {
"headers": {
"ETag": "W/\"0x8DB46CB72A227E2\""
},
"body": {
"id": "/subscriptions/subid/resourceGroups/default-azurebatch-japaneast/providers/Microsoft.Batch/batchAccounts/sampleacct/pools/testpool",
"name": "testpool",
"type": "Microsoft.Batch/batchAccounts/pools",
"etag": "W/\"0x8DB46CB72A227E2\"",
"properties": {
"lastModified": "2023-04-27T02:59:41.8592226Z",
"creationTime": "2023-04-27T02:59:41.8592226Z",
"provisioningState": "Succeeded",
"provisioningStateTransitionTime": "2023-04-27T02:59:41.8592226Z",
"allocationState": "Steady",
"allocationStateTransitionTime": "2023-04-27T03:00:34.0646502Z",
"vmSize": "STANDARD_D1_V2",
"interNodeCommunication": "Disabled",
"taskSlotsPerNode": 1,
"taskSchedulingPolicy": {
"nodeFillType": "Spread"
},
"deploymentConfiguration": {
"virtualMachineConfiguration": {
"imageReference": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2016-datacenter-smalldisk",
"version": "latest"
},
"nodeAgentSkuId": "batch.node.windows amd64"
}
},
"networkConfiguration": {
"subnetId": "/subscriptions/subid/resourceGroups/rg1234/providers/Microsoft.Network/virtualNetworks/network1234/subnets/subnet123",
"dynamicVnetAssignmentScope": "none",
"enableAcceleratedNetworking": true
},
"scaleSettings": {
"fixedScale": {
"targetDedicatedNodes": 1,
"targetLowPriorityNodes": 0,
"resizeTimeout": "PT15M"
}
},
"resizeOperationStatus": {
"targetDedicatedNodes": 1,
"nodeDeallocationOption": "Requeue",
"resizeTimeout": "PT15M",
"startTime": "2023-04-27T02:59:41.8592226Z"
},
"currentDedicatedNodes": 1,
"currentLowPriorityNodes": 0,
"currentNodeCommunicationMode": "Classic"
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@
"extensions": [
{
"name": "batchextension1",
"type": "SecurityMonitoringForLinux",
"publisher": "Microsoft.Azure.Security.Monitoring",
"typeHandlerVersion": "1.0",
"type": "KeyVaultForLinux",
"publisher": "Microsoft.Azure.KeyVault",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"settings": {
"settingsKey": "settingsValue"
},
"protectedSettings": {
"protectedSettingsKey": "protectedSettingsValue"
"secretsManagementSettingsKey": "secretsManagementSettingsValue",
"authenticationSettingsKey": "authenticationSettingsValue"
}
}
]
Expand Down Expand Up @@ -85,12 +84,14 @@
"extensions": [
{
"name": "batchextension1",
"type": "SecurityMonitoringForLinux",
"publisher": "Microsoft.Azure.Security.Monitoring",
"typeHandlerVersion": "1.0",
"type": "KeyVaultForLinux",
"publisher": "Microsoft.Azure.KeyVault",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"settings": {
"settingsKey": "settingsValue"
"secretsManagementSettingsKey": "secretsManagementSettingsValue",
"authenticationSettingsKey": "authenticationSettingsValue"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"parameters": {
"subscriptionId": "subid",
"resourceGroupName": "default-azurebatch-japaneast",
"accountName": "sampleacct",
"poolName": "testpool",
"api-version": "2023-05-01"
},
"responses": {
"200": {
"headers": {
"ETag": "W/\"0x8D4EDFEBFADF4AB\""
},
"body": {
"id": "/subscriptions/subid/resourceGroups/default-azurebatch-japaneast/providers/Microsoft.Batch/batchAccounts/sampleacct/pools/testpool",
"name": "testpool",
"type": "Microsoft.Batch/batchAccounts/pools",
"etag": "W/\"0x8D4EDFEBFADF4AB\"",
"properties": {
"lastModified": "2023-04-28T02:32:32.8696419Z",
"creationTime": "2023-04-28T02:32:32.8696419Z",
"provisioningState": "Succeeded",
"provisioningStateTransitionTime": "2023-04-28T02:32:32.8696419Z",
"allocationState": "Steady",
"allocationStateTransitionTime": "2023-04-28T02:33:40.82831Z",
"vmSize": "STANDARD_D1_V2",
"interNodeCommunication": "Disabled",
"taskSlotsPerNode": 1,
"taskSchedulingPolicy": {
"nodeFillType": "Spread"
},
"deploymentConfiguration": {
"virtualMachineConfiguration": {
"imageReference": {
"publisher": "MicrosoftWindowsServer",
"offer": "WindowsServer",
"sku": "2016-datacenter-smalldisk",
"version": "latest"
},
"nodeAgentSkuId": "batch.node.windows amd64"
}
},
"networkConfiguration": {
"dynamicVnetAssignmentScope": "none",
"enableAcceleratedNetworking": true
},
"scaleSettings": {
"fixedScale": {
"targetDedicatedNodes": 1,
"targetLowPriorityNodes": 0,
"resizeTimeout": "PT15M"
}
},
"resizeOperationStatus": {
"targetDedicatedNodes": 1,
"nodeDeallocationOption": "Requeue",
"resizeTimeout": "PT15M",
"startTime": "2023-04-28T02:32:32.8696419Z"
},
"currentDedicatedNodes": 1,
"currentLowPriorityNodes": 0,
"currentNodeCommunicationMode": "Classic"
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,14 @@
"extensions": [
{
"name": "batchextension1",
"type": "SecurityMonitoringForLinux",
"publisher": "Microsoft.Azure.Security.Monitoring",
"typeHandlerVersion": "1.0",
"type": "KeyVaultForLinux",
"publisher": "Microsoft.Azure.KeyVault",
"typeHandlerVersion": "2.0",
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"settings": {
"settingsKey": "settingsValue"
"secretsManagementSettingsKey": "secretsManagementSettingsValue",
"authenticationSettingsKey": "authenticationSettingsValue"
}
}
]
Expand Down

0 comments on commit 0c48669

Please sign in to comment.