diff --git a/action.yml b/action.yml index 52243b6..73b84af 100644 --- a/action.yml +++ b/action.yml @@ -45,15 +45,15 @@ runs: - name: Configure Kubeconfig shell: bash run: | - if [ ${{ inputs.deploy-env }} == "edge" && -z ${{ inputs.kubeconfig }} ]; then + if [ -n ${{ inputs.kubeconfig }} ]; then + echo "Using Provided Kubernetes Config" + echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV + elif [ ${{ inputs.deploy-env }} == "edge" ]; then echo "Using Edge Kubernetes Config" echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_EDGE}} >> $GITHUB_ENV - elif [ ${{ inputs.deploy-env }} == "ci" && -z ${{ inputs.kubeconfig }} ]; then + elif [ ${{ inputs.deploy-env }} == "ci" ]; then echo "Using Dev Kubernetes Config" echo OASIS_WORKFLOW_KUBECONFIG=${{env.KUBERNETES_CONFIG_USW_DEV}} >> $GITHUB_ENV - elif [ -n ${{ inputs.kubeconfig }} ]; then - echo "Using Provided Kubernetes Config" - echo OASIS_WORKFLOW_KUBECONFIG=${{ inputs.kubeconfig }} >> $GITHUB_ENV else echo "Error! deploy-env required, and must be 'ci' or 'edge'!" exit 1