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

remove 'CanNotDelete' option #48

Open
wants to merge 144 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
f56cd24
Initial checkin with all files for a Single VM appliance definition.
May 10, 2017
56fed5a
Fixing File Paths
May 10, 2017
9d286c7
Added Readme.md
May 10, 2017
9fc3c1d
Merge pull request #1 from Azure/cloudapptools/appliances/singlevm
Turbonium May 11, 2017
aec2270
Single storage account appliance
May 11, 2017
13a21f8
Fix readme
May 11, 2017
801025b
Update Readme.md. Added an exmample parameters file.
May 11, 2017
ed64158
Merge pull request #2 from Azure/mikett
Turbonium May 11, 2017
7755128
adding appliance
krnese May 21, 2017
7ff60ff
Merge pull request #3 from krnese/kn
ravbhatnagar May 22, 2017
99ed523
update
krnese May 24, 2017
092c898
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jun 9, 2017
b12a0df
updating folder structure for serviceFabric sample
krnese Jun 9, 2017
c6e2b1c
added 101-storageAccount
krnese Jun 9, 2017
abceb64
Merge pull request #6 from krnese/101-storageAccount
ravbhatnagar Jun 12, 2017
4f21d5c
Merge pull request #4 from krnese/kn-update
ravbhatnagar Jun 12, 2017
021123f
Merge pull request #5 from krnese/update
ravbhatnagar Jun 12, 2017
c6752e9
update
krnese Jun 16, 2017
2be48ea
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jun 21, 2017
a69442a
Fixing format and structure :+1:
krnese Jun 21, 2017
d22f746
Merge pull request #7 from krnese/format
krnese Jun 21, 2017
ff21edb
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jun 29, 2017
86b6112
update
krnese Jun 29, 2017
293453e
Merge pull request #8 from krnese/sfupdates
krnese Jun 29, 2017
bbe8264
update1
krnese Jun 29, 2017
ee7d355
added guidance
krnese Jun 29, 2017
0a89dbb
update
krnese Jun 29, 2017
ba05607
fixing url
krnese Jun 29, 2017
51600c0
url
krnese Jun 29, 2017
6139971
fix
krnese Jun 29, 2017
59a706c
ok
krnese Jun 29, 2017
ef07fd0
update
krnese Jun 29, 2017
0e0595b
updates
krnese Jun 29, 2017
53af402
minor update
krnese Jun 29, 2017
30ca18d
Update psscript.md
bgelens Jun 29, 2017
c331fba
Merge pull request #2 from bgelens/patch-1
krnese Jun 29, 2017
00da4f9
added update
krnese Jun 29, 2017
a1a7f5e
Merge branch 'guidance' of https://github.com/krnese/azure-managedapp…
krnese Jun 29, 2017
e17f07a
updated sample and reference
krnese Jun 30, 2017
6908069
update
krnese Jun 30, 2017
8511392
added example
krnese Jun 30, 2017
b17e0a4
update
krnese Jun 30, 2017
209c62c
update
krnese Jul 5, 2017
15c34dd
Merge pull request #9 from krnese/guidance
krnese Jul 5, 2017
d630272
app update
krnese Jul 5, 2017
76eae4c
Merge pull request #10 from krnese/knupdate
krnese Jul 5, 2017
a7404e9
typo
krnese Jul 5, 2017
435c1bd
Merge pull request #11 from krnese/readme
krnese Jul 5, 2017
2f91960
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jul 5, 2017
dc7f3c7
update
krnese Jul 10, 2017
cc20c6c
Merge pull request #12 from krnese/validation
krnese Jul 10, 2017
c3e0546
Merge remote-tracking branch 'refs/remotes/origin/validation'
krnese Jul 10, 2017
9a47f59
updated url's
krnese Jul 10, 2017
b2b6a00
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jul 10, 2017
8919af5
Merge pull request #14 from krnese/update3
krnese Jul 10, 2017
6df3e4b
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jul 11, 2017
df3484c
updated marketplace sample
krnese Jul 11, 2017
c114285
Merge pull request #15 from krnese/update4
krnese Jul 11, 2017
782b177
fix
krnese Jul 11, 2017
3fed55b
Merge pull request #16 from krnese/update4
krnese Jul 11, 2017
219a4a4
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jul 11, 2017
631510d
minor update
krnese Jul 11, 2017
3018ef9
Merge pull request #17 from krnese/minorFix
krnese Jul 11, 2017
af8ca2b
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jul 13, 2017
8dd4fd6
updated validation
krnese Jul 13, 2017
8997bf0
Merge pull request #18 from krnese/managedRg
krnese Jul 13, 2017
d16b5df
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jul 17, 2017
da7d54d
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Sep 1, 2017
ef14a3e
Merge branch 'master' of https://github.com/krnese/azure-managedapp-s…
krnese Sep 1, 2017
4b277e5
updated sample with keyvault
krnese Sep 6, 2017
1f6c67b
Merge pull request #20 from krnese/secret
krnese Sep 6, 2017
06f29f1
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Sep 6, 2017
f6cd338
fixed typo
krnese Sep 6, 2017
e5acdc6
Merge pull request #21 from krnese/fix
krnese Sep 6, 2017
23b9e9d
Merge remote-tracking branch 'refs/remotes/Azure/master' into update
krnese Sep 12, 2017
da983c6
update
krnese Sep 12, 2017
41d31f3
Merge pull request #22 from krnese/update
krnese Sep 12, 2017
f4245b0
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Sep 12, 2017
f350a0f
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Sep 12, 2017
9e9205e
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Sep 12, 2017
8a1a69f
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Sep 12, 2017
515a2ca
Merge branch 'master' of https://github.com/krnese/azure-managedapp-s…
krnese Sep 12, 2017
8211ce1
update
krnese Sep 12, 2017
f66a856
Merge pull request #23 from krnese/master
krnese Sep 12, 2017
034126d
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Sep 12, 2017
e34523e
update
krnese Sep 12, 2017
6dd7a01
Merge pull request #24 from krnese/documentation
krnese Sep 12, 2017
ef6199c
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Sep 12, 2017
33f8146
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Sep 15, 2017
44f2357
Merge branch 'master' of https://github.com/krnese/azure-managedapp-s…
krnese Sep 15, 2017
228cf5e
batch1
krnese Oct 2, 2017
b5c038a
Merge pull request #25 from krnese/GAUpdate
krnese Oct 2, 2017
551a052
update
krnese Oct 2, 2017
4651713
Merge pull request #26 from krnese/GAUpdate
krnese Oct 2, 2017
1ccb8dd
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Oct 2, 2017
c40a774
batch2
krnese Oct 2, 2017
4710585
Merge pull request #27 from krnese/GAUpdate-batch2
krnese Oct 2, 2017
2bd4318
Merge remote-tracking branch 'refs/remotes/Azure/master' into GAUpdat…
krnese Oct 4, 2017
1b76eae
updated readme.
krnese Oct 4, 2017
93042f4
Merge pull request #28 from krnese/GAUpdate-batch2
krnese Oct 4, 2017
7eac1bb
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Oct 4, 2017
4677c56
psupdate
krnese Oct 4, 2017
4a58ae2
Merge pull request #29 from krnese/psUpdate
krnese Oct 4, 2017
86c4882
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Oct 5, 2017
10479ff
cliUpdate
krnese Oct 5, 2017
7f18fbf
Merge pull request #30 from krnese/cliUpdate
krnese Oct 5, 2017
d7e4654
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Oct 5, 2017
65d072b
prettify
krnese Oct 5, 2017
872f48a
Merge pull request #31 from krnese/prettify
krnese Oct 5, 2017
4c4c15c
fixed typo
krnese Oct 20, 2017
b3d1b5d
Merge pull request #32 from krnese/fix
krnese Oct 20, 2017
f210586
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Oct 24, 2017
9cb7451
Merge remote-tracking branch 'refs/remotes/Azure/master' into GA
krnese Oct 25, 2017
959d914
update vmname
krnese Oct 25, 2017
c109dda
Merge pull request #33 from krnese/GA
krnese Oct 25, 2017
8a72361
update
krnese Nov 17, 2017
b96b21d
Merge pull request #35 from krnese/gaUpdate01
krnese Nov 17, 2017
c607f19
new sample
krnese Nov 18, 2017
7948809
Merge pull request #36 from krnese/newSample
krnese Nov 18, 2017
9f0a63b
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Dec 12, 2017
6a4bf7d
Merge branch 'master' of https://github.com/krnese/azure-managedapp-s…
krnese Dec 12, 2017
d9ddfbf
update
krnese Jan 19, 2018
bbec6ea
update
krnese Jan 19, 2018
0842084
Merge pull request #40 from krnese/sfUpdate
krnese Jan 19, 2018
e61e747
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Jan 19, 2018
a415f05
single vm sample
krnese Jan 19, 2018
ea497c5
Merge pull request #41 from krnese/single-vm
krnese Jan 19, 2018
4e5ea59
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Feb 5, 2018
2550853
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Feb 12, 2018
375f839
adding sql iaas sample
krnese Feb 13, 2018
c4ef801
fix
krnese Feb 13, 2018
0eca650
adding sql IaaS sample
krnese Feb 13, 2018
3e39319
Merge pull request #42 from krnese/sqlIaas
krnese Feb 13, 2018
b592018
Merge branch 'master' of https://github.com/krnese/azure-managedapp-s…
krnese Feb 13, 2018
6396b70
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Feb 13, 2018
33721ef
update
krnese Feb 19, 2018
4b6b19c
Merge pull request #43 from krnese/update
krnese Feb 19, 2018
8d9c7ee
pulling sample
krnese Mar 2, 2018
7040fca
f
krnese Mar 2, 2018
e3dd8e4
Merge pull request #1 from krnese/pull
krnese Mar 2, 2018
80e5fd2
Merge remote-tracking branch 'refs/remotes/Azure/master'
krnese Mar 2, 2018
844cd14
pulled
krnese Mar 2, 2018
cd8714e
Merge pull request #44 from krnese/pulled
krnese Mar 2, 2018
65b6203
remove 'CanNotDelete' option
its-just-jo Mar 13, 2019
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
new sample
  • Loading branch information
