Commit 0bb8a3bd authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

feat: skip GCP ADC authent when GCP_JWT is not present

Don't set GCP ADC authent when GCP_JWT is not present to preserve gitlab-ci-local with local GCP authentication
parent f946c04e
Loading
Loading
Loading
Loading
+38 −34
Original line number Diff line number Diff line
@@ -52,9 +52,11 @@ variables:
  GCP_PROD_OIDC_PROVIDER: $[[ inputs.gcp-prod-oidc-provider ]]

.helm-gcp-adc:
  - echo "Installing GCP authentication with env GOOGLE_APPLICATION_CREDENTIALS file"
  - echo $GCP_JWT > "$CI_BUILDS_DIR/.auth_token.jwt"
  - |-
  - |
    if [[ "$GCP_JWT" ]]
    then
      echo "Installing GCP authentication with env GOOGLE_APPLICATION_CREDENTIALS file"
      echo $GCP_JWT > "$CI_BUILDS_DIR/.auth_token.jwt"
      if [[ "$ENV_TYPE" ]]
      then
        case "$ENV_TYPE" in
@@ -74,7 +76,6 @@ variables:
      fi
      oidc_provider="${env_oidc_provider:-$GCP_OIDC_PROVIDER}"
      oidc_account="${env_oidc_account:-$GCP_OIDC_ACCOUNT}"
  - |-
      cat << EOF > "$CI_BUILDS_DIR/google_application_credentials.json"
      {
        "type": "external_account",
@@ -87,7 +88,10 @@ variables:
        "service_account_impersonation_url": "https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/${oidc_account}:generateAccessToken"
      }
    EOF
  - export GOOGLE_APPLICATION_CREDENTIALS="$CI_BUILDS_DIR/google_application_credentials.json"
      export GOOGLE_APPLICATION_CREDENTIALS="$CI_BUILDS_DIR/google_application_credentials.json"
    else
      echo '[WARN] $GCP_JWT is not set: cannot setup Application Default Credentials (ADC) authentication'
    fi

.helm-deploy:
  before_script: