daohualiuxiang
/
dotnet-podcasts
mirror of https://github.com/microsoft/dotnet-podcasts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79 from nishanil/main 

ARM deployment - Migrate Microsoft.Web to Microsoft.App
pull/81/head
James Montemagno 2022-04-21 11:12:01 -07:00 committed by GitHub
parent 1fc9e154e8 8d09cef738
commit ce67e04773
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
deploy/Services/api.deployment.json
View File

@ -54,7 +54,7 @@
"functions": [], "functions": [],
"variables": { "variables": {
"workspaceId": "[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaceName'))]", "workspaceId": "[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaceName'))]",
"kubernetesEnvId": "[resourceId('Microsoft.Web/kubeEnvironments', parameters('kubernetesEnvName'))]", "kubernetesEnvId": "[resourceId('Microsoft.App/managedEnvironments', parameters('kubernetesEnvName'))]",
"kubernetesEnvLocation": "canadacentral", "kubernetesEnvLocation": "canadacentral",
"podcastDbConnectionString": "[format('Server=tcp:{0}.database.windows.net,1433;Initial Catalog={1};Persist Security Info=False;User ID={2};Password={3};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;', parameters('serverName'), parameters('sqlDBName'), parameters('administratorLogin'), parameters('administratorLoginPassword'))]", "podcastDbConnectionString": "[format('Server=tcp:{0}.database.windows.net,1433;Initial Catalog={1};Persist Security Info=False;User ID={2};Password={3};MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;', parameters('serverName'), parameters('sqlDBName'), parameters('administratorLogin'), parameters('administratorLoginPassword'))]",
"podcastApiImage": "[format('{0}/podcastapi:{1}', parameters('acrLoginServer'), parameters('imageTag'))]", "podcastApiImage": "[format('{0}/podcastapi:{1}', parameters('acrLoginServer'), parameters('imageTag'))]",
@ -141,8 +141,8 @@
} }
}, },
{ {
"type": "Microsoft.Web/kubeEnvironments", "type": "Microsoft.App/managedEnvironments",
"apiVersion": "2021-03-01", "apiVersion": "2022-01-01-preview",
"name": "[parameters('kubernetesEnvName')]", "name": "[parameters('kubernetesEnvName')]",
"location": "[variables('kubernetesEnvLocation')]", "location": "[variables('kubernetesEnvLocation')]",
"tags": {}, "tags": {},
@ -161,13 +161,13 @@
] ]
}, },
{ {
"type": "Microsoft.Web/containerApps", "type": "Microsoft.App/containerApps",
"apiVersion": "2021-03-01", "apiVersion": "2022-01-01-preview",
"name": "podcastapica", "name": "podcastapica",
"location": "[variables('kubernetesEnvLocation')]", "location": "[variables('kubernetesEnvLocation')]",
"kind": "containerapp", "kind": "containerapp",
"properties": { "properties": {
"kubeEnvironmentId": "[variables('kubernetesEnvId')]", "managedEnvironmentId": "[variables('kubernetesEnvId')]",
"configuration": { "configuration": {
"activeRevisionsMode": "single", "activeRevisionsMode": "single",
"ingress": { "ingress": {
@ -242,20 +242,20 @@
}, },
"tags": {}, "tags": {},
"dependsOn": [ "dependsOn": [
"[resourceId('Microsoft.Web/kubeEnvironments', parameters('kubernetesEnvName'))]", "[resourceId('Microsoft.App/managedEnvironments', parameters('kubernetesEnvName'))]",
"[resourceId('Microsoft.Sql/servers/databases', parameters('serverName'), parameters('sqlDBName'))]", "[resourceId('Microsoft.Sql/servers/databases', parameters('serverName'), parameters('sqlDBName'))]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]" "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]"
] ]
}, },
{ {
"condition": "[variables('deployIngestion')]", "condition": "[variables('deployIngestion')]",
"type": "Microsoft.Web/containerApps", "type": "Microsoft.App/containerApps",
"apiVersion": "2021-03-01", "apiVersion": "2022-01-01-preview",
"name": "podcastingestionca", "name": "podcastingestionca",
"location": "[variables('kubernetesEnvLocation')]", "location": "[variables('kubernetesEnvLocation')]",
"kind": "containerapp", "kind": "containerapp",
"properties": { "properties": {
"kubeEnvironmentId": "[variables('kubernetesEnvId')]", "managedEnvironmentId": "[variables('kubernetesEnvId')]",
"configuration": { "configuration": {
"activeRevisionsMode": "single", "activeRevisionsMode": "single",
"registries": [ "registries": [
@ -327,20 +327,20 @@
}, },
"tags": {}, "tags": {},
"dependsOn": [ "dependsOn": [
"[resourceId('Microsoft.Web/kubeEnvironments', parameters('kubernetesEnvName'))]", "[resourceId('Microsoft.App/managedEnvironments', parameters('kubernetesEnvName'))]",
"[resourceId('Microsoft.Web/containerApps', 'podcastapica')]", "[resourceId('Microsoft.App/containerApps', 'podcastapica')]",
"[resourceId('Microsoft.Sql/servers/databases', parameters('serverName'), parameters('sqlDBName'))]", "[resourceId('Microsoft.Sql/servers/databases', parameters('serverName'), parameters('sqlDBName'))]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]" "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]"
] ]
}, },
{ {
"type": "Microsoft.Web/containerApps", "type": "Microsoft.App/containerApps",
"apiVersion": "2021-03-01", "apiVersion": "2022-01-01-preview",
"name": "podcastupdaterca", "name": "podcastupdaterca",
"location": "[variables('kubernetesEnvLocation')]", "location": "[variables('kubernetesEnvLocation')]",
"kind": "containerapp", "kind": "containerapp",
"properties": { "properties": {
"kubeEnvironmentId": "[variables('kubernetesEnvId')]", "managedEnvironmentId": "[variables('kubernetesEnvId')]",
"configuration": { "configuration": {
"activeRevisionsMode": "single", "activeRevisionsMode": "single",
"registries": [ "registries": [
@ -393,8 +393,8 @@
}, },
"tags": {}, "tags": {},
"dependsOn": [ "dependsOn": [
"[resourceId('Microsoft.Web/kubeEnvironments', parameters('kubernetesEnvName'))]", "[resourceId('Microsoft.App/managedEnvironments', parameters('kubernetesEnvName'))]",
"[resourceId('Microsoft.Web/containerApps', 'podcastapica')]", "[resourceId('Microsoft.App/containerApps', 'podcastapica')]",
"[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]" "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName'))]"
] ]
} }