From 9d2dbbcee4fa66b91de5816259e5f552901e0cb2 Mon Sep 17 00:00:00 2001 From: Steve Laing Date: Thu, 8 Feb 2024 11:14:35 +0000 Subject: [PATCH] Fix make targets where cluster config is required --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 39f1fbd7..acdcbfc9 100644 --- a/Makefile +++ b/Makefile @@ -168,14 +168,14 @@ action-group-resources: set-azure-account # make production action-group-resourc az group create -l uksouth -g ${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-mn-rg --tags "Product=Database of Qualified Teachers" "Environment=${DEPLOY_ENV}" "Service Offering=Database of Qualified Teachers" az monitor action-group create -n ${AZURE_RESOURCE_PREFIX}-check-childrens-barred-list -g ${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-mn-rg --action email ${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-email ${ACTION_GROUP_EMAIL} -console: get-cluster-credentials +console: read-cluster-config get-cluster-credentials $(if $(APP_NAME), $(eval export APP_ID=$(APP_NAME)) , $(eval export APP_ID=$(CONFIG_LONG))) kubectl -n ${NAMESPACE} exec -ti --tty deployment/check-childrens-barred-list-${APP_ID} -- /bin/sh -c "cd /app && /usr/local/bin/bundle exec rails c" -logs: get-cluster-credentials +logs: read-cluster-config get-cluster-credentials $(if $(APP_NAME), $(eval export APP_ID=$(APP_NAME)) , $(eval export APP_ID=$(CONFIG_LONG))) kubectl -n ${NAMESPACE} logs -l app=check-childrens-barred-list-${APP_ID} --tail=-1 --timestamps=true -ssh: get-cluster-credentials +ssh: read-cluster-config get-cluster-credentials $(if $(APP_NAME), $(eval export APP_ID=$(APP_NAME)) , $(eval export APP_ID=$(CONFIG_LONG))) kubectl -n ${NAMESPACE} exec -ti --tty deployment/check-childrens-barred-list-${APP_ID} -- /bin/sh