Changes to resolve error in creating gcloud-e2e-test-cluster

googleforgames · Mar 23, 2023 · 2c6f5b7 · 2c6f5b7
1 parent 5ddbe60
commit 2c6f5b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build/includes/google-cloud.mk b/build/includes/google-cloud.mk
@@ -50,6 +50,7 @@ clean-gcloud-test-cluster: $(ensure-build-image)
 
 gcloud-e2e-infra-state-bucket: GCP_PROJECT ?= $(shell $(current_project))
 gcloud-e2e-infra-state-bucket:
+	$(MAKE) terraform-init DIRECTORY=e2e/state-bucket
 	docker run --rm -it $(common_mounts) $(build_tag) bash -c 'cd $(mount_path)/build/terraform/e2e/state-bucket && \
       	terraform apply -auto-approve -var project="$(GCP_PROJECT)"'
 
@@ -88,4 +89,4 @@ gcloud-auth-docker: $(ensure-build-image)
 
 # Clean the gcloud configuration
 clean-gcloud-config:
-	-sudo rm -r $(build_path)/.config
+	-sudo rm -r $(build_path)/.config
diff --git a/build/includes/terraform.mk b/build/includes/terraform.mk
@@ -23,7 +23,7 @@ terraform-init: TERRAFORM_BUILD_DIR ?= $(mount_path)/build/terraform/$(DIRECTORY
 terraform-init: $(ensure-build-image)
 terraform-init:
 	docker run --rm -it $(common_mounts) $(DOCKER_RUN_ARGS) $(build_tag) bash -c '\
-	cd $(TERRAFORM_BUILD_DIR) && terraform init -backend-config="bucket=$(BUCKET)" -backend-config="prefix=$(PREFIX)" && gcloud auth application-default login'
+	cd $(TERRAFORM_BUILD_DIR) && terraform init -reconfigure -backend-config="bucket=$(BUCKET)" -backend-config="prefix=$(PREFIX)" && gcloud auth application-default login'
 
 terraform-clean: TERRAFORM_BUILD_DIR ?= $(mount_path)/build/terraform/gke
 terraform-clean: