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.

Sign up for GitHub

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

Move Dapr settings from template section to configuration section #18091

Merged
merged 2 commits into from
Mar 4, 2022
Merged

Move Dapr settings from template section to configuration section #18091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca893ea
Move dapr section from template to configuration
ruslany Mar 4, 2022
1f2c5b1
Fix samples
ruslany Mar 4, 2022
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
35 changes: 0 additions & 35 deletions ...tion/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/CommonDefinitions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,37 +261,6 @@
}
}
},
"Dapr": {
"description": "Container App Dapr configuration.",
"type": "object",
"properties": {
"enabled": {
"description": "Boolean indicating if the Dapr side car is enabled",
"type": "boolean"
},
"appId": {
"description": "Dapr application identifier",
"type": "string"
},
"appProtocol": {
"description": "Tells Dapr which protocol your application is using. Valid options are http and grpc. Default is http",
"enum": [
"http",
"grpc"
],
"type": "string",
"x-ms-enum": {
"name": "appProtocol",
"modelAsString": true
}
},
"appPort": {
"format": "int32",
"description": "Tells Dapr which port your application is listening on",
"type": "integer"
}
}
},
"DefaultErrorResponse": {
"description": "App Service error response.",
"type": "object",
Expand Down Expand Up @@ -505,10 +474,6 @@
"$ref": "#/definitions/Scale",
"description": "Scaling properties for the Container App."
},
"dapr": {
"$ref": "#/definitions/Dapr",
"description": "Dapr configuration for the Container App."
},
"volumes": {
"description": "List of volume definitions for the Container App.",
"type": "array",
Expand Down
35 changes: 35 additions & 0 deletions ...fication/app/resource-manager/Microsoft.App/preview/2022-01-01-preview/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,10 @@
"x-ms-identifiers": [
"server"
]
},
"dapr": {
"$ref": "#/definitions/Dapr",
"description": "Dapr configuration for the Container App."
}
}
},
Expand Down Expand Up @@ -562,6 +566,37 @@
}
}
},
"Dapr": {
"description": "Container App Dapr configuration.",
"type": "object",
"properties": {
"enabled": {
"description": "Boolean indicating if the Dapr side car is enabled",
"type": "boolean"
},
"appId": {
"description": "Dapr application identifier",
"type": "string"
},
"appProtocol": {
"description": "Tells Dapr which protocol your application is using. Valid options are http and grpc. Default is http",
"enum": [
"http",
"grpc"
],
"type": "string",
"x-ms-enum": {
"name": "appProtocol",
"modelAsString": true
}
},
"appPort": {
"format": "int32",
"description": "Tells Dapr which port your application is listening on",
"type": "integer"
}
}
},
"Ingress": {
"description": "Container App Ingress configuration.",
"type": "object",
Expand Down
30 changes: 15 additions & 15 deletions ...nager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
},
"template": {
Expand Down Expand Up @@ -64,11 +69,6 @@
}
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down Expand Up @@ -104,6 +104,11 @@
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
},
"template": {
Expand Down Expand Up @@ -147,11 +152,6 @@
}
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand All @@ -174,6 +174,11 @@
"external": true,
"targetPort": 3000,
"transport": "auto"
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
},
"template": {
Expand Down Expand Up @@ -217,11 +222,6 @@
}
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
},
"template": {
Expand All @@ -61,11 +66,6 @@
}
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions .../Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
},
"template": {
Expand All @@ -62,11 +67,6 @@
}
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...r/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@
"certificateId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube/certificates/my-certificate-for-my-other-name-dot-com"
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
},
"template": {
Expand All @@ -61,11 +66,6 @@
}
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "http"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...source-manager/Microsoft.App/preview/2022-01-01-preview/examples/ContainerApps_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
"external": true,
"targetPort": 3000,
"transport": "auto"
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "grpc"
}
},
"template": {
Expand All @@ -59,11 +64,6 @@
}
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000,
"appProtocol": "grpc"
}
}
}
Expand Down
4 changes: 0 additions & 4 deletions ...app/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
}
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000
}
},
"active": true,
Expand Down
4 changes: 0 additions & 4 deletions ...pp/resource-manager/Microsoft.App/preview/2022-01-01-preview/examples/Revisions_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
}
}
]
},
"dapr": {
"enabled": true,
"appPort": 3000
}
},
"active": true,
Expand Down