Commit 6732ff69 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'fix/gcp-variant' into 'master' 

fix(gcp): reduce scope of GCP App Default Creds script to template

See merge request to-be-continuous/helm!101
parents c64e99e7 908f95dd

templates/gitlab-ci-helm-gcp.yml

+38 −39
Original line number Diff line number Diff line
@@ -51,8 +51,7 @@ variables: 
  GCP_PROD_OIDC_ACCOUNT: $[[ inputs.gcp-prod-oidc-account ]]

  GCP_PROD_OIDC_PROVIDER: $[[ inputs.gcp-prod-oidc-provider ]]



.gcp-provider-auth:

  before_script:

.helm-gcp-adc:

  - echo "Installing GCP authentication with env GOOGLE_APPLICATION_CREDENTIALS file"

  - echo $GCP_JWT > "$CI_BUILDS_DIR/.auth_token.jwt"

  - |-
@@ -93,7 +92,7 @@ variables: 
.helm-deploy:

  before_script:

    - !reference [.helm-scripts]

    - !reference [.gcp-provider-auth, before_script]

    - !reference [.helm-gcp-adc]

    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"

    - add_helm_repositories

    - setup_kubeconfig