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

Update base workspace to allow multiple address spaces #2809

Merged
merged 8 commits into from
Nov 23, 2022

Conversation

marrobi
Copy link
Member

@marrobi marrobi commented Nov 2, 2022

Resolves #2808

What is being addressed

Add additional address_spaces property that contains an array or address spaces. This means that we can add additional address spaces in future to a workspace vnet.

How is this addressed

  • Add additional address_spaces property in the api when creating a workspace, left address_space for backwards compatibility
  • Update base workspace template to take multiple address spaces for a vnet
  • Added missing env load into make file for terraform and bundle install
  • Update CHANGELOG.md if needed

Future Work

  • Update unrestricted template to take address_spaces

@marrobi
Copy link
Member Author

marrobi commented Nov 2, 2022

/test

@github-actions
Copy link

github-actions bot commented Nov 2, 2022

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/3373863404 (with refid c0764ea0)

(in response to this comment from @marrobi)

@github-actions
Copy link

github-actions bot commented Nov 2, 2022

Unit Test Results

520 tests   519 ✔️  19s ⏱️
    1 suites      0 💤
    1 files        1

For more details on these failures, see this check.

Results for commit 6011524.

♻️ This comment has been updated with latest results.

@marrobi marrobi marked this pull request as ready for review November 2, 2022 09:00
@marrobi marrobi marked this pull request as draft November 2, 2022 10:02
@marrobi
Copy link
Member Author

marrobi commented Nov 2, 2022

Need to looking for existing address spaces as well as address space when getting a new address space

@marrobi
Copy link
Member Author

marrobi commented Nov 2, 2022

/test

@github-actions
Copy link

github-actions bot commented Nov 2, 2022

🤖 pr-bot 🤖

🏃 Running tests: https://github.com/microsoft/AzureTRE/actions/runs/3381645045 (with refid c0764ea0)

(in response to this comment from @marrobi)

@marrobi marrobi marked this pull request as ready for review November 3, 2022 20:52
@marrobi marrobi requested a review from tamirkamara November 3, 2022 20:52
@marrobi marrobi added the blocked Cannot progress at present label Nov 8, 2022
@marrobi
Copy link
Member Author

marrobi commented Nov 8, 2022

Blocked until updating of workspaces is reenabled.

api_app/db/repositories/workspaces.py Outdated Show resolved Hide resolved
api_app/db/repositories/workspaces.py Outdated Show resolved Hide resolved
api_app/db/repositories/workspaces.py Show resolved Hide resolved
@marrobi marrobi removed the blocked Cannot progress at present label Nov 21, 2022
@marrobi marrobi enabled auto-merge (squash) November 23, 2022 08:20
@marrobi
Copy link
Member Author

marrobi commented Nov 23, 2022

/test-force-approve - succeeded here - https://github.com/microsoft/AzureTRE/actions/runs/3381645045

@github-actions
Copy link

🤖 pr-bot 🤖

✅ Marking tests as complete (for commit 6011524)

(in response to this comment from @marrobi)

@marrobi marrobi merged commit a586c2d into microsoft:main Nov 23, 2022
@marrobi marrobi deleted the marrobi/issue1846 branch November 23, 2022 11:21
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.

Modify workspace templates to take multiple address spaces for the vnet
2 participants