Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade terraform to 1.6.3 and google 5.4.0 #815

Merged
merged 3 commits into from
Nov 5, 2023
Merged

upgrade terraform to 1.6.3 and google 5.4.0 #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
49cbf4f
upgrade terraform to 1.6.3 and google 5.4.0
bobcallaway Nov 4, 2023
51d0fa3
fix fmt issue
bobcallaway Nov 4, 2023
319c58a
enumerate all modules for dependabot
bobcallaway Nov 4, 2023
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
209 changes: 209 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,212 @@ updates:
directory: "/"
schedule:
interval: weekly

- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/argocd"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/audit"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/bastion"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/ca"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/ctlog"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/dex"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/external_secrets"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/fulcio"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/gke_cluster"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/monitoring"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/monitoring/dex"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/monitoring/fulcio"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/monitoring/infra"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/monitoring/prober"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/monitoring/rekor"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/monitoring/slo"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/mysql-shard"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/mysql"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/network"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/oslogin"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/project_roles"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/redis"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/rekor"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/sigstore"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/timestamp"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
- package-ecosystem: "terraform"
directory: "/terraform/gcp/modules/tuf"
schedule:
interval: weekly
groups:
terraform:
patterns:
- "*"
4 changes: 2 additions & 2 deletions .github/workflows/terraform.yml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading
Loading