-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2574 from sureleo/RPSaaSMaster
Add ExtendedLocations to AzureArcData resources, also bumped API Version.
- Loading branch information
Showing
31 changed files
with
3,577 additions
and
4 deletions.
There are no files selected for viewing
2,098 changes: 2,098 additions & 0 deletions
2,098
...data/resource-manager/Microsoft.AzureArcData/preview/2021-03-02-preview/azurearcdata.json
Large diffs are not rendered by default.
Oops, something went wrong.
86 changes: 86 additions & 0 deletions
86
...rosoft.AzureArcData/preview/2021-03-02-preview/examples/CreateOrUpdateDataController.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "testrg", | ||
| "dataControllerName": "testdataController", | ||
| "api-version": "2021-03-02-preview", | ||
| "dataControllerResource": { | ||
| "location": "northeurope", | ||
| "tags": { | ||
| "mytag": "myval" | ||
| }, | ||
| "extendedLocation": { | ||
| "type": "CustomLocation", | ||
| "name": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.ExtendedLocation/customLocations/arclocation" | ||
| }, | ||
| "properties": { | ||
| "onPremiseProperty": { | ||
| "id": "12345678-1234-1234-ab12-1a2b3c4d5e6f", | ||
| "publicSigningKey": "publicOnPremSigningKey" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "onPremiseProperty": { | ||
| "id": "12345678-1234-1234-ab12-1a2b3c4d5e6f", | ||
| "publicSigningKey": "publicOnPremSigningKey", | ||
| "signingCertificateThumbprint": "Unique thumbprint returned to customer to verify the certificate being uploaded" | ||
| } | ||
| }, | ||
| "extendedLocation": { | ||
| "type": "CustomLocation", | ||
| "name": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.ExtendedLocation/customLocations/arclocation" | ||
| }, | ||
| "systemData": { | ||
| "createdBy": "user1", | ||
| "createdByType": "User", | ||
| "createdAt": "2020-01-01T17:18:19.1234567Z", | ||
| "lastModifiedBy": "user2", | ||
| "lastModifiedByType": "User", | ||
| "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" | ||
| }, | ||
| "location": "northeurope", | ||
| "tags": { | ||
| "mytag": "myval" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureArcData/dataControllers/testdataController", | ||
| "name": "testdataController", | ||
| "type": "Microsoft.AzureArcData/dataControllers" | ||
| } | ||
| }, | ||
| "201": { | ||
| "body": { | ||
| "properties": { | ||
| "onPremiseProperty": { | ||
| "id": "12345678-1234-1234-ab12-1a2b3c4d5e6f", | ||
| "publicSigningKey": "publicOnPremSigningKey", | ||
| "signingCertificateThumbprint": "Unique thumbprint returned to customer to verify the certificate being uploaded" | ||
| } | ||
| }, | ||
| "extendedLocation": { | ||
| "type": "CustomLocation", | ||
| "name": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.ExtendedLocation/customLocations/arclocation" | ||
| }, | ||
| "location": "northeurope", | ||
| "systemData": { | ||
| "createdBy": "user1", | ||
| "createdByType": "User", | ||
| "createdAt": "2020-01-01T17:18:19.1234567Z", | ||
| "lastModifiedBy": "user2", | ||
| "lastModifiedByType": "User", | ||
| "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" | ||
| }, | ||
| "tags": { | ||
| "mytag": "myval" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureArcData/dataControllers/testdataController", | ||
| "name": "testdataController", | ||
| "type": "Microsoft.AzureArcData/dataControllers" | ||
| } | ||
| } | ||
| } | ||
| } |
145 changes: 145 additions & 0 deletions
145
...soft.AzureArcData/preview/2021-03-02-preview/examples/CreateOrUpdatePostgresInstance.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "testrg", | ||
| "postgresInstanceName": "testpostgresInstance", | ||
| "api-version": "2021-03-02-preview", | ||
| "location": "northeurope", | ||
| "tags": { | ||
| "mytag": "myval" | ||
| }, | ||
| "resource": { | ||
| "location": "eastus", | ||
| "properties": { | ||
| "dataControllerId": "dataControllerId", | ||
| "admin": "admin", | ||
| "k8sRaw": { | ||
| "apiVersion": "apiVersion", | ||
| "kind": "postgresql-12", | ||
| "metadata": { | ||
| "creationTimestamp": "2020-08-25T14:55:10Z", | ||
| "generation": 1, | ||
| "name": "pg1", | ||
| "namespace": "test", | ||
| "resourceVersion": "527780", | ||
| "selfLink": "/apis/arcdata.microsoft.com/v1alpha1/namespaces/test/postgresql-12s/pg1", | ||
| "uid": "1111aaaa-ffff-ffff-ffff-99999aaaaaaa" | ||
| }, | ||
| "spec": { | ||
| "backups": { | ||
| "deltaMinutes": 3, | ||
| "fullMinutes": 10, | ||
| "tiers": [ | ||
| { | ||
| "retention": { | ||
| "maximums": [ | ||
| "6", | ||
| "512MB" | ||
| ], | ||
| "minimums": [ | ||
| "3" | ||
| ] | ||
| }, | ||
| "storage": { | ||
| "volumeSize": "1Gi" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "engine": { | ||
| "extensions": [ | ||
| { | ||
| "name": "citus" | ||
| } | ||
| ] | ||
| }, | ||
| "scale": { | ||
| "shards": 3 | ||
| }, | ||
| "scheduling": { | ||
| "default": { | ||
| "resources": { | ||
| "requests": { | ||
| "memory": "256Mi" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "service": { | ||
| "type": "NodePort" | ||
| }, | ||
| "storage": { | ||
| "data": { | ||
| "className": "local-storage", | ||
| "size": "5Gi" | ||
| }, | ||
| "logs": { | ||
| "className": "local-storage", | ||
| "size": "5Gi" | ||
| } | ||
| } | ||
| }, | ||
| "status": { | ||
| "externalEndpoint": null, | ||
| "readyPods": "4/4", | ||
| "state": "Ready" | ||
| } | ||
| } | ||
| }, | ||
| "extendedLocation": { | ||
| "type": "CustomLocation", | ||
| "name": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.ExtendedLocation/customLocations/arclocation" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": {}, | ||
| "location": "northeurope", | ||
| "extendedLocation": { | ||
| "type": "CustomLocation", | ||
| "name": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.ExtendedLocation/customLocations/arclocation" | ||
| }, | ||
| "systemData": { | ||
| "createdBy": "user1", | ||
| "createdByType": "User", | ||
| "createdAt": "2020-01-01T17:18:19.1234567Z", | ||
| "lastModifiedBy": "user2", | ||
| "lastModifiedByType": "User", | ||
| "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" | ||
| }, | ||
| "tags": { | ||
| "mytag": "myval" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureArcData/PostgresInstance/testpostgresInstance", | ||
| "name": "testpostgresInstance", | ||
| "type": "Microsoft.AzureArcData/PostgresInstance" | ||
| } | ||
| }, | ||
| "201": { | ||
| "body": { | ||
| "properties": {}, | ||
| "location": "northeurope", | ||
| "extendedLocation": { | ||
| "type": "CustomLocation", | ||
| "name": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.ExtendedLocation/customLocations/arclocation" | ||
| }, | ||
| "systemData": { | ||
| "createdBy": "user1", | ||
| "createdByType": "User", | ||
| "createdAt": "2020-01-01T17:18:19.1234567Z", | ||
| "lastModifiedBy": "user2", | ||
| "lastModifiedByType": "User", | ||
| "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" | ||
| }, | ||
| "tags": { | ||
| "mytag": "myval" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureArcData/PostgresInstance/testpostgresInstance", | ||
| "name": "testsqlregistration", | ||
| "type": "Microsoft.AzureArcData/PostgresInstance" | ||
| } | ||
| } | ||
| } | ||
| } |
81 changes: 81 additions & 0 deletions
81
...ft.AzureArcData/preview/2021-03-02-preview/examples/CreateOrUpdateSqlManagedInstance.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| { | ||
| "parameters": { | ||
| "subscriptionId": "00000000-1111-2222-3333-444444444444", | ||
| "resourceGroupName": "testrg", | ||
| "sqlManagedInstanceName": "testsqlManagedInstance", | ||
| "api-version": "2021-03-02-preview", | ||
| "sqlManagedInstance": { | ||
| "location": "northeurope", | ||
| "tags": { | ||
| "mytag": "myval" | ||
| }, | ||
| "extendedLocation": { | ||
| "type": "CustomLocation", | ||
| "name": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.ExtendedLocation/customLocations/arclocation" | ||
| }, | ||
| "properties": { | ||
| "admin": "Admin user", | ||
| "startTime": "Instance start time", | ||
| "endTime": "Instance end time" | ||
| } | ||
| } | ||
| }, | ||
| "responses": { | ||
| "200": { | ||
| "body": { | ||
| "properties": { | ||
| "admin": "Admin user", | ||
| "startTime": "Instance start time", | ||
| "endTime": "Instance end time" | ||
| }, | ||
| "location": "northeurope", | ||
| "extendedLocation": { | ||
| "type": "CustomLocation", | ||
| "name": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.ExtendedLocation/customLocations/arclocation" | ||
| }, | ||
| "systemData": { | ||
| "createdBy": "user1", | ||
| "createdByType": "User", | ||
| "createdAt": "2020-01-01T17:18:19.1234567Z", | ||
| "lastModifiedBy": "user2", | ||
| "lastModifiedByType": "User", | ||
| "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" | ||
| }, | ||
| "tags": { | ||
| "mytag": "myval" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureArcData/sqlManagedInstances/testsqlManagedInstance", | ||
| "name": "testsqlManagedInstance", | ||
| "type": "Microsoft.AzureArcData/sqlManagedInstances" | ||
| } | ||
| }, | ||
| "201": { | ||
| "body": { | ||
| "properties": { | ||
| "admin": "Admin user", | ||
| "startTime": "Instance start time", | ||
| "endTime": "Instance end time" | ||
| }, | ||
| "location": "northeurope", | ||
| "extendedLocation": { | ||
| "type": "CustomLocation", | ||
| "name": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.ExtendedLocation/customLocations/arclocation" | ||
| }, | ||
| "systemData": { | ||
| "createdBy": "user1", | ||
| "createdByType": "User", | ||
| "createdAt": "2020-01-01T17:18:19.1234567Z", | ||
| "lastModifiedBy": "user2", | ||
| "lastModifiedByType": "User", | ||
| "lastModifiedAt": "2020-01-02T17:18:19.1234567Z" | ||
| }, | ||
| "tags": { | ||
| "mytag": "myval" | ||
| }, | ||
| "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.AzureArcData/sqlManagedInstances/testsqlManagedInstance", | ||
| "name": "testsqlManagedInstance", | ||
| "type": "Microsoft.AzureArcData/sqlManagedInstances" | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.