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.

Sign up for GitHub

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

[619] new_service template fixes #108

Merged
merged 2 commits into from
Sep 15, 2023
Merged

[619] new_service template fixes #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbd8302
Fix new_service domains variables in Makefile
saliceti Sep 15, 2023
0b25944
new_service doc: arm resource make target names
saliceti Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions documentation/onboard-service.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ Then login to Azure using `az login`.
### Create terraform environment
This creates the minimum Azure resources required to run terraform, ie storage account and keyvaults.

- Validate: `make <environment config> validate-azure-resources`. Example: `make development validate-azure-resources`
- Deploy: `make <environment config> deploy-azure-resources`. Example: `make development deploy-azure-resources`
- Validate: `make <environment config> validate-arm-resources`. Example: `make development validate-arm-resources`
- Deploy: `make <environment config> deploy-arm-resources`. Example: `make development deploy-arm-resources`

### Configure Statuscake credentials
If Statuscake is not required at this stage, comment out resources in `terraform/application/statuscake.tf` and the provider in `terraform/application/terraform.tf`.
Expand All @@ -68,8 +68,8 @@ The new application uses a default domain in `test.teacherservices.cloud` in tes
The code deploys integrated DNS zone and Azure front door **in the production subscription**.

### Create terraform environment
- Validate: `make domains validate-azure-resources`
- Deploy: `make domains deploy-azure-resources`
- Validate: `make domains validate-arm-resources`
- Deploy: `make domains deploy-arm-resources`

### Deploy infrastructure
This deploys one DNS zone and one front door which will be used subsequently by all the domains.
Expand Down
4 changes: 2 additions & 2 deletions templates/new_service/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ deploy-arm-resources: arm-deployment ## Validate ARM resource deployment. Usage:

validate-arm-resources: set-what-if arm-deployment ## Validate ARM resource deployment. Usage: make domains validate-arm-resources

domains-infra-init: bin/terrafile composed-variables domains set-azure-account
domains-infra-init: bin/terrafile domains composed-variables set-azure-account
./bin/terrafile -p terraform/domains/infrastructure/vendor/modules -f terraform/domains/infrastructure/config/zones_Terrafile

terraform -chdir=terraform/domains/infrastructure init -reconfigure -upgrade \
Expand All @@ -93,7 +93,7 @@ domains-infra-plan: domains domains-infra-init ## Terraform plan for DNS infras
domains-infra-apply: domains domains-infra-init ## Terraform apply for DNS infrastructure (zone and front door). Usage: make domains-infra-apply
terraform -chdir=terraform/domains/infrastructure apply -var-file config/zones.tfvars.json ${AUTO_APPROVE}

domains-init: bin/terrafile composed-variables domains set-azure-account
domains-init: bin/terrafile domains composed-variables set-azure-account
./bin/terrafile -p terraform/domains/environment_domains/vendor/modules -f terraform/domains/environment_domains/config/${CONFIG}_Terrafile

terraform -chdir=terraform/domains/environment_domains init -upgrade -reconfigure \
Expand Down