From f22b9a3262564444b5343a21cb7bab234b971d92 Mon Sep 17 00:00:00 2001 From: Dunemask Date: Sun, 25 Aug 2024 11:18:08 -0600 Subject: [PATCH] [FIX} Fix Minecluster Deployment Again --- .forgejo/workflows/deploy-edge.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.forgejo/workflows/deploy-edge.yml b/.forgejo/workflows/deploy-edge.yml index 5e9500d..b4489d8 100644 --- a/.forgejo/workflows/deploy-edge.yml +++ b/.forgejo/workflows/deploy-edge.yml @@ -1,8 +1,8 @@ name: Deploy USW-MC run-name: ${{ forgejo.actor }} Deploy USW-MC on: - push: - branches: [ master ] + push: + branches: [master] env: GARDEN_DEPLOY_ACTION: minecluster @@ -11,13 +11,13 @@ jobs: deploy-edge: steps: # Configure proper kubeconfig (Used when cluster does not match the edge environment) - # - name: Get usw-mc deployment kubeconfig - # uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env - # with: - # infisical-token: ${{ secrets.INFISICAL_ELYSIUM_EDGE_READ_TOKEN }} - # infisical-project: ${{ vars.INFISICAL_DEPLOYMENTS_PROJECT_ID }} - # secret-envs: edge - # secret-paths: /kubernetes + - name: Get usw-mc deployment kubeconfig + uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env + with: + infisical-token: ${{ secrets.INFISICAL_ELYSIUM_EDGE_READ_TOKEN }} + infisical-project: ${{ vars.INFISICAL_DEPLOYMENTS_PROJECT_ID }} + secret-envs: edge + secret-paths: /kubernetes/usw-mc # Setup Oasis - name: Oasis Setup uses: https://forgejo.dunemask.dev/elysium/elysium-actions@oasis-setup-auto @@ -31,8 +31,8 @@ jobs: - name: Deploy to Edge env run: garden deploy $GARDEN_DEPLOY_ACTION --force --force-build --env usw-edge working-directory: ${{ env.OASIS_WORKSPACE }} - # env: # (Used when cluster does not match the edge environment) - # MCL_KUBECONFIG: ${{ env.KUBERNETES_CONFIG_USW_MC }} + env: # (Used when cluster does not match the edge environment) + MCL_KUBECONFIG: ${{ env.KUBERNETES_CONFIG_USW_MC }} # Alert via Discord - name: Discord Alert if: always() @@ -41,4 +41,4 @@ jobs: status: ${{ job.status }} channel: deployments header: DEPLOY MC - additional-content: "Minecluster Server Manager Deployment" \ No newline at end of file + additional-content: "Minecluster Server Manager Deployment"