From affef6666c58a75e7f0d75fe1cf6b9743e8dd52c Mon Sep 17 00:00:00 2001 From: Andreas Salhus Bakseter <141913422+baksetercx@users.noreply.github.com> Date: Wed, 30 Oct 2024 15:14:57 +0100 Subject: [PATCH] Add new skip-inputs & bump CLI (#148) --- build/action.yml | 2 +- deploy/action.yml | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build/action.yml b/build/action.yml index 160cc9f..735b085 100644 --- a/build/action.yml +++ b/build/action.yml @@ -191,7 +191,7 @@ runs: - name: Install 3lv CLI uses: 3lvia/cli/setup@trunk with: - version: '0.14.4' # TODO: remove this (which will get latest version) when 3lv CLI is stable + version: '0.15.0' # TODO: remove this (which will get latest version) when 3lv CLI is stable - name: Handle deprecated inputs shell: bash diff --git a/deploy/action.yml b/deploy/action.yml index 94d9c6c..aa6e9b8 100644 --- a/deploy/action.yml +++ b/deploy/action.yml @@ -38,6 +38,14 @@ inputs: description: 'If `true`, the action will skip authentication with the cloud provider.' required: false default: 'false' + skip-setup-gke-auth-plugin: + description: 'If `true`, the action will skip setting up the Google Cloud SDK and GKE auth plugin.' + required: false + default: 'false' + skip-getting-credentials: + description: 'If `true`, the action will skip getting credentials from the cloud provider for the Kubernetes cluster.' + required: false + default: 'false' AZURE_CLIENT_ID: description: 'Client ID of a service principal that has access to AKS. Only required for deploying to AKS.' required: false @@ -124,7 +132,7 @@ runs: - name: Setup Google Cloud CLI with GKE auth plugin if not on Elvia runner uses: google-github-actions/setup-gcloud@v2.1.1 - if: ${{ inputs.runtime-cloud-provider == 'GKE' && !startsWith(runner.name, 'elvia-runner-') }} + if: ${{ inputs.runtime-cloud-provider == 'GKE' && (!startsWith(runner.name, 'elvia-runner-') && inputs.skip-setup-gke-auth-plugin == 'false') }} with: install_components: 'gke-gcloud-auth-plugin' @@ -143,7 +151,7 @@ runs: - name: Install 3lv CLI uses: 3lvia/cli/setup@trunk with: - version: '0.14.4' # TODO: remove this (which will get latest version) when 3lv CLI is stable + version: '0.15.0' # TODO: remove this (which will get latest version) when 3lv CLI is stable - name: Deploy shell: bash @@ -171,6 +179,8 @@ runs: 3LV_GKE_CLUSTER_NAME: ${{ inputs.GKE_CLUSTER_NAME }} 3LV_GKE_CLUSTER_LOCATION: ${{ inputs.GKE_CLUSTER_LOCATION }} 3LV_GKE_USE_INTERNAL_IP: ${{ inputs.GKE_USE_INTERNAL_IP }} + 3LV_SKIP_AUTHENTICATION: ${{ inputs.skip-authentication }} + 3LV_SKIP_GETTING_CREDENTIALS: ${{ inputs.skip-getting-credentials }} - name: Notify Slack on failure if: ${{ failure() && inputs.slack-channel != '' }}