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

Rahalan/fix pipelines7 #92

Merged
merged 20 commits into from
Oct 2, 2021
Merged
4 changes: 2 additions & 2 deletions arm/Microsoft.Network/privateEndpoints/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
},
{
"type": "Microsoft.Network/privateEndpoints",
"apiVersion": "2020-07-01",
"apiVersion": "2021-02-01",
"name": "[parameters('privateEndpointName')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand All @@ -97,7 +97,7 @@
},
{
"type": "Microsoft.Network/privateEndpoints/privateDnsZoneGroups",
"apiVersion": "2020-07-01",
"apiVersion": "2021-02-01",
"condition": "[not(empty(parameters('privateDNSId')))]",
"name": "[concat(parameters('privateEndpointName'),'/default')]",
"dependsOn": [
Expand Down
Binary file modified arm/Microsoft.Network/privateEndpoints/readme.md
Binary file not shown.
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/publicIPAddresses/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
},
{
"type": "Microsoft.Network/publicIPAddresses",
"apiVersion": "2020-08-01",
"apiVersion": "2021-02-01",
"name": "[parameters('publicIPAddressesName')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand Down
Binary file modified arm/Microsoft.Network/publicIPAddresses/readme.md
Binary file not shown.
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/publicIPPrefixes/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
},
{
"type": "Microsoft.Network/publicIPPrefixes",
"apiVersion": "2020-08-01",
"apiVersion": "2021-02-01",
"name": "[parameters('publicIpPrefixName')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand Down
3 changes: 2 additions & 1 deletion arm/Microsoft.Network/publicIPPrefixes/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This template deploys Public IP Prefixes.
|Resource Type|ApiVersion|
|:--|:--|
|`Microsoft.Resources/deployments`|2018-02-01|
|`Microsoft.Network/publicIPPrefixes`|2020-08-01|
|`Microsoft.Network/publicIPPrefixes`|2021-02-01|
|`providers/locks`|2016-09-01|
|`Microsoft.Network/publicIPPrefixes/providers/roleAssignments`|2018-09-01-preview|

Expand Down Expand Up @@ -84,4 +84,5 @@ Tag names and tag values can be provided as needed. A tag can be left without a
## Additional resources

- [Public IP address prefix](https://docs.microsoft.com/en-us/azure/virtual-network/public-ip-address-prefix)
- [Template reference](https://docs.microsoft.com/en-us/azure/templates/microsoft.network/2021-02-01/publicipprefixes)
- [Use tags to organize your Azure resources](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-using-tags)
2 changes: 1 addition & 1 deletion arm/Microsoft.Network/routeTables/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
},
{
"type": "Microsoft.Network/routeTables",
"apiVersion": "2020-08-01",
"apiVersion": "2021-02-01",
"name": "[parameters('routeTableName')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand Down
4 changes: 2 additions & 2 deletions arm/Microsoft.Network/routeTables/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This template deploys User Defined Route Tables.
|Resource Type|ApiVersion|
|:--|:--|
|`Microsoft.Resources/deployments`|2018-02-01|
|`Microsoft.Network/routeTables`|2020-08-01|
|`Microsoft.Network/routeTables`|2021-02-01|
|`providers/locks`|2016-09-01|
|`Microsoft.Network/routeTables/providers/roleAssignments`|2018-09-01-preview|

Expand Down Expand Up @@ -126,5 +126,5 @@ Tag names and tag values can be provided as needed. A tag can be left without a

## Additional resources

- [Microsoft.Network routeTables template reference](https://docs.microsoft.com/en-us/azure/templates/microsoft.network/2019-09-01/routetables)
- [Microsoft.Network routeTables template reference](https://docs.microsoft.com/en-us/azure/templates/microsoft.network/2021-02-01/routetables)
- [Use tags to organize your Azure resources](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-using-tags)
10 changes: 5 additions & 5 deletions arm/Microsoft.Network/trafficmanagerprofiles/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"description": "Required. Name of the Traffic Manager"
}
},
"location": {
"diagnosticsLocation": {
"type": "string",
"defaultValue": "[resourceGroup().location]",
"metadata": {
Expand Down Expand Up @@ -348,7 +348,7 @@
{
"condition": "[not(empty(parameters('cuaId')))]",
"type": "Microsoft.Resources/deployments",
"apiVersion": "2021-01-01",
"apiVersion": "2021-04-01",
"name": "[concat('pid-', parameters('cuaId'))]",
"properties": {
"mode": "Incremental",
Expand All @@ -363,7 +363,7 @@
{
"name": "[parameters('trafficManagerName')]",
"type": "Microsoft.Network/trafficmanagerprofiles",
"apiVersion": "2018-04-01",
"apiVersion": "2018-08-01",
"tags": "[parameters('tags')]",
"location": "global",
"properties": {
Expand Down Expand Up @@ -396,7 +396,7 @@
"type": "Microsoft.Network/trafficmanagerprofiles/providers/diagnosticsettings",
"apiVersion": "2017-05-01-preview",
"name": "[concat(parameters('trafficManagerName'), '/Microsoft.Insights/service')]",
"location": "[parameters('location')]",
"location": "[parameters('diagnosticsLocation')]",
"condition": "[or(not(empty(parameters('diagnosticStorageAccountId'))),not(empty(parameters('workspaceId'))),not(empty(parameters('eventHubAuthorizationRuleId'))),not(empty(parameters('eventHubName'))))]",
"dependsOn": [
"[concat('Microsoft.Network/trafficmanagerprofiles/', parameters('trafficManagerName'))]"
Expand All @@ -414,7 +414,7 @@
},
{
"name": "[concat('rbac-',deployment().name, copyIndex())]",
"apiVersion": "2019-10-01",
"apiVersion": "2021-04-01",
"type": "Microsoft.Resources/deployments",
"condition": "[not(empty(parameters('roleAssignments')))]",
"dependsOn": [
Expand Down
8 changes: 4 additions & 4 deletions arm/Microsoft.Network/trafficmanagerprofiles/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ This module deploys Traffic Manager, with resource lock.

| Resource Type | Api Version |
| :-- | :-- |
| `Microsoft.Resources/deployments` | 2020-06-01 |
| `Microsoft.Network/trafficmanagerprofiles` | 2018-04-01 |
| `Microsoft.Resources/deployments` | 2021-04-01 |
| `Microsoft.Network/trafficmanagerprofiles` | 2018-08-01 |
| `Microsoft.Network/trafficmanagerprofiles/providers/diagnosticsettings` | 2017-05-01-preview |
| `Microsoft.Network/trafficmanagerprofiles/providers/roleAssignments` | 2018-09-01-preview |
| `providers/locks` |
Expand All @@ -22,7 +22,7 @@ This module deploys Traffic Manager, with resource lock.
| `endpoints` | array | Optional. The list of endpoints in the Traffic Manager profile. | System.Object[] | |
| `eventHubAuthorizationRuleId` | string | Optional. Resource ID of the event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | |
| `eventHubName` | string | Optional. Name of the event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | |
| `location` | string | Optional. Location for diagnostics settings only. Traffic manager will always be deployed globally. | `resourceGroup().location` | |
| `diagnosticsLocation` | string | Optional. Location for diagnostics settings only. Traffic manager will always be deployed globally. | `resourceGroup().location` | |
| `lockForDeletion` | bool | Optional. Switch to lock Traffic Manager from deletion. | False | |
| `maxReturn` | int | Optional. Maximum number of endpoints to be returned for MultiValue routing type. | 1 | |
| `monitorConfig` | object | Optional. The endpoint monitoring settings of the Traffic Manager profile. | protocol=http; port=80; path=/ | |
Expand Down Expand Up @@ -135,5 +135,5 @@ Tag names and tag values can be provided as needed. A tag can be left without a
## Additional resources

- [What is Traffic Manager?](https://docs.microsoft.com/en-us/azure/traffic-manager/traffic-manager-overview)
- [Microsoft.Network/trafficmanagerprofiles template reference](https://docs.microsoft.com/en-us/azure/templates/microsoft.network/2018-04-01/trafficmanagerprofiles)
- [Microsoft.Network/trafficmanagerprofiles template reference](https://docs.microsoft.com/en-us/azure/templates/microsoft.network/2018-08-01/trafficmanagerprofiles)
- [Use tags to organize your Azure resources](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-using-tags)
12 changes: 10 additions & 2 deletions arm/Microsoft.Network/virtualNetworkGateways/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
"description": "Optional. Resource Id of the Public IP Prefix object. This is only needed if you want your Public IPs created in a PIP Prefix."
}
},
"publicIpZones": {
"type": "array",
"defaultValue": ["1"],
"metadata": {
"description": "Optional. Specifies the zones of the Public IP address."
}
},
"domainNameLabel": {
"type": "array",
"defaultValue": [
Expand Down Expand Up @@ -568,7 +575,7 @@
},
{
"type": "Microsoft.Network/publicIPAddresses",
"apiVersion": "2020-08-01",
"apiVersion": "2021-02-01",
"name": "[variables('gatewayPipName')[copyindex()]]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand All @@ -585,6 +592,7 @@
"publicIPPrefix": "[if(not(empty(parameters('publicIPPrefixId'))), variables('publicIPPrefix'), json('null'))]",
"dnsSettings": "[if(equals(length(variables('gatewayPipName')),length(parameters('domainNameLabel'))), json(concat('{\"domainNameLabel\": \"', parameters('domainNameLabel')[copyindex()], '\"}')), json('null'))]"
},
"zones": "[parameters('publicIpZones')]",
"resources": [
{
"type": "providers/locks",
Expand Down Expand Up @@ -622,7 +630,7 @@
},
{
"type": "Microsoft.Network/virtualNetworkGateways",
"apiVersion": "2020-08-01",
"apiVersion": "2021-02-01",
"name": "[parameters('virtualNetworkGatewayName')]",
"location": "[parameters('location')]",
"tags": "[parameters('tags')]",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
"gatewayPipName": {
"value": ["sxx-az-vnet-vpn-gw-weu-p-001-pip-03"]
},
"publicIPPrefixId": {
"value": "/subscriptions/8629be3b-96bc-482d-a04b-ffff597c65a2/resourceGroups/dependencies-rg/providers/Microsoft.Network/publicIPPrefixes/sxx-az-pippfx-weu-x-003"
},
"domainNameLabel": {
"value": ["sxx-az-vnet-vpn-gw-weu-p-001-pip-03"]
},
Expand Down
7 changes: 4 additions & 3 deletions arm/Microsoft.Network/virtualNetworkGateways/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ This module deploys a Virtual Network Gateway.
|Resource Type|ApiVersion|
|:--|:--|
|`Microsoft.Resources/deployments`|2018-02-01|
|`Microsoft.Network/publicIPAddresses`|2020-08-01|
|`Microsoft.Network/virtualNetworkGateways`|2020-08-01|
|`Microsoft.Network/publicIPAddresses`|2021-02-01|
|`Microsoft.Network/virtualNetworkGateways`|2021-02-01|
|`Microsoft.Network/publicIPAddresses/providers/diagnosticSettings`|2017-05-01-preview|
|`providers/locks`|2016-09-01|
|`Microsoft.Network/virtualNetworkGateways/providers/diagnosticSettings`|2017-05-01-preview|
Expand All @@ -34,6 +34,7 @@ This module deploys a Virtual Network Gateway.
| `location` | string | Optional. Location for all resources. | [resourceGroup().location] | |
| `lockForDeletion` | bool | Optional. Switch to lock Virtual Network Gateway from deletion. | False | |
| `publicIPPrefixId` | string | Optional. Resource Id of the Public IP Prefix object. This is only needed if you want your Public IPs created in a PIP Prefix. | | |
| `publicIpZones` | string | Optional. Specifies the zones of the Public IP address. | "1" | |
| `roleAssignments` | array | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | System.Object[] | |
| `tags` | object | Optional. Tags of the resource. | | |
| `virtualNetworkGatewayName` | string | Required. Specifies the Virtual Network Gateway name. | | |
Expand Down Expand Up @@ -137,7 +138,7 @@ Tag names and tag values can be provided as needed. A tag can be left without a

## Additional resources

- [Microsoft.Network virtualNetworkGateways template reference](https://docs.microsoft.com/en-us/azure/templates/microsoft.network/2018-11-01/virtualnetworkgateways)
- [Microsoft.Network virtualNetworkGateways template reference](https://docs.microsoft.com/en-us/azure/templates/microsoft.network/2021-02-01/virtualnetworkgateways)
- [What is VPN Gateway?](https://docs.microsoft.com/en-us/azure/vpn-gateway/vpn-gateway-about-vpngateways)
- [ExpressRoute virtual network gateway and FastPath](https://docs.microsoft.com/en-us/azure/expressroute/expressroute-about-virtual-network-gateways)
- [Public IP address prefix](https://docs.microsoft.com/en-us/azure/virtual-network/public-ip-address-prefix)
Expand Down