Skip to content

[Microsoft.App] add runtime attribute to app configuration #27892

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

Merged
TimLovellSmith merged 9 commits into from
Mar 5, 2024
Merged

[Microsoft.App] add runtime attribute to app configuration #27892

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7efcf40
add configuration.runtime for apps
sonwan2020 Feb 23, 2024
45571b6
add runtime in app configuration
sonwan2020 Feb 23, 2024
deac963
fix format
sonwan2020 Feb 23, 2024
d9807de
add runtime.kind
sonwan2020 Feb 27, 2024
77598f0
Merge branch 'sonwan2020/release-app-Microsoft.App-2024-02-02-preview…
sonwan2020 Feb 27, 2024
0832d39
fix
sonwan2020 Feb 27, 2024
a793c6e
remove default
sonwan2020 Feb 27, 2024
6d5f81b
remove default for enableMetrics
sonwan2020 Feb 27, 2024
02c7595
remove kind property
sonwan2020 Mar 1, 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
34 changes: 34 additions & 0 deletions ...fication/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/ContainerApps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,10 @@
"$ref": "#/definitions/Dapr",
"description": "Dapr configuration for the Container App."
},
"runtime": {
"$ref": "#/definitions/Runtime",
"description": "App runtime configuration for the Container App."
},
"maxInactiveRevisions": {
"format": "int32",
"description": "Optional. Max inactive revisions a Container App can have.",
Expand Down Expand Up @@ -856,6 +860,36 @@
}
}
},
"Runtime": {
"description": "Container App Runtime configuration.",
"type": "object",
"properties": {
Copy link
Contributor

@ms-zhenhua ms-zhenhua Feb 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kind and java should not have default values, because the user may want to update only one of them.
https://github.com/Azure/azure-rest-api-specs/pull/27892/checks?check_run_id=22018340669

Copy link
Contributor Author

@sonwan2020 sonwan2020 Feb 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks, default value removed

"kind": {
"description": "Container App language runtime kind, Default is generic",
"enum": [
"generic",
"java"
],
"type": "string",
"default": "generic",
"x-ms-enum": {
"name": "kind",
"modelAsString": true
}
},
"java": {
Copy link
Contributor

@daniv-msft daniv-msft Feb 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please confirm that ARM will treat this object as optional, and that we won't have to declare it if the customer didn't define it?

Copy link
Contributor Author

@sonwan2020 sonwan2020 Mar 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, no "required" restriction on runtime variables

Copy link
Contributor

@daniv-msft daniv-msft Mar 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

"description": "Java app configuration",
"type": "object",
"properties": {
"enableMetrics": {
"description": "Enable jmx core metrics for the java app",
"default": false,
"type": "boolean"
}
}
}
}
},
"Ingress": {
"description": "Container App Ingress configuration.",
"type": "object",
Expand Down
18 changes: 18 additions & 0 deletions ...nager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,12 @@
"logLevel": "debug",
"enableApiLogging": true
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
},
"maxInactiveRevisions": 10,
"service": {
"type": "redis"
Expand Down Expand Up @@ -257,6 +263,12 @@
"appPort": 3000,
"appProtocol": "http",
"httpReadBufferSize": 30
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
}
},
"template": {
Expand Down Expand Up @@ -382,6 +394,12 @@
"appPort": 3000,
"appProtocol": "http",
"httpReadBufferSize": 30
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
}
},
"template": {
Expand Down
18 changes: 18 additions & 0 deletions ...review/2024-02-02-preview/examples/ContainerApps_CreateOrUpdate_ConnectedEnvironment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@
"logLevel": "debug",
"enableApiLogging": true
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
},
"maxInactiveRevisions": 10
},
"template": {
Expand Down Expand Up @@ -226,6 +232,12 @@
"appPort": 3000,
"appProtocol": "http",
"httpReadBufferSize": 30
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
}
},
"template": {
Expand Down Expand Up @@ -331,6 +343,12 @@
"appPort": 3000,
"appProtocol": "http",
"httpReadBufferSize": 30
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
}
},
"template": {
Expand Down
6 changes: 6 additions & 0 deletions ...resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@
"logLevel": "debug",
"enableApiLogging": true
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
},
"maxInactiveRevisions": 10,
"service": {
"type": "redis"
Expand Down
6 changes: 6 additions & 0 deletions .../Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@
"logLevel": "debug",
"enableApiLogging": true
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
},
"maxInactiveRevisions": 10
},
"template": {
Expand Down
6 changes: 6 additions & 0 deletions ...r/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@
"logLevel": "debug",
"enableApiLogging": true
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
},
"maxInactiveRevisions": 10,
"service": {
"type": "redis"
Expand Down
12 changes: 12 additions & 0 deletions ...source-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@
"logLevel": "debug",
"enableApiLogging": true
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
},
"maxInactiveRevisions": 10,
"service": {
"type": "redis"
Expand Down Expand Up @@ -197,6 +203,12 @@
"logLevel": "debug",
"enableApiLogging": true
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
},
"maxInactiveRevisions": 10
},
"template": {
Expand Down
6 changes: 6 additions & 0 deletions ...source-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Start.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
"logLevel": "debug",
"enableApiLogging": true
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
},
"maxInactiveRevisions": 10
},
"template": {
Expand Down
6 changes: 6 additions & 0 deletions ...esource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Stop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
"logLevel": "debug",
"enableApiLogging": true
},
"runtime": {
"kind": "java",
"java": {
"enableMetrics": true
}
},
"maxInactiveRevisions": 10
},
"template": {
Expand Down