Rename terraform/aks

I've renamed it to terraform/application to match the teacher services cloud template.
DFE-Digital · Jul 21, 2023 · 6dfa197 · 6dfa197
1 parent 742b5d9
commit 6dfa197
Show file tree

Hide file tree

Showing 26 changed files with 9 additions and 9 deletions.
diff --git a/.github/actions/deploy-environment-to-aks/action.yml b/.github/actions/deploy-environment-to-aks/action.yml
@@ -42,7 +42,7 @@ runs:
       shell: bash
       run: |
         make ci ${{ inputs.environment }}_aks terraform-apply
-        cd terraform/aks && echo "url=$(terraform output -raw url)" >> $GITHUB_OUTPUT
+        cd terraform/application && echo "url=$(terraform output -raw url)" >> $GITHUB_OUTPUT
       env:
         TF_VAR_azure_sp_credentials_json: ${{ inputs.azure-credentials }}
         DOCKER_IMAGE: ${{ inputs.docker-image }}

diff --git a/.github/actions/set-kubernetes-credentials/action.yaml b/.github/actions/set-kubernetes-credentials/action.yaml
@@ -31,7 +31,7 @@ runs:
 
     - name: Get cluster details
       id: cluster-details
-      working-directory: terraform/aks
+      working-directory: terraform/application
       shell: bash
       run: |
         echo "name=$(terraform output -raw kubernetes_cluster_name)" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/database.yaml b/.github/workflows/database.yaml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Get Azure backup storage details
         id: azure-backup-storage
-        working-directory: terraform/aks
+        working-directory: terraform/application
         run: |
           echo "account-name=$(terraform output -raw postgres_azure_backup_storage_account_name)" >> $GITHUB_OUTPUT
           echo "container-name=$(terraform output -raw postgres_azure_backup_storage_container_name)" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -56,4 +56,4 @@ jobs:
         run: |
           terraform init -backend=false
           terraform validate -no-color
-        working-directory: terraform/aks
+        working-directory: terraform/application
diff --git a/Makefile b/Makefile
@@ -80,23 +80,23 @@ terraform-init:
 	$(eval export TF_VAR_azure_resource_prefix=$(AZURE_RESOURCE_PREFIX))
 
 	[[ "${SP_AUTH}" != "true" ]] && az account show && az account set -s $(AZURE_SUBSCRIPTION) || true
-	terraform -chdir=terraform/aks init -backend-config workspace_variables/$(CONFIG).backend.tfvars $(backend_config) -upgrade -reconfigure
+	terraform -chdir=terraform/application init -backend-config workspace_variables/$(CONFIG).backend.tfvars $(backend_config) -upgrade -reconfigure
 
 .PHONY: terraform-plan
 terraform-plan: terraform-init
-	terraform -chdir=terraform/aks plan -var-file workspace_variables/$(CONFIG).tfvars.json
+	terraform -chdir=terraform/application plan -var-file workspace_variables/$(CONFIG).tfvars.json
 
 .PHONY: terraform-refresh
 terraform-refresh: terraform-init
-	terraform -chdir=terraform/aks refresh -var-file workspace_variables/$(CONFIG).tfvars.json
+	terraform -chdir=terraform/application refresh -var-file workspace_variables/$(CONFIG).tfvars.json
 
 .PHONY: terraform-apply
 terraform-apply: terraform-init
-	terraform -chdir=terraform/aks apply -var-file workspace_variables/$(CONFIG).tfvars.json ${AUTO_APPROVE}
+	terraform -chdir=terraform/application apply -var-file workspace_variables/$(CONFIG).tfvars.json ${AUTO_APPROVE}
 
 .PHONY: terraform-destroy
 terraform-destroy: terraform-init
-	terraform -chdir=terraform/aks destroy -var-file workspace_variables/$(CONFIG).tfvars.json ${AUTO_APPROVE}
+	terraform -chdir=terraform/application destroy -var-file workspace_variables/$(CONFIG).tfvars.json ${AUTO_APPROVE}
 
 .PHONY: set-azure-resource-group-tags
 set-azure-resource-group-tags: ##Tags that will be added to resource group on its creation in ARM template

