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

Debug e2e CosmosDB issues #3551

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
205 changes: 116 additions & 89 deletions pkg/deploy/assets/databases-development.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,146 +11,160 @@
},
"resources": [
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'))]",
"properties": {
"resource": {
"id": "[parameters('databaseName')]"
},
"options": {
"autoscaleSettings": {
"maxThroughput": 1000
}
},
"resource": {
"id": "[parameters('databaseName')]"
}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'))]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15"
},
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/AsyncOperations')]",
"properties": {
"options": {},
"resource": {
"defaultTtl": 604800,
"id": "AsyncOperations",
"partitionKey": {
"kind": "Hash",
"paths": [
"/id"
]
}
}
],
"kind": "Hash"
},
"defaultTtl": 604800
},
"options": {}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/AsyncOperations')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15",
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('databaseAccountName'), parameters('databaseName'))]"
]
},
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/OpenShiftVersions')]",
"properties": {
"options": {},
"resource": {
"defaultTtl": -1,
"id": "OpenShiftVersions",
"partitionKey": {
"kind": "Hash",
"paths": [
"/id"
]
}
}
],
"kind": "Hash"
},
"defaultTtl": -1
},
"options": {}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/OpenShiftVersions')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15",
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('databaseAccountName'), parameters('databaseName'))]"
]
},
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/ClusterManagerConfigurations')]",
"properties": {
"options": {},
"resource": {
"id": "ClusterManagerConfigurations",
"partitionKey": {
"kind": "Hash",
"paths": [
"/partitionKey"
]
],
"kind": "Hash"
}
}
},
"options": {}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/ClusterManagerConfigurations')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15",
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('databaseAccountName'), parameters('databaseName'))]"
]
},
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Billing')]",
"properties": {
"options": {},
"resource": {
"id": "Billing",
"partitionKey": {
"kind": "Hash",
"paths": [
"/id"
]
],
"kind": "Hash"
}
}
},
"options": {}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Billing')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15",
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('databaseAccountName'), parameters('databaseName'))]"
]
},
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Gateway')]",
"properties": {
"options": {},
"resource": {
"defaultTtl": -1,
"id": "Gateway",
"partitionKey": {
"kind": "Hash",
"paths": [
"/id"
]
}
}
],
"kind": "Hash"
},
"defaultTtl": -1
},
"options": {}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Gateway')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15",
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('databaseAccountName'), parameters('databaseName'))]"
]
},
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Monitors')]",
"properties": {
"options": {},
"resource": {
"defaultTtl": -1,
"id": "Monitors",
"partitionKey": {
"kind": "Hash",
"paths": [
"/id"
]
}
}
],
"kind": "Hash"
},
"defaultTtl": -1
},
"options": {}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Monitors')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15",
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('databaseAccountName'), parameters('databaseName'))]"
]
},
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/OpenShiftClusters')]",
"properties": {
"options": {},
"resource": {
"id": "OpenShiftClusters",
"partitionKey": {
"kind": "Hash",
"paths": [
"/partitionKey"
]
],
"kind": "Hash"
},
"uniqueKeyPolicy": {
"uniqueKeys": [
Expand All @@ -171,46 +185,59 @@
}
]
}
}
},
"options": {}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/OpenShiftClusters')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15",
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('databaseAccountName'), parameters('databaseName'))]"
]
},
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Portal')]",
"properties": {
"options": {},
"resource": {
"defaultTtl": -1,
"id": "Portal",
"partitionKey": {
"kind": "Hash",
"paths": [
"/id"
]
}
}
],
"kind": "Hash"
},
"defaultTtl": -1
},
"options": {}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Portal')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15",
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('databaseAccountName'), parameters('databaseName'))]"
]
},
{
"apiVersion": "2023-04-15",
"location": "[resourceGroup().location]",
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Subscriptions')]",
"properties": {
"options": {},
"resource": {
"id": "Subscriptions",
"partitionKey": {
"kind": "Hash",
"paths": [
"/id"
]
],
"kind": "Hash"
}
}
},
"options": {}
},
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers"
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Subscriptions')]",
"type": "Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers",
"location": "[resourceGroup().location]",
"apiVersion": "2021-01-15",
"dependsOn": [
"[resourceId('Microsoft.DocumentDB/databaseAccounts/sqlDatabases', parameters('databaseAccountName'), parameters('databaseName'))]"
]
}
]
}
25 changes: 12 additions & 13 deletions pkg/deploy/assets/rp-development.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,33 +54,32 @@
"location": "[resourceGroup().location]"
},
{
"apiVersion": "2023-04-15",
"kind": "GlobalDocumentDB",
"location": "[resourceGroup().location]",
"name": "[parameters('databaseAccountName')]",
"properties": {
"backupPolicy": {
"periodicModeProperties": {
"backupIntervalInMinutes": 240,
"backupRetentionIntervalInHours": 720
},
"type": "Periodic"
},
"consistencyPolicy": {
"defaultConsistencyLevel": "Strong"
},
"databaseAccountOfferType": "Standard",
"locations": [
{
"locationName": "[resourceGroup().location]"
}
],
"minimalTlsVersion": "Tls12"
"databaseAccountOfferType": "Standard",
"backupPolicy": {
"periodicModeProperties": {
"backupIntervalInMinutes": 240,
"backupRetentionIntervalInHours": 720
},
"type": "Periodic"
}
},
"name": "[parameters('databaseAccountName')]",
"type": "Microsoft.DocumentDB/databaseAccounts",
"location": "[resourceGroup().location]",
"tags": {
"defaultExperience": "Core (SQL)"
},
"type": "Microsoft.DocumentDB/databaseAccounts"
"apiVersion": "2021-01-15"
},
{
"name": "[guid(resourceGroup().id, parameters('rpServicePrincipalId'), 'RP / Reader')]",
Expand Down
Loading
Loading