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

feat: merge scenarios #192

Merged
merged 42 commits into from
Nov 29, 2023
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
25563a1
feat: ASE shared modules (CARML)
thotheod Oct 17, 2023
f091c7b
feat: fixed spoke subnets
thotheod Oct 17, 2023
94dbdcd
doc: changes for deployAseV3
thotheod Oct 17, 2023
fb0c644
fix: typo
thotheod Oct 17, 2023
b5d16bd
doc: settings
thotheod Oct 17, 2023
1925a95
fix
thotheod Oct 17, 2023
4c0f5ad
fx
thotheod Oct 17, 2023
b4b55ae
feat: asp merged - test 1
thotheod Oct 17, 2023
ad5dbce
fix: nsg
thotheod Oct 17, 2023
f967ded
fix zone redundant
thotheod Oct 18, 2023
5f7cb31
fix: private DNS Zone
thotheod Oct 18, 2023
fc1204d
feat: merged scenarios BICEP
thotheod Oct 18, 2023
8031859
feat: portal deployment
thotheod Oct 18, 2023
0b39bcc
fix
thotheod Oct 18, 2023
daa1718
feat: deployAse Merged
thotheod Oct 20, 2023
1321bae
fix
thotheod Oct 20, 2023
9f072c8
Removed (most of) ASEV3 scenario
thotheod Oct 24, 2023
0ecc7d4
test actions
thotheod Oct 30, 2023
c03f2b1
action test
thotheod Oct 30, 2023
4e535d1
get latest from main (#193)
thotheod Oct 30, 2023
a278b44
test
thotheod Nov 1, 2023
8cf9c3a
there is Scenario 2
thotheod Nov 1, 2023
8dab768
fix: fix depedencies
thotheod Nov 2, 2023
501c761
depedency and conditional logic fix
thotheod Nov 2, 2023
5b2b255
ARM sync
thotheod Nov 2, 2023
0a067a6
Updated main readme
JinLee794 Nov 13, 2023
341986a
Merge branch 'main' into feature/merge-scenarios
thotheod Nov 14, 2023
50df878
ok
thotheod Nov 14, 2023
8eec99f
allow non-AZ ASE
thotheod Nov 14, 2023
6d37a2e
sync ARM
thotheod Nov 14, 2023
bc2a52a
fix: zone redundant or not support for ASE
thotheod Nov 14, 2023
0325b3e
Documentation cleanup, Adding ISSUE_TEMPLATES for bugs and features, …
JinLee794 Nov 14, 2023
882819f
sync json
thotheod Nov 15, 2023
9ff1858
Merge branch 'feature/merge-scenarios' of https://github.com/Azure/ap…
thotheod Nov 15, 2023
aa14ac4
fix: dependency error
thotheod Nov 15, 2023
3e5ef73
fix typo in condition
thotheod Nov 15, 2023
51735ff
test ASE Private DNS Zone Dependency
thotheod Nov 15, 2023
19b74b4
fix dependencies
thotheod Nov 15, 2023
1ab97fb
fix
thotheod Nov 15, 2023
6ea2ba1
ASE Private DNS Zone must be in same scope as ASE
thotheod Nov 15, 2023
aaa44dd
test
thotheod Nov 15, 2023
540a34b
fix outputs
thotheod Nov 16, 2023
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
Prev Previous commit
Next Next commit
doc: settings
  • Loading branch information
thotheod committed Oct 17, 2023
commit b5d16bdccf8222bb117cddf75788c758eb60b03b
Original file line number Diff line number Diff line change
@@ -4,15 +4,16 @@
"parameters": {
// max length: 10. Suffix that will be used to name the resources in a pattern like <resourceAbbreviation>-<workloadName>
"workloadName" : {
"value": "appSvc-LZA"
"value": "merge-ase"
// "value": "merge-mul"
},
//Required. The name of the environmentName (e.g. "dev", "test", "prod", "preprod", "staging", "uat", "dr", "qa"). Up to 8 characters long.
"environmentName": {
"value": "dev"
},
//Optional, default is false. Set to true if you want to deploy ASE v3 instead of Multitenant App Service Plan.
"deployAseV3": {
"value": false
"value": true
},
//If empty, then a new hub will be deployed. If given, no new hub will be created and we create the peering between spoke and and existing hub vnet
"vnetHubResourceId": {
@@ -32,23 +33,23 @@
},
// set to true if you want to a redis cache
"deployRedis": {
"value": true
"value": false
},
// set to true if you want to deploy a azure SQL server and default database
"deployAzureSql": {
"value": true
"value": false
},
// set to true if you want to deploy application configuration
"deployAppConfig": {
"value": true
"value": false
},
// set to true if you want to deploy a jumpbox/devops VM
"deployJumpHost": {
"value": true
"value": false
},
// set to true if you want to auto approve the Private Endpoint of the AFD Premium
"autoApproveAfdPrivateEndpoint": {
"value": true
"value": false
},
// CIDR of the subnet that will host the azure Firewall
"subnetHubFirewallAddressSpace": {
@@ -64,7 +65,7 @@
},
//CIDR of the subnet that will hold the app services plan. ATTENTION: ASEv3 needs a /24 network
"subnetSpokeAppSvcAddressSpace": {
"value": "10.240.0.0/26"
"value": "10.240.0.0/24"
},
// //CIDRof the subnet that will hold the private link for the AFD Premium
// "subnetSpokeAfdIngressAddressSpace": {