Skip to content

Commit

Permalink
tfvars generation, adjust provider credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
kinfinity committed Mar 5, 2024
1 parent be40d2d commit f28de81
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions ci/scripts/generate_tfvars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -eu
USAGE="USAGE:
${0} <terraform-env-directory> <project-id> <env-name>"

if [[ $# < 4 ]]; then
if [[ $# -ne 3 ]]; then
echo "${USAGE}" >&2
exit 1
fi
Expand All @@ -20,8 +20,8 @@ cat > variables.tfvars << EOF
main_region = "us-central1"
gke_name = "cohere-main-gke"
gke_node_count = 2
project_id = ${2}
env_name = ${3}
project_id = "${2}"
env_name = "${3}"
network = "default"
subnetwork = "default"
EOF
2 changes: 1 addition & 1 deletion terraform/environments/dev/provider.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
provider "google" {
project = var.project_id
region = var.main_region
credentials = "${file(var.credentials_path)}"
# credentials = "${file(var.credentials_path)}"
}
2 changes: 1 addition & 1 deletion terraform/environments/dev/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ variable "project_id"{}
variable "env_name" {}
variable "network"{}
variable "subnetwork" {}
variable "credentials_path" {}
# variable "credentials_path" {}

0 comments on commit f28de81

Please sign in to comment.