Add test and preprod aks environments

Addition of terraform tfvars for test and preprod aswell as updating
the makefile with the aks-test and aks-preprod targets, update the
config file and the gha workflows to set the deployment for these
environments as a matrix.

.github/actions/deploy-environment-aks/action.yml

@@ -15,6 +15,11 @@ inputs:
     description: The pull request number which triggered this deploy.
     required: false
 
+outputs:
+  environment_url:
+    description: The base URL for the deployed environment
+    value: ${{ steps.set_outputs.outputs.ACCESS_URL }}
+
 runs:
   using: composite
 
@@ -40,8 +45,8 @@ runs:
       shell: bash
       id: set_outputs
       run: |
-        output=$(terraform -chdir=terraform/application output -json urls)
-        echo "HOSTNAMES=$output" >> $GITHUB_ENV
+        access_url=$(terraform -chdir=terraform/application output -json urls | jq -r '.[0]')
+        echo "ACCESS_URL=$access_url" >> $GITHUB_OUTPUT
 
     - name: Run smoke tests
       shell: bash

.github/workflows/build-and-deploy.yml

@@ -117,6 +117,31 @@ jobs:
             | Access Your Teaching Qualifications       | <https://access-your-teaching-qualifications-pr-${{ github.event.number }}.test.teacherservices.cloud>            |
             | Check A Teacher's Record                  | <https://check-a-teachers-record-pr-${{ github.event.number }}.test.teacherservices.cloud>                        |
 
+  deploy_aks:
+    name: Deploy to ${{ matrix.environment }} environment for AKS
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+    concurrency: deploy_${{ matrix.environment }}
+    needs: [build_image]
+    strategy:
+      max-parallel: 1
+      matrix:
+        environment: [aks-test, aks-preprod]
+    environment:
+      name: ${{ matrix.environment }}
+      url: ${{ steps.deploy.outputs.environment_url }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Deploy to AKS
+        uses: ./.github/actions/deploy-environment-aks
+        id: deploy
+        with:
+          environment: ${{ matrix.environment }}
+          image-tag: ${{ github.sha }}
+          azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
+
   set_matrix:
     name: Set deployment matrix
     runs-on: ubuntu-latest

Makefile

@@ -190,6 +190,14 @@ aks-review: test-cluster ## Setup review environment for AKS
 	$(eval ENVIRONMENT=pr-${PR_NUMBER})
 	$(eval include global_config/review.sh)
 
+.PHONY: aks-test
+aks-test: test-cluster
+	$(eval include global_config/test.sh)
+
+.PHONY: aks-preprod
+aks-preprod: test-cluster
+	$(eval include global_config/preprod.sh)
+
 composed-variables: ## Compose variables needed for deployments
 	$(eval RESOURCE_GROUP_NAME=${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-rg)
 	$(eval KEYVAULT_NAMES='("${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-app-kv", "${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-inf-kv")')

global_config/preprod.sh

@@ -0,0 +1,6 @@
+CONFIG=preprod
+ENVIRONMENT=preprod
+CONFIG_SHORT=pp
+AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
+AZURE_RESOURCE_PREFIX=s189t01
+KV_PURGE_PROTECTION=false

global_config/test.sh

@@ -0,0 +1,6 @@
+CONFIG=test
+ENVIRONMENT=test
+CONFIG_SHORT=ts
+AZURE_SUBSCRIPTION=s189-teacher-services-cloud-test
+AZURE_RESOURCE_PREFIX=s189t01
+KV_PURGE_PROTECTION=false

terraform/application/config/preprod.tfvars.json

@@ -0,0 +1,5 @@
+{
+  "cluster": "test",
+  "namespace": "tra-test",
+  "evidence_container_retention_in_days": 1
+}

terraform/application/config/preprod.yml

@@ -0,0 +1 @@
+---

terraform/application/config/preprod_Terrafile

@@ -0,0 +1,3 @@
+aks:
+    source:  "https://github.com/DFE-Digital/terraform-modules"
+    version: "testing"

terraform/application/config/test.tfvars.json

@@ -0,0 +1,5 @@
+{
+  "cluster": "test",
+  "namespace": "tra-test",
+  "evidence_container_retention_in_days": 1
+}

terraform/application/config/test.yml

@@ -0,0 +1 @@
+---

terraform/application/config/test_Terrafile

@@ -0,0 +1,3 @@
+aks:
+    source:  "https://github.com/DFE-Digital/terraform-modules"
+    version: "testing"