From 4012475d47cd4b018cb201e156dc3a89c24b9551 Mon Sep 17 00:00:00 2001 From: matttrach Date: Wed, 15 Oct 2025 18:00:46 -0500 Subject: [PATCH 1/2] fix: null provider is no longer necessary Signed-off-by: matttrach --- examples/downstream/versions.tf | 4 --- examples/downstream_splitrole/versions.tf | 4 --- examples/one/versions.tf | 4 --- examples/prod/versions.tf | 4 --- examples/three/modules/tls/main.tf | 30 ------------------- examples/three/versions.tf | 4 +++ modules/cluster/versions.tf | 2 +- modules/deploy/versions.tf | 2 +- .../configured/versions.tf | 4 --- .../unconfigured/versions.tf | 12 -------- modules/install_cert_manager/versions.tf | 10 +++---- 11 files changed, 11 insertions(+), 69 deletions(-) diff --git a/examples/downstream/versions.tf b/examples/downstream/versions.tf index 60809f7..9e16940 100644 --- a/examples/downstream/versions.tf +++ b/examples/downstream/versions.tf @@ -17,10 +17,6 @@ terraform { source = "hashicorp/http" version = ">= 3.4" } - null = { - source = "hashicorp/null" - version = ">= 3" - } tls = { source = "hashicorp/tls" version = ">= 4.0" diff --git a/examples/downstream_splitrole/versions.tf b/examples/downstream_splitrole/versions.tf index 60809f7..9e16940 100644 --- a/examples/downstream_splitrole/versions.tf +++ b/examples/downstream_splitrole/versions.tf @@ -17,10 +17,6 @@ terraform { source = "hashicorp/http" version = ">= 3.4" } - null = { - source = "hashicorp/null" - version = ">= 3" - } tls = { source = "hashicorp/tls" version = ">= 4.0" diff --git a/examples/one/versions.tf b/examples/one/versions.tf index 60809f7..9e16940 100644 --- a/examples/one/versions.tf +++ b/examples/one/versions.tf @@ -17,10 +17,6 @@ terraform { source = "hashicorp/http" version = ">= 3.4" } - null = { - source = "hashicorp/null" - version = ">= 3" - } tls = { source = "hashicorp/tls" version = ">= 4.0" diff --git a/examples/prod/versions.tf b/examples/prod/versions.tf index 60809f7..9e16940 100644 --- a/examples/prod/versions.tf +++ b/examples/prod/versions.tf @@ -17,10 +17,6 @@ terraform { source = "hashicorp/http" version = ">= 3.4" } - null = { - source = "hashicorp/null" - version = ">= 3" - } tls = { source = "hashicorp/tls" version = ">= 4.0" diff --git a/examples/three/modules/tls/main.tf b/examples/three/modules/tls/main.tf index 5f6ce6d..14669c1 100644 --- a/examples/three/modules/tls/main.tf +++ b/examples/three/modules/tls/main.tf @@ -25,36 +25,6 @@ resource "tls_self_signed_cert" "ca_cert" { ] } -# // Intermediate CA -# resource "tls_private_key" "intermediate_key" { -# algorithm = "RSA" -# rsa_bits = 2048 -# } - -# resource "tls_cert_request" "intermediate_csr" { -# private_key_pem = tls_private_key.intermediate_key.private_key_pem - -# subject { -# common_name = "Example Intermediate CA" -# organization = "Example" -# } -# } - -# resource "tls_locally_signed_cert" "intermediate_cert" { -# cert_request_pem = tls_cert_request.intermediate_csr.cert_request_pem - -# ca_private_key_pem = tls_private_key.ca_key.private_key_pem -# ca_cert_pem = tls_self_signed_cert.ca_cert.cert_pem - -# validity_period_hours = 8760 -# is_ca_certificate = true - -# allowed_uses = [ -# "cert_signing", -# "crl_signing", -# ] -# } - // TLS Certificate resource "tls_private_key" "tls_key" { algorithm = "RSA" diff --git a/examples/three/versions.tf b/examples/three/versions.tf index 98af46d..59242b2 100644 --- a/examples/three/versions.tf +++ b/examples/three/versions.tf @@ -49,5 +49,9 @@ terraform { source = "hashicorp/kubernetes" version = ">= 2.31.0" } + time = { + source = "hashicorp/time" + version = ">= 0.12.0" + } } } diff --git a/modules/cluster/versions.tf b/modules/cluster/versions.tf index 46fd573..1af98b2 100644 --- a/modules/cluster/versions.tf +++ b/modules/cluster/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { file = { source = "rancher/file" - version = ">= 1.1" + version = ">= 2.5" } random = { source = "hashicorp/random" diff --git a/modules/deploy/versions.tf b/modules/deploy/versions.tf index 2e06979..681d999 100644 --- a/modules/deploy/versions.tf +++ b/modules/deploy/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { file = { source = "rancher/file" - version = ">= 1.1.0" + version = ">= 2.5" } } } diff --git a/modules/install_cert_manager/configured/versions.tf b/modules/install_cert_manager/configured/versions.tf index 0ff3c60..9396f40 100644 --- a/modules/install_cert_manager/configured/versions.tf +++ b/modules/install_cert_manager/configured/versions.tf @@ -5,10 +5,6 @@ terraform { source = "hashicorp/helm" version = "2.14" } - kubernetes = { - source = "hashicorp/kubernetes" - version = ">= 2.32.0" - } time = { source = "hashicorp/time" version = ">= 0.12.0" diff --git a/modules/install_cert_manager/unconfigured/versions.tf b/modules/install_cert_manager/unconfigured/versions.tf index ce06c24..9396f40 100644 --- a/modules/install_cert_manager/unconfigured/versions.tf +++ b/modules/install_cert_manager/unconfigured/versions.tf @@ -5,18 +5,6 @@ terraform { source = "hashicorp/helm" version = "2.14" } - aws = { - source = "hashicorp/aws" - version = ">= 5.11" - } - kubernetes = { - source = "hashicorp/kubernetes" - version = ">= 2.31.0" - } - local = { - source = "hashicorp/local" - version = ">= 2.5" - } time = { source = "hashicorp/time" version = ">= 0.12.0" diff --git a/modules/install_cert_manager/versions.tf b/modules/install_cert_manager/versions.tf index 8eb53dc..fb81d59 100644 --- a/modules/install_cert_manager/versions.tf +++ b/modules/install_cert_manager/versions.tf @@ -5,21 +5,21 @@ terraform { source = "hashicorp/helm" version = "2.14" } - kubernetes = { - source = "hashicorp/kubernetes" - version = ">= 2.31.0" - } time = { source = "hashicorp/time" version = ">= 0.12.0" } + kubernetes = { + source = "hashicorp/kubernetes" + version = ">= 2.31.0" + } aws = { source = "hashicorp/aws" version = ">= 5.11" } file = { source = "rancher/file" - version = ">= 2.0.0" + version = ">= 2.5" } } } From ec221b9fe2c0bc38431731b2368df15e9571327a Mon Sep 17 00:00:00 2001 From: matttrach Date: Wed, 15 Oct 2025 18:13:18 -0500 Subject: [PATCH 2/2] fix: rancher file is on 2.2 Signed-off-by: matttrach --- examples/downstream/versions.tf | 4 ++++ examples/downstream_splitrole/versions.tf | 4 ++++ examples/one/versions.tf | 4 ++++ examples/prod/versions.tf | 4 ++++ examples/three/versions.tf | 6 +++--- modules/cluster/versions.tf | 2 +- modules/deploy/versions.tf | 2 +- modules/install_cert_manager/versions.tf | 2 +- modules/rancher_bootstrap/versions.tf | 2 +- versions.tf | 10 +++------- 10 files changed, 26 insertions(+), 14 deletions(-) diff --git a/examples/downstream/versions.tf b/examples/downstream/versions.tf index 9e16940..eaad710 100644 --- a/examples/downstream/versions.tf +++ b/examples/downstream/versions.tf @@ -1,6 +1,10 @@ terraform { required_version = ">= 1.5.0" required_providers { + file = { + source = "rancher/file" + version = ">= 2.2" + } random = { source = "hashicorp/random" version = ">= 3.5.1" diff --git a/examples/downstream_splitrole/versions.tf b/examples/downstream_splitrole/versions.tf index 9e16940..eaad710 100644 --- a/examples/downstream_splitrole/versions.tf +++ b/examples/downstream_splitrole/versions.tf @@ -1,6 +1,10 @@ terraform { required_version = ">= 1.5.0" required_providers { + file = { + source = "rancher/file" + version = ">= 2.2" + } random = { source = "hashicorp/random" version = ">= 3.5.1" diff --git a/examples/one/versions.tf b/examples/one/versions.tf index 9e16940..eaad710 100644 --- a/examples/one/versions.tf +++ b/examples/one/versions.tf @@ -1,6 +1,10 @@ terraform { required_version = ">= 1.5.0" required_providers { + file = { + source = "rancher/file" + version = ">= 2.2" + } random = { source = "hashicorp/random" version = ">= 3.5.1" diff --git a/examples/prod/versions.tf b/examples/prod/versions.tf index 9e16940..eaad710 100644 --- a/examples/prod/versions.tf +++ b/examples/prod/versions.tf @@ -1,6 +1,10 @@ terraform { required_version = ">= 1.5.0" required_providers { + file = { + source = "rancher/file" + version = ">= 2.2" + } random = { source = "hashicorp/random" version = ">= 3.5.1" diff --git a/examples/three/versions.tf b/examples/three/versions.tf index 59242b2..4eb3947 100644 --- a/examples/three/versions.tf +++ b/examples/three/versions.tf @@ -1,9 +1,9 @@ terraform { required_version = ">= 1.5.0" required_providers { - local = { - source = "hashicorp/local" - version = ">= 2.5" + file = { + source = "rancher/file" + version = ">= 2.2" } random = { source = "hashicorp/random" diff --git a/modules/cluster/versions.tf b/modules/cluster/versions.tf index 1af98b2..46650f4 100644 --- a/modules/cluster/versions.tf +++ b/modules/cluster/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { file = { source = "rancher/file" - version = ">= 2.5" + version = ">= 2.2" } random = { source = "hashicorp/random" diff --git a/modules/deploy/versions.tf b/modules/deploy/versions.tf index 681d999..e44cd41 100644 --- a/modules/deploy/versions.tf +++ b/modules/deploy/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { file = { source = "rancher/file" - version = ">= 2.5" + version = ">= 2.2" } } } diff --git a/modules/install_cert_manager/versions.tf b/modules/install_cert_manager/versions.tf index fb81d59..ea749af 100644 --- a/modules/install_cert_manager/versions.tf +++ b/modules/install_cert_manager/versions.tf @@ -19,7 +19,7 @@ terraform { } file = { source = "rancher/file" - version = ">= 2.5" + version = ">= 2.2" } } } diff --git a/modules/rancher_bootstrap/versions.tf b/modules/rancher_bootstrap/versions.tf index a44fb2f..113008a 100644 --- a/modules/rancher_bootstrap/versions.tf +++ b/modules/rancher_bootstrap/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { file = { source = "rancher/file" - version = ">= 2.0.0" + version = ">= 2.2.0" } helm = { source = "hashicorp/helm" diff --git a/versions.tf b/versions.tf index 59242b2..9434f99 100644 --- a/versions.tf +++ b/versions.tf @@ -1,9 +1,9 @@ terraform { required_version = ">= 1.5.0" required_providers { - local = { - source = "hashicorp/local" - version = ">= 2.5" + file = { + source = "rancher/file" + version = ">= 2.2" } random = { source = "hashicorp/random" @@ -21,10 +21,6 @@ terraform { source = "hashicorp/http" version = ">= 3.4" } - null = { - source = "hashicorp/null" - version = ">= 3" - } tls = { source = "hashicorp/tls" version = ">= 4.0"