From 6b96b4d6bd9a57e05bad23623560eb36bc5e71d0 Mon Sep 17 00:00:00 2001 From: Colin Saliceti Date: Wed, 4 Dec 2024 17:26:14 +0000 Subject: [PATCH 1/3] Replace terrafile terrafile is not maintained anymore --- .gitignore | 1 - Makefile | 24 ++++++++------- global_config/domains.sh | 1 + global_config/production.sh | 1 + global_config/review.sh | 1 + global_config/sandbox.sh | 1 + global_config/staging.sh | 1 + terraform/application/.terraform.lock.hcl | 30 ++++++++++--------- .../application/config/production_Terrafile | 3 -- terraform/application/config/review_Terrafile | 3 -- .../application/config/sandbox_Terrafile | 3 -- .../application/config/staging_Terrafile | 3 -- .../environment_domains/.terraform.lock.hcl | 1 + .../config/development_Terrafile | 3 -- .../config/production_Terrafile | 3 -- .../config/staging_Terrafile | 3 -- .../infrastructure/.terraform.lock.hcl | 1 + .../infrastructure/config/zones_Terrafile | 3 -- 18 files changed, 36 insertions(+), 50 deletions(-) delete mode 100644 terraform/application/config/production_Terrafile delete mode 100644 terraform/application/config/review_Terrafile delete mode 100644 terraform/application/config/sandbox_Terrafile delete mode 100644 terraform/application/config/staging_Terrafile delete mode 100644 terraform/domains/environment_domains/config/development_Terrafile delete mode 100644 terraform/domains/environment_domains/config/production_Terrafile delete mode 100644 terraform/domains/environment_domains/config/staging_Terrafile delete mode 100644 terraform/domains/infrastructure/config/zones_Terrafile diff --git a/.gitignore b/.gitignore index 6a16d52..89e2e6f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,5 @@ terraform/application/vendor terraform/domains/environment_domains/vendor terraform/domains/infrastructure/vendor/ terraform.tfstate* -bin/terrafile .env diff --git a/Makefile b/Makefile index 4b48c50..3ec1ec8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,3 @@ -TERRAFILE_VERSION=0.8 ARM_TEMPLATE_TAG=1.1.10 RG_TAGS={"Product" : "Find a teaching school hub"} REGION=UK South @@ -48,15 +47,13 @@ ci: $(eval SKIP_AZURE_LOGIN=true) $(eval SKIP_CONFIRM=true) -bin/terrafile: ## Install terrafile to manage terraform modules - curl -sL https://github.com/coretech/terrafile/releases/download/v${TERRAFILE_VERSION}/terrafile_${TERRAFILE_VERSION}_$$(uname)_x86_64.tar.gz \ - | tar xz -C ./bin terrafile - set-azure-account: [ "${SKIP_AZURE_LOGIN}" != "true" ] && az account set -s ${AZURE_SUBSCRIPTION} || true -terraform-init: composed-variables bin/terrafile set-azure-account - ./bin/terrafile -p terraform/application/vendor/modules -f terraform/application/config/$(CONFIG)_Terrafile +terraform-init: composed-variables set-azure-account + rm -rf terraform/application/vendor/modules/aks + git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/application/vendor/modules/aks + terraform -chdir=terraform/application init -upgrade -reconfigure \ -backend-config=resource_group_name=${RESOURCE_GROUP_NAME} \ -backend-config=storage_account_name=${STORAGE_ACCOUNT_NAME} \ @@ -97,8 +94,9 @@ 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 domains composed-variables set-azure-account - ./bin/terrafile -p terraform/domains/infrastructure/vendor/modules -f terraform/domains/infrastructure/config/zones_Terrafile +domains-infra-init: domains composed-variables set-azure-account + rm -rf terraform/domains/infrastructure/vendor/modules/domains + git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/domains/infrastructure/vendor/modules/domains terraform -chdir=terraform/domains/infrastructure init -reconfigure -upgrade \ -backend-config=resource_group_name=${RESOURCE_GROUP_NAME} \ @@ -111,14 +109,18 @@ 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 domains composed-variables set-azure-account - ./bin/terrafile -p terraform/domains/environment_domains/vendor/modules -f terraform/domains/environment_domains/config/${CONFIG}_Terrafile +domains-init: domains composed-variables set-azure-account + rm -rf terraform/domains/environment_domains/vendor/modules/domains + git -c advice.detachedHead=false clone --depth=1 --single-branch --branch ${TERRAFORM_MODULES_TAG} https://github.com/DFE-Digital/terraform-modules.git terraform/domains/environment_domains/vendor/modules/domains terraform -chdir=terraform/domains/environment_domains init -upgrade -reconfigure \ -backend-config=resource_group_name=${RESOURCE_GROUP_NAME} \ -backend-config=storage_account_name=${STORAGE_ACCOUNT_NAME} \ -backend-config=key=${ENVIRONMENT}.tfstate +domains-destroy: domains-init ## Terraform destroy for DNS environment domains. Usage: make development domains domains-destroy + terraform -chdir=terraform/domains/environment_domains destroy -var-file config/${CONFIG}.tfvars.json + domains-plan: domains-init ## Terraform plan for DNS environment domains. Usage: make development domains domains-plan terraform -chdir=terraform/domains/environment_domains plan -var-file config/${CONFIG}.tfvars.json diff --git a/global_config/domains.sh b/global_config/domains.sh index a7b7641..7faeff7 100644 --- a/global_config/domains.sh +++ b/global_config/domains.sh @@ -2,3 +2,4 @@ AZURE_SUBSCRIPTION=s189-teacher-services-cloud-production AZURE_RESOURCE_PREFIX=s189p01 CONFIG_SHORT=dom DISABLE_KEYVAULTS=true +TERRAFORM_MODULES_TAG=stable diff --git a/global_config/production.sh b/global_config/production.sh index 8f32358..252c3a6 100644 --- a/global_config/production.sh +++ b/global_config/production.sh @@ -6,3 +6,4 @@ AZURE_RESOURCE_PREFIX=s189p01 ENABLE_KV_DIAGNOSTICS=true CONFIG_LONG=production NAMESPACE=cpd-production +TERRAFORM_MODULES_TAG=stable diff --git a/global_config/review.sh b/global_config/review.sh index e80d8af..63a0ceb 100644 --- a/global_config/review.sh +++ b/global_config/review.sh @@ -6,3 +6,4 @@ AZURE_RESOURCE_PREFIX=s189t01 KV_PURGE_PROTECTION=false CONFIG_LONG=review NAMESPACE=cpd-review +TERRAFORM_MODULES_TAG=main diff --git a/global_config/sandbox.sh b/global_config/sandbox.sh index 95db8be..c609d70 100644 --- a/global_config/sandbox.sh +++ b/global_config/sandbox.sh @@ -3,3 +3,4 @@ ENVIRONMENT=sandbox CONFIG_SHORT=sb AZURE_SUBSCRIPTION=s189-teacher-services-cloud-production AZURE_RESOURCE_PREFIX=s189p01 +TERRAFORM_MODULES_TAG=testing diff --git a/global_config/staging.sh b/global_config/staging.sh index acfa75f..4de2321 100644 --- a/global_config/staging.sh +++ b/global_config/staging.sh @@ -4,3 +4,4 @@ CONFIG_SHORT=st AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test AZURE_RESOURCE_PREFIX=s189t01 KV_PURGE_PROTECTION=false +TERRAFORM_MODULES_TAG=testing diff --git a/terraform/application/.terraform.lock.hcl b/terraform/application/.terraform.lock.hcl index 3faa3de..80665f6 100644 --- a/terraform/application/.terraform.lock.hcl +++ b/terraform/application/.terraform.lock.hcl @@ -29,6 +29,7 @@ provider "registry.terraform.io/hashicorp/azurerm" { version = "3.116.0" constraints = "3.116.0" hashes = [ + "h1:2QbjtN4oMXzdA++Nvrj/wSmWZTPgXKOSFGGQCLEMrb4=", "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", @@ -50,6 +51,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" { constraints = "2.32.0" hashes = [ "h1:3j4XBR5UWQA7xXaiEnzZp0bHbcwOhWetHYKTWIrUTI0=", + "h1:Cj3RHyw3wE3AkNlCtSNrZfjFNkShvaZR0K/K3pJlYJU=", "zh:0e715d7fb13a8ad569a5fdc937b488590633f6942e986196fdb17cd7b8f7720e", "zh:495fc23acfe508ed981e60af9a3758218b0967993065e10a297fdbc210874974", "zh:4b930a8619910ef528bc90dae739cb4236b9b76ce41367281e3bc3cf586101c7", @@ -66,22 +68,21 @@ provider "registry.terraform.io/hashicorp/kubernetes" { } provider "registry.terraform.io/hashicorp/random" { - version = "3.6.2" + version = "3.6.3" hashes = [ - "h1:R5qdQjKzOU16TziCN1vR3Exr/B+8WGK80glLTT4ZCPk=", - "h1:VavG5unYCa3SYISMKF9pzc3718M0bhPlcbUZZGl7wuo=", - "zh:0ef01a4f81147b32c1bea3429974d4d104bbc4be2ba3cfa667031a8183ef88ec", - "zh:1bcd2d8161e89e39886119965ef0f37fcce2da9c1aca34263dd3002ba05fcb53", - "zh:37c75d15e9514556a5f4ed02e1548aaa95c0ecd6ff9af1119ac905144c70c114", - "zh:4210550a767226976bc7e57d988b9ce48f4411fa8a60cd74a6b246baf7589dad", - "zh:562007382520cd4baa7320f35e1370ffe84e46ed4e2071fdc7e4b1a9b1f8ae9b", - "zh:5efb9da90f665e43f22c2e13e0ce48e86cae2d960aaf1abf721b497f32025916", - "zh:6f71257a6b1218d02a573fc9bff0657410404fb2ef23bc66ae8cd968f98d5ff6", + "h1:f6jXn4MCv67kgcofx9D49qx1ZEBv8oyvwKDMPBr0A24=", + "zh:04ceb65210251339f07cd4611885d242cd4d0c7306e86dda9785396807c00451", + "zh:448f56199f3e99ff75d5c0afacae867ee795e4dfda6cb5f8e3b2a72ec3583dd8", + "zh:4b4c11ccfba7319e901df2dac836b1ae8f12185e37249e8d870ee10bb87a13fe", + "zh:4fa45c44c0de582c2edb8a2e054f55124520c16a39b2dfc0355929063b6395b1", + "zh:588508280501a06259e023b0695f6a18149a3816d259655c424d068982cbdd36", + "zh:737c4d99a87d2a4d1ac0a54a73d2cb62974ccb2edbd234f333abd079a32ebc9e", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9647e18f221380a85f2f0ab387c68fdafd58af6193a932417299cdcae4710150", - "zh:bb6297ce412c3c2fa9fec726114e5e0508dd2638cad6a0cb433194930c97a544", - "zh:f83e925ed73ff8a5ef6e3608ad9225baa5376446349572c2449c0c0b3cf184b7", - "zh:fbef0781cb64de76b1df1ca11078aecba7800d82fd4a956302734999cfd9a4af", + "zh:a357ab512e5ebc6d1fda1382503109766e21bbfdfaa9ccda43d313c122069b30", + "zh:c51bfb15e7d52cc1a2eaec2a903ac2aff15d162c172b1b4c17675190e8147615", + "zh:e0951ee6fa9df90433728b96381fb867e3db98f66f735e0c3e24f8f16903f0ad", + "zh:e3cdcb4e73740621dabd82ee6a37d6cfce7fee2a03d8074df65086760f5cf556", + "zh:eff58323099f1bd9a0bec7cb04f717e7f1b2774c7d612bf7581797e1622613a0", ] } @@ -90,6 +91,7 @@ provider "registry.terraform.io/statuscakedev/statuscake" { constraints = "2.2.2" hashes = [ "h1:nVaJkDBk4sv0yWFzg3p+yeJGzE8mB4KJv3Q6/UgU164=", + "h1:wFoZJfmNvG6XTf65NLai67geSHqYV1Tilx7OITrHilE=", "zh:0916313344c579d6e05d70f88129a10fe48f7dabe0e61cad17874d6c496f288d", "zh:0d491ff72c2eda6482855033ca2146c5ace1663d07cb3da7253b59ed2e2ec6f4", "zh:11fffbce18eb3d3c283e877242f477e0c561342c19090240b60af7d948bd84ac", diff --git a/terraform/application/config/production_Terrafile b/terraform/application/config/production_Terrafile deleted file mode 100644 index 65af53b..0000000 --- a/terraform/application/config/production_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -aks: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "main" diff --git a/terraform/application/config/review_Terrafile b/terraform/application/config/review_Terrafile deleted file mode 100644 index 65af53b..0000000 --- a/terraform/application/config/review_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -aks: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "main" diff --git a/terraform/application/config/sandbox_Terrafile b/terraform/application/config/sandbox_Terrafile deleted file mode 100644 index 65af53b..0000000 --- a/terraform/application/config/sandbox_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -aks: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "main" diff --git a/terraform/application/config/staging_Terrafile b/terraform/application/config/staging_Terrafile deleted file mode 100644 index 65af53b..0000000 --- a/terraform/application/config/staging_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -aks: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "main" diff --git a/terraform/domains/environment_domains/.terraform.lock.hcl b/terraform/domains/environment_domains/.terraform.lock.hcl index 10fdcc6..8c3d127 100644 --- a/terraform/domains/environment_domains/.terraform.lock.hcl +++ b/terraform/domains/environment_domains/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/hashicorp/azurerm" { version = "3.116.0" constraints = "3.116.0" hashes = [ + "h1:2QbjtN4oMXzdA++Nvrj/wSmWZTPgXKOSFGGQCLEMrb4=", "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", diff --git a/terraform/domains/environment_domains/config/development_Terrafile b/terraform/domains/environment_domains/config/development_Terrafile deleted file mode 100644 index dfce270..0000000 --- a/terraform/domains/environment_domains/config/development_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -domains: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "testing" diff --git a/terraform/domains/environment_domains/config/production_Terrafile b/terraform/domains/environment_domains/config/production_Terrafile deleted file mode 100644 index 58e60b3..0000000 --- a/terraform/domains/environment_domains/config/production_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -domains: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "stable" diff --git a/terraform/domains/environment_domains/config/staging_Terrafile b/terraform/domains/environment_domains/config/staging_Terrafile deleted file mode 100644 index dfce270..0000000 --- a/terraform/domains/environment_domains/config/staging_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -domains: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "testing" diff --git a/terraform/domains/infrastructure/.terraform.lock.hcl b/terraform/domains/infrastructure/.terraform.lock.hcl index 10fdcc6..8c3d127 100644 --- a/terraform/domains/infrastructure/.terraform.lock.hcl +++ b/terraform/domains/infrastructure/.terraform.lock.hcl @@ -5,6 +5,7 @@ provider "registry.terraform.io/hashicorp/azurerm" { version = "3.116.0" constraints = "3.116.0" hashes = [ + "h1:2QbjtN4oMXzdA++Nvrj/wSmWZTPgXKOSFGGQCLEMrb4=", "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", diff --git a/terraform/domains/infrastructure/config/zones_Terrafile b/terraform/domains/infrastructure/config/zones_Terrafile deleted file mode 100644 index 58e60b3..0000000 --- a/terraform/domains/infrastructure/config/zones_Terrafile +++ /dev/null @@ -1,3 +0,0 @@ -domains: - source: "https://github.com/DFE-Digital/terraform-modules" - version: "stable" From 6d722317bed05b0df522f15e34363ae3ea29fbf7 Mon Sep 17 00:00:00 2001 From: Colin Saliceti Date: Wed, 4 Dec 2024 17:26:49 +0000 Subject: [PATCH 2/3] Finalise staging and sandbox DNS - Update the domain name - Remove the "development" configuration as it was never used --- README.md | 5 +++++ .../config/development.tfvars.json | 16 ---------------- .../config/sandbox.tfvars.json | 16 ++++++++++++++++ .../config/staging.tfvars.json | 6 +++--- 4 files changed, 24 insertions(+), 19 deletions(-) delete mode 100644 terraform/domains/environment_domains/config/development.tfvars.json create mode 100644 terraform/domains/environment_domains/config/sandbox.tfvars.json diff --git a/README.md b/README.md index acc7265..f069b6d 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,11 @@ Live version of the service can be find here: https://find-a-teaching-school-hub.education.gov.uk/ +## Test environments +- [Staging](https://staging.find-a-teaching-school-hub.education.gov.uk/) +- [Sandbox](https://sandbox.find-a-teaching-school-hub.education.gov.uk/) +- Review apps: the link is posted in the pull request + ## Setup ### Prerequisites diff --git a/terraform/domains/environment_domains/config/development.tfvars.json b/terraform/domains/environment_domains/config/development.tfvars.json deleted file mode 100644 index cf90824..0000000 --- a/terraform/domains/environment_domains/config/development.tfvars.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "hosted_zone": { - "teaching-school-hub-finder.education.gov.uk": { - "front_door_name": "s189p01-cpdtsh-domains-fd", - "resource_group_name": "s189p01-cpdtsh-domains-rg", - "domains": [ - "development" - ], - "cached_paths": [ - "/assets/*" - ], - "environment_short": "dv", - "origin_hostname": "teaching-school-hub-finder-development.test.teacherservices.cloud" - } - } -} diff --git a/terraform/domains/environment_domains/config/sandbox.tfvars.json b/terraform/domains/environment_domains/config/sandbox.tfvars.json new file mode 100644 index 0000000..1a8d507 --- /dev/null +++ b/terraform/domains/environment_domains/config/sandbox.tfvars.json @@ -0,0 +1,16 @@ +{ + "hosted_zone": { + "find-a-teaching-school-hub.education.gov.uk": { + "front_door_name": "s189p01-cpdtsh-dom-fd", + "resource_group_name": "s189p01-cpdtsh-dom-rg", + "domains": [ + "sandbox" + ], + "cached_paths": [ + "/assets/*" + ], + "environment_short": "sb", + "origin_hostname": "cpd-tsh-sandbox.teacherservices.cloud" + } + } +} diff --git a/terraform/domains/environment_domains/config/staging.tfvars.json b/terraform/domains/environment_domains/config/staging.tfvars.json index 1206492..8885155 100644 --- a/terraform/domains/environment_domains/config/staging.tfvars.json +++ b/terraform/domains/environment_domains/config/staging.tfvars.json @@ -1,6 +1,6 @@ { "hosted_zone": { - "teaching-school-hub-finder.education.gov.uk": { + "find-a-teaching-school-hub.education.gov.uk": { "front_door_name": "s189p01-cpdtsh-dom-fd", "resource_group_name": "s189p01-cpdtsh-dom-rg", "domains": [ @@ -9,8 +9,8 @@ "cached_paths": [ "/assets/*" ], - "environment_short": "dv", - "origin_hostname": "teaching-school-hub-finder-staging.test.teacherservices.cloud" + "environment_short": "st", + "origin_hostname": "cpd-tsh-staging.test.teacherservices.cloud" } } } From 2298efd06aa8c9f451abd086c4b4874d1d1a4878 Mon Sep 17 00:00:00 2001 From: Colin Saliceti Date: Wed, 4 Dec 2024 17:53:26 +0000 Subject: [PATCH 3/3] Fix aks-console and aks-ssh commands --- Makefile | 10 ++++++---- global_config/production.sh | 1 - global_config/review.sh | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3ec1ec8..c1a62ff 100644 --- a/Makefile +++ b/Makefile @@ -140,12 +140,14 @@ get-cluster-credentials: set-azure-account kubelogin convert-kubeconfig -l $(if ${GITHUB_ACTIONS},spn,azurecli) aks-console: get-cluster-credentials - $(if $(PULL_REQUEST_NUMBER), $(eval export APP_ID=review-$(PULL_REQUEST_NUMBER)) , $(eval export APP_ID=$(CONFIG_LONG))) - kubectl -n ${NAMESPACE} exec -ti --tty deployment/cpd-tsh-${APP_ID} -- /bin/sh -c "cd /app && bundle exec rails c" + $(if $(PULL_REQUEST_NUMBER), $(eval export APP_ID=review-$(PULL_REQUEST_NUMBER)) , $(eval export APP_ID=$(CONFIG))) + $(eval NAMESPACE=$(shell jq -r '.namespace' terraform/application/config/${CONFIG}.tfvars.json)) + kubectl -n ${NAMESPACE} exec -ti deployment/cpd-tsh-${APP_ID} -- /bin/sh -c "cd /app && bundle exec rails c" aks-ssh: get-cluster-credentials - $(if $(PULL_REQUEST_NUMBER), $(eval export APP_ID=review-$(PULL_REQUEST_NUMBER)) , $(eval export APP_ID=$(CONFIG_LONG))) - kubectl -n ${NAMESPACE} exec -ti --tty deployment/teaching-school-hub-finder-${APP_ID} -- /bin/sh + $(if $(PULL_REQUEST_NUMBER), $(eval export APP_ID=review-$(PULL_REQUEST_NUMBER)) , $(eval export APP_ID=$(CONFIG))) + $(eval NAMESPACE=$(shell jq -r '.namespace' terraform/application/config/${CONFIG}.tfvars.json)) + kubectl -n ${NAMESPACE} exec -ti deployment/cpd-tsh-${APP_ID} -- /bin/sh .PHONY: install-konduit install-konduit: ## Install the konduit script, for accessing backend services diff --git a/global_config/production.sh b/global_config/production.sh index 252c3a6..ad4dabb 100644 --- a/global_config/production.sh +++ b/global_config/production.sh @@ -4,6 +4,5 @@ CONFIG_SHORT=pd AZURE_SUBSCRIPTION=s189-teacher-services-cloud-production AZURE_RESOURCE_PREFIX=s189p01 ENABLE_KV_DIAGNOSTICS=true -CONFIG_LONG=production NAMESPACE=cpd-production TERRAFORM_MODULES_TAG=stable diff --git a/global_config/review.sh b/global_config/review.sh index 63a0ceb..6681eaf 100644 --- a/global_config/review.sh +++ b/global_config/review.sh @@ -4,6 +4,5 @@ CONFIG_SHORT=rv AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test AZURE_RESOURCE_PREFIX=s189t01 KV_PURGE_PROTECTION=false -CONFIG_LONG=review NAMESPACE=cpd-review TERRAFORM_MODULES_TAG=main