Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions bootstrap/main.tf
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
provider "google" {
default_labels = var.default_labels
user_project_override = true
}

resource "google_project" "stacklet_relay" {
count = var.create_project ? 1 : 0
name = var.project_name
Expand Down
6 changes: 0 additions & 6 deletions bootstrap/vars.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
variable "default_labels" {
type = map(string)
default = {}
description = "Labels to be applied to created resources"
}

variable "create_project" {
type = bool
default = true
Expand Down
18 changes: 13 additions & 5 deletions provider.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
provider "google" {
project = var.project_id
billing_project = var.project_id
user_project_override = true
default_labels = var.default_labels
terraform {
required_version = ">= 1.0"

required_providers {
google = {
source = "hashicorp/google"
version = "~> 7.0"
}
archive = {
source = "hashicorp/archive"
version = "~> 2.0"
}
}
}
6 changes: 0 additions & 6 deletions vars.tf
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ variable "audit_log_include_children" {
#
# Additional variables
#
variable "default_labels" {
type = map(string)
default = {}
description = "Labels to be applied to created resources"
}

variable "prefix" {
type = string
default = ""
Expand Down