Skip to content

Commit

Permalink
upgrade terraform to 1.6.3 and google 5.4.0
Browse files Browse the repository at this point in the history 
Signed-off-by: Bob Callaway <[email protected]>
  • Loading branch information
@bobcallaway
bobcallaway committed Nov 4, 2023
1 parent 9184e36 commit 49cbf4f
Show file tree
Hide file tree
Showing 41 changed files with 155 additions and 247 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,11 @@ updates:
directory: "/"
schedule:
interval: weekly
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
4 changes: 2 additions & 2 deletions .github/workflows/terraform.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.0
with:
# TODO: extract terraform from the tf file when we have pinned
terraform_version: 1.3.9
terraform_version: 1.6.3

- name: Terraform fmt
id: fmt
Expand All @@ -46,7 +46,7 @@ jobs:
- uses: hashicorp/setup-terraform@633666f66e0061ca3b725c73b2ec20cd13a8fdd1 # v2.0.0
with:
# TODO: extract terraform from the tf file when we have pinned
terraform_version: 1.3.9
terraform_version: 1.6.3

- name: Terraform init
id: init
Expand Down
8 changes: 2 additions & 6 deletions terraform/gcp/modules/audit/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
}
}
10 changes: 3 additions & 7 deletions terraform/gcp/modules/bastion/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,15 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
version = "3.5.1"
source = "hashicorp/random"
}
}
Expand Down
12 changes: 2 additions & 10 deletions terraform/gcp/modules/ca/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
source = "hashicorp/random"
}
}
}
12 changes: 2 additions & 10 deletions terraform/gcp/modules/ctlog/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
source = "hashicorp/random"
}
}
}
12 changes: 2 additions & 10 deletions terraform/gcp/modules/dex/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
source = "hashicorp/random"
}
}
}
12 changes: 2 additions & 10 deletions terraform/gcp/modules/fulcio/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.26.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
source = "hashicorp/random"
}
}
}
8 changes: 4 additions & 4 deletions terraform/gcp/modules/gke_cluster/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
version = "3.5.1"
source = "hashicorp/random"
}
}
Expand Down
1 change: 1 addition & 0 deletions terraform/gcp/modules/monitoring/dex/slo.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module "slos" {
count = var.create_slos ? 1 : 0

project_id = var.project_id
project_number = var.project_number
service_id = "dex"
display_name = "Dex"
resource_name = format("//container.googleapis.com/projects/%s/locations/%s/clusters/%s/k8s/namespaces/%s", var.project_id, var.cluster_location, var.cluster_name, var.gke_namespace)
Expand Down
9 changes: 9 additions & 0 deletions terraform/gcp/modules/monitoring/dex/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ variable "project_id" {
}
}

variable "project_number" {
type = string
default = ""
validation {
condition = length(var.project_number) > 0
error_message = "Must specify PROJECT_NUMBER variable."
}
}

variable "cluster_location" {
type = string
description = "Zone or Region to create cluster in."
Expand Down
12 changes: 2 additions & 10 deletions terraform/gcp/modules/monitoring/dex/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
source = "hashicorp/random"
}
}
}
2 changes: 2 additions & 0 deletions terraform/gcp/modules/monitoring/fulcio/slo.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module "slos" {
count = var.create_slos ? 1 : 0

project_id = var.project_id
project_number = var.project_number
service_id = "fulcio"
display_name = "Fulcio"
resource_name = format("//container.googleapis.com/projects/%s/locations/%s/clusters/%s/k8s/namespaces/%s", var.project_id, var.cluster_location, var.cluster_name, var.gke_namespace)
Expand Down Expand Up @@ -110,6 +111,7 @@ module "ctlog_slos" {
count = var.create_slos ? 1 : 0

project_id = var.project_id
project_number = var.project_number
service_id = "ctlog"
display_name = "CT Log"
resource_name = format("//container.googleapis.com/projects/%s/locations/%s/clusters/%s/k8s/namespaces/%s", var.project_id, var.cluster_location, var.cluster_name, var.ctlog_gke_namespace)
Expand Down
9 changes: 9 additions & 0 deletions terraform/gcp/modules/monitoring/fulcio/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ variable "project_id" {
}
}

variable "project_number" {
type = string
default = ""
validation {
condition = length(var.project_number) > 0
error_message = "Must specify PROJECT_NUMBER variable."
}
}

variable "cluster_location" {
description = "Zone or Region to create cluster in."
type = string
Expand Down
12 changes: 2 additions & 10 deletions terraform/gcp/modules/monitoring/fulcio/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
source = "hashicorp/random"
}
}
}
12 changes: 2 additions & 10 deletions terraform/gcp/modules/monitoring/infra/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
source = "hashicorp/random"
}
}
}
12 changes: 2 additions & 10 deletions terraform/gcp/modules/monitoring/prober/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
source = "hashicorp/random"
}
}
}
1 change: 1 addition & 0 deletions terraform/gcp/modules/monitoring/rekor/slo.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module "slos" {
count = var.create_slos ? 1 : 0

project_id = var.project_id
project_number = var.project_number
service_id = "rekor"
display_name = "Rekor"
resource_name = format("//container.googleapis.com/projects/%s/locations/%s/clusters/%s/k8s/namespaces/%s", var.project_id, var.cluster_location, var.cluster_name, var.gke_namespace)
Expand Down
9 changes: 9 additions & 0 deletions terraform/gcp/modules/monitoring/rekor/variables.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ variable "project_id" {
}
}

variable "project_number" {
type = string
default = ""
validation {
condition = length(var.project_number) > 0
error_message = "Must specify PROJECT_NUMBER variable."
}
}

variable "cluster_location" {
description = "Zone or Region to create cluster in."
type = string
Expand Down
12 changes: 2 additions & 10 deletions terraform/gcp/modules/monitoring/rekor/versions.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,12 @@
*/

terraform {
required_version = ">= 1.1.3, < 1.4.0"
required_version = "1.6.3"

required_providers {
google = {
version = ">= 4.11.0, < 4.38.0"
version = "5.4.0"
source = "hashicorp/google"
}
google-beta = {
version = ">= 4.11.0, < 4.38.0"
source = "hashicorp/google-beta"
}
random = {
version = ">= 3.1.0, < 3.2.0"
source = "hashicorp/random"
}
}
}
Loading

0 comments on commit 49cbf4f

Please sign in to comment.