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.

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

Merged
merged 15 commits into from
Nov 15, 2022

Conversation

lakshmimsft
Copy link
Contributor

@lakshmimsft lakshmimsft commented Nov 2, 2022

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:

  • Code compiles correctly
  • Adds necessary unit tests for change
  • Adds necessary E2E tests for change
  • Unit tests passing
  • Extended the documentation / Created issue for it

@lakshmimsft lakshmimsft requested a review from a team as a code owner November 2, 2022 07:31
@lakshmimsft
Copy link
Contributor Author

Merging with updated datamodel..converting temporarily back to draft

@lakshmimsft lakshmimsft marked this pull request as draft November 2, 2022 23:17
@lakshmimsft lakshmimsft force-pushed the ljavadekar/mbcpdatamodelupd branch from b3981c1 to d52c1e5 Compare November 2, 2022 23:45
@lakshmimsft lakshmimsft self-assigned this Nov 2, 2022
@jkotalik jkotalik force-pushed the ljavadekar/mbcpdatamodelupd branch from a5b5470 to 7e23388 Compare November 4, 2022 17:41
@lakshmimsft lakshmimsft changed the title MBCP - updates to container datamodel MBCP - updates to container,env,app datamodel Nov 4, 2022
@lakshmimsft lakshmimsft force-pushed the ljavadekar/mbcpdatamodelupd branch from 39715b1 to 7115bfc Compare November 7, 2022 16:34
@lakshmimsft lakshmimsft marked this pull request as ready for review November 7, 2022 17:02
@@ -1,389 +1,388 @@
{
"swagger": "2.0",
Copy link
Contributor

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?

Copy link
Contributor Author

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.

Copy link
Contributor

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.

Copy link
Contributor

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.

Copy link
Contributor

@jkotalik jkotalik left a 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!

@lakshmimsft lakshmimsft force-pushed the ljavadekar/mbcpdatamodelupd branch from 19b38f6 to eddcd18 Compare November 15, 2022 16:39
@lakshmimsft lakshmimsft merged commit 3eb6db9 into main Nov 15, 2022
@lakshmimsft lakshmimsft deleted the ljavadekar/mbcpdatamodelupd branch November 15, 2022 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add/update datamodel for containers, environment, application to include KubernetesMetadata extension
6 participants