-
Notifications
You must be signed in to change notification settings - Fork 99
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
MBCP - updates to container,env,app datamodel #4448
Conversation
...pplications/resource-manager/Applications.Core/preview/2022-03-15-privatepreview/global.json
Outdated
Show resolved
Hide resolved
...cations/resource-manager/Applications.Core/preview/2022-03-15-privatepreview/containers.json
Outdated
Show resolved
Hide resolved
Merging with updated datamodel..converting temporarily back to draft |
b3981c1
to
d52c1e5
Compare
pkg/corerp/api/v20220315privatepreview/testdata/containerresourcedatamodel.json
Outdated
Show resolved
Hide resolved
pkg/corerp/api/v20220315privatepreview/testdata/containerresourcedatamodel.json
Outdated
Show resolved
Hide resolved
a5b5470
to
7e23388
Compare
39715b1
to
7115bfc
Compare
pkg/corerp/api/v20220315privatepreview/application_conversion.go
Outdated
Show resolved
Hide resolved
pkg/corerp/api/v20220315privatepreview/application_conversion_test.go
Outdated
Show resolved
Hide resolved
pkg/corerp/api/v20220315privatepreview/container_conversion_test.go
Outdated
Show resolved
Hide resolved
pkg/corerp/api/v20220315privatepreview/container_conversion_test.go
Outdated
Show resolved
Hide resolved
pkg/corerp/api/v20220315privatepreview/environment_conversion_test.go
Outdated
Show resolved
Hide resolved
pkg/corerp/api/v20220315privatepreview/testdata/containerresourcedatamodel.json
Outdated
Show resolved
Hide resolved
pkg/corerp/api/v20220315privatepreview/testdata/environmentresource.json
Outdated
Show resolved
Hide resolved
@@ -1,389 +1,388 @@ | |||
{ | |||
"swagger": "2.0", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The diff in this file shouldn't be this large, can you reformat it with the same format as before?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
got file from main branch and re-applied changes. still no joy.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Try reformatting with 4 spaces for tabs instead of 2? Probably vscode auto formatting on save if I had to guess.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually scratch that, other files are formatted with 2 spaces below. Let me just check the diff that is actually different.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking as I would expect!
...cations/resource-manager/Applications.Core/preview/2022-03-15-privatepreview/containers.json
Show resolved
Hide resolved
19b38f6
to
eddcd18
Compare
Updates to container,application,environment datamodel to account for KubernetesMetadataExtension
Note: some overlap with PR https://github.com/project-radius/radius/pull/4443/files
which we have now resolved
#4442
Fixes: #4442
Checklist
Please make sure you've completed the relevant tasks for this PR, out of the following list: