Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
2fd4268
Advanced Ingress ACA - 2024-10-02-preview
Oct 4, 2024
fc1bf4b
use existing custom domain reference
Oct 4, 2024
343cac5
make containerAppName required
Oct 5, 2024
718adc8
Resolve comments
Oct 10, 2024
eee5d5e
fix prettier check. update patch to allow more prop updates
Oct 10, 2024
a7abf46
update patch
Oct 10, 2024
5981389
fix ci, add patch envelope
Oct 10, 2024
faa1813
add description field to route rules
Oct 11, 2024
6d36f0f
update examples
Oct 11, 2024
da54ad8
remove long running operation reference
Oct 12, 2024
30a8578
mark put as non long running
tdaroly Oct 12, 2024
e2a4bfd
resolve comments, refactor
tdaroly Oct 15, 2024
1a46a7c
separet PATCH out again
Oct 15, 2024
c6a3485
add 201 back due to arm validations requirement, rename to `container…
Oct 16, 2024
bcc9f39
Merge branch 'release-app-Microsoft.App-2024-10-02-preview' into tdar…
tdaroly Oct 17, 2024
6199522
rename
Oct 17, 2024
c339aab
Merge branch 'tdarolywala/advanced-ingress-routing-2024-10-02-preview…
Oct 17, 2024
637cace
Merge branch 'release-app-Microsoft.App-2024-10-02-preview' into tdar…
Juliehzl Oct 18, 2024
654e4c5
Merge branch 'release-app-Microsoft.App-2024-10-02-preview' into tdar…
tdaroly Oct 18, 2024
15ba76f
prettier ci fix
Oct 18, 2024
265f6d5
fix pretty ci
Oct 18, 2024
e30ee29
Merge branch 'release-app-Microsoft.App-2024-10-02-preview' into tdar…
Juliehzl Oct 18, 2024
cc16f33
Merge branch 'release-app-Microsoft.App-2024-10-02-preview' into tdar…
tdaroly Oct 18, 2024
9d0bd42
change to proxy resource, resolve comments, rename, fix merge conflict
Oct 18, 2024
71f96af
remove tag support, patch same as create/update
Oct 18, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,36 @@
}
}
},
"CustomDomain": {
"description": "Custom Domain of a Container App",
"type": "object",
"required": [
"name"
],
"properties": {
"name": {
"description": "Hostname.",
"type": "string"
},
"bindingType": {
"description": "Custom Domain binding type.",
"enum": [
"Disabled",
"SniEnabled",
"Auto"
],
"type": "string",
"x-ms-enum": {
"name": "bindingType",
"modelAsString": true
}
},
"certificateId": {
"description": "Resource Id of the Certificate to be bound to this hostname. Must exist in the Managed Environment.",
"type": "string"
}
}
},
"CustomDomainConfiguration": {
"type": "object",
"description": "Configuration properties for apps environment custom domain",
Expand Down Expand Up @@ -2176,6 +2206,15 @@
}
},
"parameters": {
"EnvironmentNameParameter": {
"name": "environmentName",
"in": "path",
"description": "Name of the Managed Environment.",
"required": true,
"type": "string",
"pattern": "^[-\\w\\._\\(\\)]+$",
"x-ms-parameter-location": "method"
},
"ContainerAppsNameParameter": {
"name": "containerAppName",
"in": "path",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@
"description": "custom domain bindings for Container Apps' hostnames.",
"type": "array",
"items": {
"$ref": "#/definitions/CustomDomain"
"$ref": "./CommonDefinitions.json#/definitions/CustomDomain"
},
"x-ms-identifiers": [
"name"
Expand Down Expand Up @@ -1235,36 +1235,6 @@
}
}
},
"CustomDomain": {
"description": "Custom Domain of a Container App",
"type": "object",
"required": [
"name"
],
"properties": {
"name": {
"description": "Hostname.",
"type": "string"
},
"bindingType": {
"description": "Custom Domain binding type.",
"enum": [
"Disabled",
"SniEnabled",
"Auto"
],
"type": "string",
"x-ms-enum": {
"name": "bindingType",
"modelAsString": true
}
},
"certificateId": {
"description": "Resource Id of the Certificate to be bound to this hostname. Must exist in the Managed Environment.",
"type": "string"
}
}
},
"IpSecurityRestrictionRule": {
"description": "Rule to restrict incoming IP address.",
"type": "object",
Expand Down
Loading