From 9b6ed6cc6ebcc93fc26cb0a999330412ace547ae Mon Sep 17 00:00:00 2001 From: vincent Date: Thu, 9 May 2024 09:14:25 +0200 Subject: [PATCH] switch to opentofu --- terraform/cloud/.terraform.lock.hcl | 38 ++++++++++++++--------------- terraform/dns/.terraform.lock.hcl | 34 ++++++++++++-------------- terraform/makefile | 8 +++--- terraform/vault/.terraform.lock.hcl | 30 +++++++++++------------ 4 files changed, 53 insertions(+), 57 deletions(-) diff --git a/terraform/cloud/.terraform.lock.hcl b/terraform/cloud/.terraform.lock.hcl index c866312..4d98525 100644 --- a/terraform/cloud/.terraform.lock.hcl +++ b/terraform/cloud/.terraform.lock.hcl @@ -1,28 +1,28 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hetznercloud/hcloud" { - version = "1.42.1" +provider "registry.opentofu.org/hetznercloud/hcloud" { + version = "1.47.0" hashes = [ - "h1:1AGk4CAeqdyF1D4vNyjarKSBoN2z+Y6ubUxzqiyc7qI=", - "zh:002e2e57c1425bb4cf620c6a80732ee071726d0d82d0523c5258dde3222113df", - "zh:03213d79fc2bcd94ac812ca22c1d1d6678132ab957d26a65c84ee52853059c02", - "zh:0785429efdb084cb4e5a0d899112764c21d2260391e82897d7e67c9e5deccc31", - "zh:12a5653b7a00f458b65b89b15d4517f785322ebb65b5a689fa8766042a09184c", - "zh:2dc7464290a623eb599cfbf731d13554448a7a824c2b1db16275f482d9059670", - "zh:35a7e19868a304d77ab192871ccaa45418c13a3aac301df8d9f57c1259913051", - "zh:368202d94a1104895c1d566e3f16edd55e05a09881fd4a20cd4854ca3593fee9", - "zh:431503e5055979aabf520675bb465496d934979c7a687e1cd3c8d2ae27bfa649", - "zh:45cede3c2147cfdc76d53853e07395c05b1feff8dca16a2f8f7f1fd151e2449f", - "zh:8b57869af18982af21f6f816e65e6057ec5055481b220147fdbe0959917ae112", - "zh:be9ba4813dcf640c0df04543a3c74b0db117fbd3dcc26140e252cf5157734945", - "zh:d3fb9ca398a153dc894caa94f95ef2e989350cf2bbfa29bc93ff2608cab44c1f", - "zh:fc690be8cbada1e99063ed1c6148f9a70ab341100a97ad2886f4826a951780d3", - "zh:ffa9470e41fa04ac667d4d830987aeed2070767d57f2414692c2dd395a405fba", + "h1:aqEPcSpaWhKqbMs7c7Pf5ot6Tye7ntRitWsuNGPRPfk=", + "zh:0759f0c23d0e59baab3382320eef4eb314e0c5967b6ef67ff07135da07a97b34", + "zh:0e9ca84c4059d6d7e2c9f13d3c2b1cd91f7d9a47bedcb4b80c7c77d536eff887", + "zh:17a033ac4650a39ddacf3265a449edabaea528f81542c4e63e254272d5aac340", + "zh:2997c76a500e42b7519b24fa1f8646d9baab70c68277f80394560d3e1fd06e6d", + "zh:37f3fe7bb34cac63c69123e43e5426bab75816b3665dbe7125276a8d2ee6b2d8", + "zh:45d4b04dc470f24ad96c1c0b6636ea5422c659004f3e472c863bc50130fabf25", + "zh:46df99d972a78af6875565e53a73df66d870c474a20cd90e9e0a3092aa25197f", + "zh:4b5bb8d49366ad895c6c767efe16a1b8143802414abfe3fdb1184cbbecf424eb", + "zh:55c6199eb401c4b0a6c948ceac8b50f352e252e1c985903ed173bf26ad0f109e", + "zh:7b6efe897bffa37248064155a699e67953350b5b9a5476456c0160ce59254557", + "zh:7bc004bcb649ce1ec70e2cf848392e10a1edbcbf11b3292a4cc5c5d49bd769e4", + "zh:e1b17b7595f158fbb3021afa8869b541b5c10bdd2d8d2b2b3eaa82200b104ddd", + "zh:f741ca40e8e99a3e4114ad108ea2b5a5bccbedb008326c7f647f250580e69c0e", + "zh:fae9c7f8d08a447bb0972529f6db06999c35391046320206041a988aeca6b54c", ] } -provider "registry.terraform.io/timohirt/hetznerdns" { +provider "registry.opentofu.org/timohirt/hetznerdns" { version = "2.2.0" hashes = [ "h1:HyskQAglrOueur79gSCBgx9MNDOs0tz39aNYQiFgxz8=", diff --git a/terraform/dns/.terraform.lock.hcl b/terraform/dns/.terraform.lock.hcl index 1a0e319..dcbe63d 100644 --- a/terraform/dns/.terraform.lock.hcl +++ b/terraform/dns/.terraform.lock.hcl @@ -1,26 +1,24 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/vault" { - version = "3.22.0" +provider "registry.opentofu.org/hashicorp/vault" { + version = "4.2.0" hashes = [ - "h1:AyHIjPpd3CMimsJiwRCpi3Jo9SF8MhWkWHj7TjmUyvc=", - "zh:2ebe83a6d3c03c69610899408c3b9fcc6eb7a47e62a5c50126a20244fe2e0e2e", - "zh:46985c7bc1070f4cbb7241063046c165112aed47b0ef3d323197d11525a7c3e1", - "zh:4f3b1cc0eb4990b02a30d366e4c0b77e56e70610f283fb223f60171ab8ba4ee1", - "zh:6b445c90130201f6babb83b3d68969c7fc8936ddb29bd62597782b973a204a67", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:9097ca5bc78c701126c610b34127f58aeeba446ae2e03e94d8a42b4fb7ed6e4c", - "zh:98a81d03a45ada9a10a4d3cfdf4a7c223e5da3251aa0aaa6e24a48cea475903f", - "zh:b878afb67d3aa57413071321cc293cd67ab064fc1d6b3747b8702aef2351327d", - "zh:c546747894fd1ca8108c00bfed8888d0f2cbd60e4bdc2122b1652fb4f0f8b9d4", - "zh:cd6cc39872ed1439897e3f63d4251f31e5758b303ff8f471aac3dff32fb53e54", - "zh:d149c68271db77344b278e7e6c40db5dcf35a83642a60d588fbe72822bb40977", - "zh:fe29e024658c6ae9306c0847469508e835f86c961c998efc298aa1a5b928f72c", + "h1:B2TeJRBRbPqW7qMkazQ4DzY+4++KxYhPRD5nM0RWTos=", + "zh:0c97843a9c4619aa9708c833764448e8db472510785f886772fa798e9f14786e", + "zh:16267cfb01aec8ffe331bbc8558e35c2220951a2d431818c074499c97e7b2ae0", + "zh:2c7c3417b296e45277f7363c248edf9228e1946d528f1870c86d3417cc701b90", + "zh:368d6ec24d2de29964f1570463d8bd4cfda4a67fbccabf3d955007f58b5cf4e9", + "zh:5cdebc223e76765738fc33b5c754fcf152edc4fd80ae47083c561231c7e19bcb", + "zh:8cee20e4845892546eab929ee266882fabf74484ab858a0fd1b967152943ff99", + "zh:9edbb74e8b0b143550f59c6a6b44a9d97c84ab6f230087761eb4e559d1482097", + "zh:b571b643bb671cd4726fe60a2bd558ab1ceb46edad7aca23174b8ceac0c59643", + "zh:c6032c5ec771b964cb36074215808351c1cb9e9d71d6f323a348c60edcde1f4b", + "zh:dcf2b711f08d1dc83082860087fd57f5dcd78c77392cec913a9c8573ab95b26a", ] } -provider "registry.terraform.io/pan-net/powerdns" { +provider "registry.opentofu.org/pan-net/powerdns" { version = "1.5.0" hashes = [ "h1:bsz18KLloevlTZkXwZr8u0sFCZKcOYyts2RaWkV6YNc=", @@ -40,7 +38,7 @@ provider "registry.terraform.io/pan-net/powerdns" { ] } -provider "registry.terraform.io/timohirt/hetznerdns" { +provider "registry.opentofu.org/timohirt/hetznerdns" { version = "2.2.0" hashes = [ "h1:HyskQAglrOueur79gSCBgx9MNDOs0tz39aNYQiFgxz8=", diff --git a/terraform/makefile b/terraform/makefile index dedf534..b63c341 100644 --- a/terraform/makefile +++ b/terraform/makefile @@ -3,14 +3,14 @@ command ?= apply -auto-approve deploy_vault: ifneq (,$(wildcard ~/vaultUnseal/$(env)/rootkey)) - VAULT_TOKEN=$(shell cat ~/vaultUnseal/$(env)/rootkey) terraform -chdir=vault $(command) + VAULT_TOKEN=$(shell cat ~/vaultUnseal/$(env)/rootkey) tofu -chdir=vault $(command) else - terraform -chdir=vault $(command) + tofu -chdir=vault $(command) endif deploy_dns: - TF_VAR_powerDnsApiKey=$(shell vault kv get -field=API_KEY secrets/nomad/pdns) TF_VAR_hetznerApiKey=$(shell vault kv get -field=hdns_token secrets/hetzner) terraform -chdir=dns $(command) + TF_VAR_powerDnsApiKey=$(shell vault kv get -field=API_KEY secrets/nomad/pdns) TF_VAR_hetznerApiKey=$(shell vault kv get -field=hdns_token secrets/hetzner) tofu -chdir=dns $(command) deploy_cloud: - TF_VAR_hetznerApiKey=$(shell vault kv get -field=hdns_token secrets/hetzner) terraform -chdir=cloud $(command) + TF_VAR_hetznerApiKey=$(shell vault kv get -field=hdns_token secrets/hetzner) tofu -chdir=cloud $(command) diff --git a/terraform/vault/.terraform.lock.hcl b/terraform/vault/.terraform.lock.hcl index 7fd8ad9..ca304ff 100644 --- a/terraform/vault/.terraform.lock.hcl +++ b/terraform/vault/.terraform.lock.hcl @@ -1,21 +1,19 @@ -# This file is maintained automatically by "terraform init". +# This file is maintained automatically by "tofu init". # Manual edits may be lost in future updates. -provider "registry.terraform.io/hashicorp/vault" { - version = "3.23.0" +provider "registry.opentofu.org/hashicorp/vault" { + version = "4.2.0" hashes = [ - "h1:+MSu9iMAo/4bBfVuKnf1Q+FVj7O1MLk5JO3TxFZ+dHU=", - "zh:0f5d14007a4ae668cb2f52ed91985ace0169153643026bd44b9cf3704f271ded", - "zh:2e6b6435f3ee58c0a2c633e05b9e0091d31e653433028e455b681b601ac36712", - "zh:342bf9ff3f2500576354612fd5b04dd18e9f79d32fc9d913c435db78f72b2c50", - "zh:55e08eed3b1d8e5c395fa1ffd71cb98755dad6c52dcc4f48ea1faa3538ebe995", - "zh:613379682dc8ff5e447fc0a1d99a5f94015d18555cafc1adb8d3e5766c491222", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8417ba0ac1c0708e4192a8eb4855cef6c64dc8e9b18e0944579d4b5031824ba9", - "zh:9218066d107c14dbc53061966dde55f88c056782458e2b59df1d185a948e2308", - "zh:b4f87e51739ccba8429f6d03f037a236261373dcd49df9edb6e17d41e013b155", - "zh:b864a6766d6690d416658b6996de06c844bcca2eb516cde4c639a3a267174440", - "zh:da1343c22bc096810f4902dfb035ae42920fd74fb9346c8ab4a0f93809b529c6", - "zh:e49210cc09b96932844950ff4fd2cf034fea0041612f43fb79d01e44ce030c8c", + "h1:B2TeJRBRbPqW7qMkazQ4DzY+4++KxYhPRD5nM0RWTos=", + "zh:0c97843a9c4619aa9708c833764448e8db472510785f886772fa798e9f14786e", + "zh:16267cfb01aec8ffe331bbc8558e35c2220951a2d431818c074499c97e7b2ae0", + "zh:2c7c3417b296e45277f7363c248edf9228e1946d528f1870c86d3417cc701b90", + "zh:368d6ec24d2de29964f1570463d8bd4cfda4a67fbccabf3d955007f58b5cf4e9", + "zh:5cdebc223e76765738fc33b5c754fcf152edc4fd80ae47083c561231c7e19bcb", + "zh:8cee20e4845892546eab929ee266882fabf74484ab858a0fd1b967152943ff99", + "zh:9edbb74e8b0b143550f59c6a6b44a9d97c84ab6f230087761eb4e559d1482097", + "zh:b571b643bb671cd4726fe60a2bd558ab1ceb46edad7aca23174b8ceac0c59643", + "zh:c6032c5ec771b964cb36074215808351c1cb9e9d71d6f323a348c60edcde1f4b", + "zh:dcf2b711f08d1dc83082860087fd57f5dcd78c77392cec913a9c8573ab95b26a", ] }