diff --git a/terraform/aks/.terraform.lock.hcl → terraform/application/.terraform.lock.hcl b/terraform/aks/.terraform.lock.hcl → terraform/application/.terraform.lock.hcl
diff --git a/terraform/aks/application.tf → terraform/application/application.tf b/terraform/aks/application.tf → terraform/application/application.tf
diff --git a/terraform/aks/cluster_data.tf → terraform/application/cluster_data.tf b/terraform/aks/cluster_data.tf → terraform/application/cluster_data.tf
diff --git a/terraform/aks/databases.tf → terraform/application/databases.tf b/terraform/aks/databases.tf → terraform/application/databases.tf
diff --git a/terraform/aks/monitoring.tf → terraform/application/monitoring.tf b/terraform/aks/monitoring.tf → terraform/application/monitoring.tf
diff --git a/terraform/aks/outputs.tf → terraform/application/outputs.tf b/terraform/aks/outputs.tf → terraform/application/outputs.tf
diff --git a/terraform/aks/providers.tf → terraform/application/providers.tf b/terraform/aks/providers.tf → terraform/application/providers.tf
diff --git a/terraform/aks/secrets.tf → terraform/application/secrets.tf b/terraform/aks/secrets.tf → terraform/application/secrets.tf
diff --git a/terraform/aks/storage.tf → terraform/application/storage.tf b/terraform/aks/storage.tf → terraform/application/storage.tf
diff --git a/terraform/aks/terraform.tf → terraform/application/terraform.tf b/terraform/aks/terraform.tf → terraform/application/terraform.tf
diff --git a/terraform/aks/variables.tf → terraform/application/variables.tf b/terraform/aks/variables.tf → terraform/application/variables.tf
diff --git a/..._variables/development_aks.backend.tfvars → ..._variables/development_aks.backend.tfvars b/..._variables/development_aks.backend.tfvars → ..._variables/development_aks.backend.tfvars
diff --git a/...ace_variables/development_aks.tfvars.json → ...ace_variables/development_aks.tfvars.json b/...ace_variables/development_aks.tfvars.json → ...ace_variables/development_aks.tfvars.json
diff --git a/...ariables/preproduction_aks.backend.tfvars → ...ariables/preproduction_aks.backend.tfvars b/...ariables/preproduction_aks.backend.tfvars → ...ariables/preproduction_aks.backend.tfvars
diff --git a/...e_variables/preproduction_aks.tfvars.json → ...e_variables/preproduction_aks.tfvars.json b/...e_variables/preproduction_aks.tfvars.json → ...e_variables/preproduction_aks.tfvars.json
diff --git a/...e_variables/production_aks.backend.tfvars → ...e_variables/production_aks.backend.tfvars b/...e_variables/production_aks.backend.tfvars → ...e_variables/production_aks.backend.tfvars
diff --git a/...pace_variables/production_aks.tfvars.json → ...pace_variables/production_aks.tfvars.json b/...pace_variables/production_aks.tfvars.json → ...pace_variables/production_aks.tfvars.json
diff --git a/...space_variables/review_aks.backend.tfvars → ...space_variables/review_aks.backend.tfvars b/...space_variables/review_aks.backend.tfvars → ...space_variables/review_aks.backend.tfvars
diff --git a/...orkspace_variables/review_aks.tfvars.json → ...orkspace_variables/review_aks.tfvars.json b/...orkspace_variables/review_aks.tfvars.json → ...orkspace_variables/review_aks.tfvars.json
diff --git a/...rkspace_variables/test_aks.backend.tfvars → ...rkspace_variables/test_aks.backend.tfvars b/...rkspace_variables/test_aks.backend.tfvars → ...rkspace_variables/test_aks.backend.tfvars
diff --git a/.../workspace_variables/test_aks.tfvars.json → .../workspace_variables/test_aks.tfvars.json b/.../workspace_variables/test_aks.tfvars.json → .../workspace_variables/test_aks.tfvars.json