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

feat!: split network step #735

Merged
merged 36 commits into from
Jul 6, 2022
Merged

feat!: split network step #735

merged 36 commits into from
Jul 6, 2022

Conversation

mauro-cit
Copy link
Contributor

Fixes #672
Fixes #671

Some notes about the changes done by this PR:

  • As we have separated the step 3-networks, the guide for doing that was through the enable_hub_and_spoke variable.
  • Basically the resources that required the variable enable_hub_and_spoke as true we put on 3-networks-hub-and-spoke, the resources that doesn't we put on 3-networks-dual-svpc. We also moved the resources that were depending on these ones.
  • We also removed the variable enable_hub_and_spoke_transitivity from the Dual Shared VPC mode since it was only used when the enable_hub_and_spoke variable was true
  • A script called restore_tf_files.sh was also created to undo the actions that the "disable_tf_files.sh" was doing to the *.tfvars and backend files

@mauro-cit mauro-cit marked this pull request as ready for review June 7, 2022 20:47
@mauro-cit mauro-cit requested review from a team, rjerrems and bharathkkb as code owners June 7, 2022 20:47
@daniel-cit daniel-cit changed the title Feature/split network step feat!: split network step Jun 13, 2022
Copy link
Contributor

@daniel-cit daniel-cit left a comment

Choose a reason for hiding this comment

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

The Hub & Spoke Transitivity module

https://github.com/mauro-cit/terraform-example-foundation/tree/feature/split-network-step/3-networks-dual-svpc/modules/transitivity

should be removed from the dual svpc version

there are also some fixes on the readme and shared.auto.example.tfvars files in the Hub and Spoke version

3-networks-hub-and-spoke/README.md Outdated Show resolved Hide resolved
Copy link
Member

@bharathkkb bharathkkb left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @mauro-cit
We can also remove some of the conditional logic we no longer need like in

3-networks-dual-svpc/README.md Outdated Show resolved Hide resolved
3-networks-dual-svpc/envs/shared/variables.tf Outdated Show resolved Hide resolved
3-networks-hub-and-spoke/envs/shared/net-hubs.tf Outdated Show resolved Hide resolved
3-networks-hub-and-spoke/README.md Outdated Show resolved Hide resolved
@daniel-cit daniel-cit self-requested a review June 27, 2022 21:48
Copy link
Member

@bharathkkb bharathkkb left a comment

Choose a reason for hiding this comment

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

LGTM with a suggestion

3-networks-hub-and-spoke/modules/base_env/main.tf Outdated Show resolved Hide resolved
3-networks-hub-and-spoke/envs/shared/net-hubs.tf Outdated Show resolved Hide resolved
@mauro-cit mauro-cit requested a review from bharathkkb July 3, 2022 02:14
@bharathkkb bharathkkb merged commit 512430b into terraform-google-modules:master Jul 6, 2022
@mauro-cit mauro-cit self-assigned this Aug 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants