diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8080bdadaec4ba33f90918c78531b8f63729e93..ebc7dfab09c67e92cef9083a590d48a4e74ef3ea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,10 +29,10 @@ check-gke: TF_VAR_region: $GCP_REGION TF_VAR_vpc_network_name: $GCP_NETWORK_NAME TF_VAR_vpc_subnetwork_name: $GCP_SUBNETWORK_NAME - GCP_SA_GITLAB: $GCP_SA_GITLAB + GCP_SA: $GCP_SA script: |- cd $TF_ROOT_GKE - echo $GCP_SA_GITLAB > gcp-sa.json + echo $GCP_SA > gcp-sa.json gitlab-terraform init gitlab-terraform validate gitlab-terraform fmt -check @@ -61,10 +61,10 @@ apply-gke: TF_VAR_region: $GCP_REGION TF_VAR_vpc_network_name: $GCP_NETWORK_NAME TF_VAR_vpc_subnetwork_name: $GCP_SUBNETWORK_NAME - GCP_SA_GITLAB: $GCP_SA_GITLAB + GCP_SA: $GCP_SA script: |- cd $TF_ROOT_GKE - echo $GCP_SA_GITLAB > gcp-sa.json + echo $GCP_SA > gcp-sa.json gitlab-terraform init gitlab-terraform apply -auto-approve @@ -79,7 +79,7 @@ gcloud-psc: entrypoint: [""] variables: GCP_PROJECT_ID: $GCP_PROJECT_ID - GCP_SA_GITLAB: $GCP_SA_GITLAB + GCP_SA: $GCP_SA GCP_REGION: $GCP_REGION GCP_NETWORK_NAME: $GCP_NETWORK_NAME GCP_SUBNETWORK_NAME: $GCP_SUBNETWORK_NAME @@ -89,7 +89,7 @@ gcloud-psc: EC_SERVICE_ATTACHMENT_URI: $EC_SERVICE_ATTACHMENT_URI EC_DNS_ZONE: $EC_DNS_ZONE script: |- - echo $GCP_SA_GITLAB > gcp-sa.json + echo $GCP_SA > gcp-sa.json gcloud auth activate-service-account --key-file gcp-sa.json echo "Activate Service Account: OK" gcloud config set project $GCP_PROJECT_ID