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.

Sign up for GitHub

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

update to 1.1.0 #30

Merged
merged 2 commits into from
Mar 20, 2024
Merged

update to 1.1.0 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1110c74
Squashed commit of the following:
wanpengyang Mar 20, 2024
77abdaa
remove trailing comma
wanpengyang Mar 20, 2024
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
16 changes: 7 additions & 9 deletions docs/archetypes/logging.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@

## Table of Contents

- [Archetype: Logging](#archetype--logging)
- [Table of Contents](#table-of-contents)
- [Overview](#overview)
- [Schema Definition](#schema-definition)
- [Delete Locks](#delete-locks)
- [Service Health](#service-health)
- [Deployment Scenarios](#deployment-scenarios)
- [Example Deployment Parameters](#example-deployment-parameters)
- [Deployment Instructions](#deployment-instructions)
* [Overview](#overview)
* [Schema Definition](#schema-definition)
* [Delete Locks](#delete-locks)
* [Service Health](#service-health)
* [Deployment Scenarios](#deployment-scenarios)
* [Example Deployment Parameters](#example-deployment-parameters)
* [Deployment Instructions](#deployment-instructions)

## Overview

Expand Down
2 changes: 1 addition & 1 deletion tests/schemas/lz-generic-subscription/FullDeployment-With-Location.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"location": {
"value": "canadacentral"
"value": "canada"
},
"serviceHealthAlerts": {
"value": {
Expand Down
40 changes: 33 additions & 7 deletions tests/schemas/lz-healthcare/Synapse-sqlAuth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,16 @@
"sqldb": {
"value": {
"enabled": true,
"aadAuthenticationOnly": true,
"aadLoginName": "DBA Group",
"aadLoginObjectID": "4e4ea47c-ee21-4add-ad2f-a75d0d8014e0",
"aadLoginType": "Group"
"sqlAuthenticationUsername": "azadmin",
"aadAuthenticationOnly": false
}
},
"synapse": {
"value": {
"aadAuthenticationOnly": false,
"sqlAuthenticationUsername": "synaseAdminUser"
"aadAuthenticationOnly": true,
"aadLoginName": "az.admins",
"aadLoginObjectID": "e0357d81-55d8-44e9-9d9c-ab09dc710785",
"aadLoginType": "Group"
}
},
"hubNetwork": {
Expand Down Expand Up @@ -151,7 +151,33 @@
"name": "webapp",
"addressPrefix": "10.5.8.0/25"
},
"optional": []
"optional": [
{
"comments": "Optional Subnet 1",
"name": "virtualMachines",
"addressPrefix": "10.5.9.0/25",
"nsg": {
"enabled": true
},
"udr": {
"enabled": true
}
},
{
"comments": "Optional Subnet 2 with delegation for NetApp Volumes",
"name": "NetappVolumes",
"addressPrefix": "10.5.10.0/25",
"nsg": {
"enabled": false
},
"udr": {
"enabled": false
},
"delegations": {
"serviceName": "Microsoft.NetApp/volumes"
}
}
]
}
}
}
Expand Down
29 changes: 13 additions & 16 deletions tests/schemas/lz-machinelearning/AppServiceLinuxContainerPrivateEndpointIsFalse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@
},
"resourceGroups": {
"value": {
"automation": "azml-automation",
"compute": "azml-compute",
"monitor": "azml-monitor",
"networking": "azml-networking",
"automation": "azmlcmk-automation",
"compute": "azmlcmk-compute",
"monitor": "azmlcmk-monitor",
"networking": "azmlcmk-networking",
"networkWatcher": "NetworkWatcherRG",
"security": "azml-security",
"storage": "azml-storage"
"security": "azmlcmk-security",
"storage": "azmlcmk-storage"
}
},
"useCMK": {
Expand All @@ -95,11 +95,11 @@
},
"aks": {
"value": {
"version": "1.21.2",
"version": "1.22.6",
"enabled": true,
"networkPlugin": "azure",
"networkPolicy": "azure",
"podCidr": "",
"networkPlugin": "kubenet",
"networkPolicy": "calico",
"podCidr": "11.0.0.0/16",
"serviceCidr": "20.0.0.0/16",
"dnsServiceIP": "20.0.0.10",
"dockerBridgeCidr": "30.0.0.1/16"
Expand All @@ -110,17 +110,14 @@
"enabled": true,
"skuName": "P1V2",
"skuTier": "Premium",
"enablePrivateEndpoint": false
"enablePrivateEndpoint": true
}
},
"sqldb": {
"value": {
"enabled": true,
"sqlAuthenticationUsername": "azadmin",
"aadAuthenticationOnly": false,
"aadLoginName": "DBA Group",
"aadLoginObjectID": "4e4ea47c-ee21-4add-ad2f-a75d0d8014e0",
"aadLoginType": "Group"
"aadAuthenticationOnly": false
}
},
"sqlmi": {
Expand Down Expand Up @@ -149,7 +146,7 @@
"value": {
"peerToHubVirtualNetwork": true,
"useRemoteGateway": false,
"name": "azml-vnet",
"name": "azmlcmk-vnet",
"dnsServers": [
"10.18.1.4"
],
Expand Down
2 changes: 1 addition & 1 deletion tests/schemas/lz-machinelearning/FullDeployment-With-Location.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
},
"aks": {
"value": {
"version": "1.22.6",
"version": "1.21.2",
"enabled": true,
"networkPlugin": "kubenet",
"networkPolicy": "calico",
Expand Down
2 changes: 1 addition & 1 deletion tests/schemas/lz-machinelearning/FullDeployment-With-OptionalSubnets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
},
"aks": {
"value": {
"version": "1.22.6",
"version": "1.21.2",
"enabled": true,
"networkPlugin": "kubenet",
"networkPolicy": "calico",
Expand Down
2 changes: 1 addition & 1 deletion tests/schemas/lz-platform-connectivity-hub-azfw/BudgetIsFalse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"3"
],
"forcedTunnelingEnabled": false,
"forcedTunnelingNextHop": "10.17.1.4",
"forcedTunnelingNextHop": "10.17.1.4"
},
"network": {
"name": "hub-vnet",
Expand Down
Loading