wip

DFE-Digital · Jan 30, 2024 · 70777cc · 70777cc
1 parent 0e5a7ef
commit 70777cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/actions/deploy/action.yml b/.github/actions/deploy/action.yml
@@ -110,7 +110,7 @@ runs:
     - name: K8 setup
       shell: bash
       run: |
-        make get-cluster-credentials  cluster_rg=${{ env.cluster_rg }} cluster_name=${{ env.cluster_name }}
+        make ${{inputs.environment}} get-cluster-credentials
         make install-konduit
 
     - name: Generate example data

diff --git a/Makefile b/Makefile
@@ -103,8 +103,8 @@ print-infra-secrets: read-tf-config install-fetch-config set-azure-account
 
 get-cluster-credentials: read-cluster-config set-azure-account ## make <config> get-cluster-credentials [ENVIRONMENT=<clusterX>]
 ifeq ($(GITHUB_ACTIONS),)
-	$(eval cluster_rg= ${AZURE_RESOURCE_PREFIX}-tsc-${CLUSTER_SHORT}-rg)
-	$(eval cluster_name= ${AZURE_RESOURCE_PREFIX}-tsc-${CLUSTER}-aks)
+	$(eval export cluster_rg= ${AZURE_RESOURCE_PREFIX}-tsc-${CLUSTER_SHORT}-rg)
+	$(eval export cluster_name= ${AZURE_RESOURCE_PREFIX}-tsc-${CLUSTER}-aks)
 endif
 	az aks get-credentials --overwrite-existing -g ${cluster_rg} -n ${cluster_name}
 	kubelogin convert-kubeconfig -l $(if ${GITHUB_ACTIONS},spn,azurecli)