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.

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

Revert "Bump the terraform group across 27 directories with 2 updates" #1273

Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/terraform.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ jobs:
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v2.0.0
with:
# TODO: extract terraform from the tf file when we have pinned
terraform_version: 1.9.5
terraform_version: 1.9.4

- name: Terraform fmt
id: fmt
@@ -46,7 +46,7 @@ jobs:
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v2.0.0
with:
# TODO: extract terraform from the tf file when we have pinned
terraform_version: 1.9.5
terraform_version: 1.9.4

- name: Terraform init
id: init
4 changes: 2 additions & 2 deletions terraform/gcp/modules/argocd/versions.tf
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
kubectl = {
@@ -24,7 +24,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
version = "2.15.0"
version = "2.14.1"
}
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/audit/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/bastion/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
random = {
4 changes: 2 additions & 2 deletions terraform/gcp/modules/ca/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/ctlog/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/dex/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
6 changes: 3 additions & 3 deletions terraform/gcp/modules/external_secrets/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
kubectl = {
@@ -28,7 +28,7 @@ terraform {
}
helm = {
source = "hashicorp/helm"
version = "2.15.0"
version = "2.14.1"
}
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/fulcio/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
6 changes: 3 additions & 3 deletions terraform/gcp/modules/gke_cluster/versions.tf
Original file line number Diff line number Diff line change
@@ -15,15 +15,15 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
google-beta = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google-beta"
}
random = {
4 changes: 2 additions & 2 deletions terraform/gcp/modules/monitoring/dex/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/monitoring/fulcio/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/monitoring/infra/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/monitoring/prober/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/monitoring/rekor/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/monitoring/slo/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/monitoring/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
2 changes: 2 additions & 0 deletions terraform/gcp/modules/mysql-shard/mysql.tf
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ resource "google_sql_database_instance" "trillian" {
ip_configuration {
ipv4_enabled = var.ipv4_enabled
private_network = var.network
require_ssl = var.require_ssl
ssl_mode = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
}

@@ -79,6 +80,7 @@ resource "google_sql_database_instance" "read_replica" {
ip_configuration {
ipv4_enabled = var.ipv4_enabled
private_network = var.network
require_ssl = var.require_ssl
ssl_mode = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
}

4 changes: 2 additions & 2 deletions terraform/gcp/modules/mysql-shard/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
2 changes: 2 additions & 0 deletions terraform/gcp/modules/mysql/mysql.tf
Original file line number Diff line number Diff line change
@@ -125,6 +125,7 @@ resource "google_sql_database_instance" "sigstore" {
ip_configuration {
ipv4_enabled = var.ipv4_enabled
private_network = var.network
require_ssl = var.require_ssl
ssl_mode = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
}

@@ -172,6 +173,7 @@ resource "google_sql_database_instance" "read_replica" {
ip_configuration {
ipv4_enabled = var.ipv4_enabled
private_network = var.network
require_ssl = var.require_ssl
ssl_mode = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
}

4 changes: 2 additions & 2 deletions terraform/gcp/modules/mysql/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
random = {
4 changes: 2 additions & 2 deletions terraform/gcp/modules/network/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/oslogin/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/project_roles/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
4 changes: 2 additions & 2 deletions terraform/gcp/modules/redis/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
random = {
4 changes: 2 additions & 2 deletions terraform/gcp/modules/rekor/versions.tf
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@
*/

terraform {
required_version = "1.9.5"
required_version = "1.9.4"

required_providers {
google = {
version = "6.2.0"
version = "5.40.0"
source = "hashicorp/google"
}
}
Loading