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

Add Tier 3 Workload Templates and Stand Alone Script. #220

Merged
merged 16 commits into from
May 26, 2021

Conversation

Breanna-Stryker
Copy link
Contributor

Description

This is a quick implementation of adding a tier 3. Things like automatically performing additive deployments aren't available yet and will need to be considered when re-architecting the system.

Changes include adding tier3 variables where possible to be used for a quick deployment, as well as a template set, and a script for deploying a tier 3. deploy_t3.sh scrapes together various sections of other scripts to automate the deployment and application of the tier.

Issue reference

The issue this PR will close: #10

Checklist

Please make sure you've completed the relevant tasks for this PR, out of the following list:

  • Code compiles or validates correctly
  • BASH scripts have been validated using shellcheck
  • All tests pass (manual and automated)
  • The documentation is updated to cover any new or changed features
  • Markdown files have been linted using the recommended linter. (See .vscode/extensions.json.)
  • Relevant issues are linked to this PR

Comment on lines +3 to +11
terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "= 2.55.0"
}
}
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Any reason to explicitly indicate the provider here? I think the pattern we've been following is to set this at the root module and have the configurations from /modules/* inherit from their caller.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Without it I'm currently getting this warning:


│ Warning: Provider azurerm is undefined

│ on main.tf line 136, in module "t3-inbound-peering":
│ 136: azurerm = azurerm.hub

│ Module module.t3-inbound-peering does not declare a provider named azurerm.
│ If you wish to specify a provider configuration for the module, add an entry for azurerm in the required_providers
│ block within the module.

If you know some other secret to suppressing it, I can do that instead. But it appears anytime we're going to pass in more than one configured provider we might need to define this block.

Copy link
Contributor

Choose a reason for hiding this comment

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

Huh, odd. Some things I instantly start to consider: Do we get that warning when sourcing the hub provider for the resource group and virtual network in the root tier-3 module? Do we get that warning when deploying the virtual-network-peering with the hub provider in tier-0 through tier-2?

Copy link
Contributor Author

@Breanna-Stryker Breanna-Stryker May 25, 2021

Choose a reason for hiding this comment

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

The error appears on every deployment that uses network-peering, specifically anything where we peer the SACA hub to the current tier. This will be a non-issue relatively soon.. but the way we had it before the network resource needed to have the SACA hub provider so it could create the network resource.

src/scripts/terraform/create_globals_from_config.sh Outdated Show resolved Hide resolved
src/scripts/config/generate_config_file.sh Outdated Show resolved Hide resolved
@glennmusa
Copy link
Contributor

be sure to update the PR title to something descriptive, this is what makes it into the git log 👍

Copy link
Contributor

@brooke-hamilton brooke-hamilton left a comment

Choose a reason for hiding this comment

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

Do you want some help updating the guidance? I can assist on that.

@brooke-hamilton
Copy link
Contributor

Do you want some help updating the guidance? I can assist on that.

Wait, it's already there. I missed it the first time. Sorry. 😄

Co-authored-by: Glenn Musa <4622125+glennmusa@users.noreply.github.com>
@Breanna-Stryker Breanna-Stryker changed the title Bree/10tier3workloads Add Tier 3 Workload Templates and Stand Alone Script. May 25, 2021
Breanna-Stryker and others added 2 commits May 25, 2021 09:52
Co-authored-by: Glenn Musa <4622125+glennmusa@users.noreply.github.com>
Co-authored-by: Glenn Musa <4622125+glennmusa@users.noreply.github.com>
Copy link
Contributor

@brooke-hamilton brooke-hamilton left a comment

Choose a reason for hiding this comment

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

FYI that I added a link to the documentation in the getting-started.md file and committed that change to this branch.

src/docs/workload-deployment.md Outdated Show resolved Hide resolved
src/docs/workload-deployment.md Outdated Show resolved Hide resolved
src/docs/workload-deployment.md Outdated Show resolved Hide resolved
Breanna-Stryker and others added 7 commits May 25, 2021 11:28
Co-authored-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Co-authored-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Co-authored-by: Brooke Hamilton <45323234+brooke-hamilton@users.noreply.github.com>
Copy link
Contributor

@glennmusa glennmusa left a comment

Choose a reason for hiding this comment

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

Was able to deploy with the deploy_t3.sh 👍

@Breanna-Stryker Breanna-Stryker merged commit 4ad561a into main May 26, 2021
@Breanna-Stryker Breanna-Stryker deleted the bree/10tier3workloads branch May 26, 2021 01:09
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.

Tier 3 - Workloads
3 participants