Commit dc3d1f68 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/kubernetes!90
parents 0705d3cc 8a3c7277

templates/gitlab-ci-k8s-gcp.yml

+39 −40
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ variables: 
  

  K8S_KUBECTL_IMAGE: $[[ inputs.kubectl-image ]]



.gcp-provider-auth:

  before_script:

.k8s-gcp-adc:

  - echo "Installing GCP authentication with env GOOGLE_APPLICATION_CREDENTIALS file"

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

  - |-
@@ -101,7 +100,7 @@ variables: 
      aud: "$GCP_OIDC_AUD"

  before_script:

    - !reference [.k8s-scripts]

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

    - !reference [.k8s-gcp-adc]

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

    - k8s_login
@@ -111,6 +110,6 @@ variables: 
      aud: "$GCP_OIDC_AUD"

  before_script:

    - !reference [.k8s-scripts]

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

    - !reference [.k8s-gcp-adc]

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

    - k8s_login
 
 No newline at end of file