Updated make file for vault and added prod

DFE-Digital · Dec 4, 2023 · b1a981e · b1a981e
1 parent 18ab7e9
commit b1a981e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/deploy_aks.yml b/.github/workflows/deploy_aks.yml
@@ -55,7 +55,7 @@ jobs:
         strategy:
           max-parallel: 1
           matrix:
-            environment: [development]
+            environment: [development,production]
 
         steps:
           - name: Checkout code
@@ -70,7 +70,7 @@ jobs:
             with:
               azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
 
-          - name: Terraform Plan
+          - name: Terraform Apply
             run: |
               make ci ${{ matrix.environment }} terraform-apply
             env:

diff --git a/Makefile b/Makefile
@@ -25,9 +25,7 @@ domains:
 
 composed-variables:
 	$(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")')
 	$(eval STORAGE_ACCOUNT_NAME=${AZURE_RESOURCE_PREFIX}${SERVICE_SHORT}${CONFIG_SHORT}tfsa)
-	$(eval LOG_ANALYTICS_WORKSPACE_NAME=${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-log)
 
 ci:
 	$(eval AUTO_APPROVE=-auto-approve)
@@ -66,16 +64,10 @@ set-what-if:
 	$(eval WHAT_IF=--what-if)
 
 arm-deployment: composed-variables set-azure-account
-	$(if ${DISABLE_KEYVAULTS},, $(eval KV_ARG=keyVaultNames=${KEYVAULT_NAMES}))
-	$(if ${ENABLE_KV_DIAGNOSTICS}, $(eval KV_DIAG_ARG=enableDiagnostics=${ENABLE_KV_DIAGNOSTICS} logAnalyticsWorkspaceName=${LOG_ANALYTICS_WORKSPACE_NAME}),)
-
 	az deployment sub create --name "resourcedeploy-tsc-$(shell date +%Y%m%d%H%M%S)" \
 		-l "${REGION}" --template-uri "https://raw.githubusercontent.com/DFE-Digital/tra-shared-services/${ARM_TEMPLATE_TAG}/azure/resourcedeploy.json" \
 		--parameters "resourceGroupName=${RESOURCE_GROUP_NAME}" 'tags=${RG_TAGS}' \
 		"tfStorageAccountName=${STORAGE_ACCOUNT_NAME}" "tfStorageContainerName=terraform-state" \
-		${KV_ARG} \
-		${KV_DIAG_ARG} \
-		"enableKVPurgeProtection=${KV_PURGE_PROTECTION}" \
 		${WHAT_IF}
 
 deploy-arm-resources: arm-deployment ## Validate ARM resource deployment. Usage: make domains validate-arm-resources