krnese committed Nov 18, 2017
commit c607f1977a354453c8442e7295f846250580faa7
59 changes: 59 additions & 0 deletions samples/201-managed-app-using-existing-vnet/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Managed Application (Trial or Production) into a new or existing virtual network

This Managed Application supports demonstrates how you can create flexible deployment options for customers, using native ARM template language expressions, together with UI elements.

* New or Existing virtual network?

This managed application can either be deployed to a new virtual network the customer specifices, or plug into an existing virtual network.

* Trial or Production?

Let your customer explore the managed application using trial, where they will run an implementation with minimal cost and footprint. If they opt-in for production, they will get the optimized experienc which can have additional costs (vm size, additional resources for HA etc.)

>Note: This sample is for Managed Application in Service Catalog. For Marketplace, please see these instructions:
[**Marketplace Managed Application**](https://docs.microsoft.com/en-us/azure/managed-applications/publish-marketplace-app)

## Deploy this sample to your Service Catalog

### Deploy using Azure Portal

Clicking on the button below, will create the Managed Application definition to a Resource Group in your Azure subscription.

[![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FAzure%2Fazure-managedapp-samples%2Fmaster%2Fsamples%2F201-managed-app-using-existing-vnet%2Fazuredeploy.json)

### Deploy using PowerShell

Modify the snippet below to deploy Managed Application definition to a Resource Group in your Azure subscription

````powershell
$rgname = "<yourRgName>"
$location = "<rgLocation>"
$authorization = "<userOrGroupId>:<RBACRoleDefinitionId>"
$uri = "https://raw.githubusercontent.com/Azure/azure-managedapp-samples/master/samples/201-managed-app-using-existing-vnet/managedAppVnet.zip"

New-AzureRmManagedApplicationDefinition -Name "ManagedWebApp" `
-ResourceGroupName $rgname `
-DisplayName "Managed Web App" `
-Description "Managed Web App with Azure mgmt" `
-Location $location `
-LockLevel ReadOnly `
-PackageFileUri $uri `
-Authorization $authorization `
-Verbose
````

### Deploy using AzureCLI

Modify the snippet below to deploy Managed Application definition to a Resource Group in your Azure subscription

````azureCLI
az managedapp definition create \
--name "ManagedWebApp" \
--location <rgLocation> \
--resource-group <yourRgName> \
--lock-level ReadOnly \
--display-name "Managed Web Application" \
--description "Web App with Azure mgmt" \
--authorizations "<userOrGroupId>:<RBACRoleDefinitionId>" \
--package-file-uri "https://raw.githubusercontent.com/Azure/azure-managedapp-samples/master/samples/201-managed-app-using-existing-vnet/managedAppVnet.zip"
````
142 changes: 142 additions & 0 deletions samples/201-managed-app-using-existing-vnet/createUiDefinition.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
{
"$schema": "https://schema.management.azure.com/schemas/0.1.2-preview/CreateUIDefinition.MultiVm.json#",
"handler": "Microsoft.Compute.MultiVm",
"version": "0.1.2-preview",
"parameters": {
"basics": [
{}
],
"steps": [
{
"name": "vmCredentials",
"label": "Azure Managed Application",
"bladeTitle": "Application credentials",
"subLabel": {
"preValidation": "Provide VM credentials",
"postValidation": "Great - let's move on!"
},
"elements": [
{
"name": "adminUserName",
"type": "Microsoft.Compute.UserNameTextBox",
"label": "Admin username",
"osPlatform": "Windows",
"constraints": {
"required": true
},
"toolTip": "Provide admin username for the virtual machine"
},
{
"name": "vmPwd",
"type": "Microsoft.Compute.CredentialsCombo",
"label": {
"password": "Password",
"confirmPassword": "Confirm password"
},
"osPlatform": "Windows",
"constraints": {
"customPasswordRegex": "^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d]{8,}$",
"customValidationMessage": "The password must contain at least 8 characters",
"required": true
},
"options": {
"hideConfirmation": false
},
"toolTip": {
"password": "Provide admin password for the virtual machine"
},
"visible": true
}
]
},
{
"name": "appSettings",
"label": "Application settings",
"subLabel": {
"preValidation": "Configure the managed application",
"postValidation": "Done!"
},
"bladeTitle": "Settings",
"elements": [
{
"name": "vmName",
"type": "Microsoft.Common.TextBox",
"label": "Application name",
"toolTip": "Assign a name to your Azure application",
"defaultValue": "",
"constraints": {
"required": true,
"regex": "[a-z][a-z0-9-]{2,5}[a-z0-9]$",
"validationMessage": "Must be 3-5 characters."
}
},
{
"name": "trialOrProd",
"type": "Microsoft.Common.OptionsGroup",
"label": "Trial or Production?",
"defaultValue": "Trial",
"toolTip": "For trial, cost will be minimal. For prod, resources are optimized.",
"constraints": {
"allowedValues": [
{
"label": "Trial",
"value": "Trial"
},
{
"label": "Production",
"value": "Production"
}
]
},
"visible": true
},
{
"name": "virtualNetwork",
"type": "Microsoft.Network.VirtualNetworkCombo",
"label": {
"virtualNetwork": "Virtual network",
"subnets": "Subnets"
},
"toolTip": {
"virtualNetwork": "Virtual Network Name",
"subnets": "Subnet requried for Azure Application"
},
"defaultValue": {
"name": "app-vnet",
"addressPrefixSize": "/22"
},
"constraints": {
"minAddressPrefixSize": "/22"
},
"subnets": {
"subnet1": {
"label": "Subnet name",
"defaultValue": {
"name": "app-subnet",
"addressPrefixSize": "/24"
},
"constraints": {
"minAddressPrefixSize": "/24",
"minAddressCount": 12,
"requireContiguousAddresses": false
}
}
}
}
]
}
],
"outputs": {
"vmName": "[steps('appSettings').vmName]",
"trialOrProduction": "[steps('appSettings').trialOrProd]",
"userName": "[steps('vmCredentials').adminUsername]",
"pwd": "[steps('vmCredentials').vmPwd.password]",
"applicationResourceName": "[steps('appSettings').vmName]",
"subnetName": "[steps('appSettings').virtualNetwork.subnets.subnet1.name]",
"subnetAddressPrefix": "[steps('appSettings').virtualNetwork.subnets.subnet1.addressPrefix]",
"vNetAddressPrefix": "[steps('appSettings').virtualNetwork.addressPrefix]",
"virtualNetworkName": "[steps('appSettings').virtualNetwork.name]",
"vNetRgName": "[steps('appSettings').virtualNetwork.resourceGroup]"
}
}
}
Loading