From 784e20b8b7162fad7f9b214bb9c3be75f14a8ab3 Mon Sep 17 00:00:00 2001 From: Marques Johansson Date: Thu, 27 Apr 2023 10:27:16 -0400 Subject: [PATCH] revert cloudflare provider to 3.6.0 to keep credentials optional --- .terraform.lock.hcl | 130 +++++++++++++++++++++------------------- modules/bastion/main.tf | 8 +-- versions.tf | 4 +- 3 files changed, 74 insertions(+), 68 deletions(-) diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 2ee746d..e811f18 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,45 +2,46 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "4.2.0" + version = "3.6.0" + constraints = "3.6.0" hashes = [ - "h1:fflKopUCZa62UVxnSgvkNqkDPmk5wNAnYIf61FraTys=", - "zh:021532c1225062b6b390ce4db02725f887664d9108fd9455658412701cd7b6b9", - "zh:200dbf815afea99eef5a4edde04f27cce2703faf4abe0d9a1cff3dbe2c6f8cab", - "zh:2f0f15f2009cc7e73daf357bd03b3fd3d1021ac5669a9242ef5e066103209c2f", - "zh:4b6761168dae6970b66eb88c1fef5512191d526aac07f78dce22da01623ea650", - "zh:54f50db03fea47e2994c472a26cd144342c52c7f05196ccc3b8443aa13d0a854", - "zh:5fe5aeacf5055b75b9237fda69fbf8982ffe9b9fe18baf5ce70a516b755c8a7e", - "zh:6958a163d54236ab921d370f07dc510746cf36143de8a84fcd5a68d55c4b4c07", - "zh:79b7bd5a8627bcfb8c6477ac02d01f4c17a2b8ffbebbef2eba55bceec50105b3", - "zh:890df766e9b839623b1f0437355032a3c006226a6c200cd911e15ee1a9014e9f", - "zh:89746e93565df445f21ad74fe48e7c9bf111e32eccb40e54ce6c948e90fd37e9", - "zh:89ccfef210986d9c39c4246b1e0ae4ba90c6fae815a47846b45cf4e404608725", - "zh:8a5439e3c04f7718a49fbf06aadaaaa079c03fd3564deeacee92c2b4c327b660", - "zh:942d459a8e2258397a5c2292e2032beaeddbdafba1f9b5d47b0b560e1333a4b6", - "zh:c5fa104a049d0cc093203df51e650a2cd0a46b0f1e42ee15b5ba5873cd850aab", - "zh:d9281c93f0189fbcfb203e658f444353c56a88a108082564699699dd1c87a363", + "h1:0ESwUqp8rhdP0Wy6rsauVruGF8z5JIytGD04vpc/cPs=", + "zh:00fd3e98ef0e8f0cba3ef640fb0353328c292e85076cfbcd582a6765a5e747bf", + "zh:2386a835a1f920db97ad597048244664b810694f81efd729484681e64811b95c", + "zh:2e892efeaac9244c20c8fc9e6971b7ec479b10232c11ab354523ce244badcada", + "zh:32c7ec995ecc8feaef7d2e304bdadda716358552520f5cb31ac8ad823876e777", + "zh:73be34d0abf19156ea256a976496351e082a9257fcedd7d2a180b2513d6d6134", + "zh:757fb3efbfdf2e912dcb7b3102e64cd8d2b378857e14933b95c1b9f8a051adf7", + "zh:7bb9acadfaf7e0fd2e256ba84e4642db7af3470a8ea3351d115fc284399de643", + "zh:7cedc56618b56d1bdde98bdf7c5167681b98907e7dfb7e2725f1ec36b6d3b416", + "zh:7d5ed91f3e843f687b78db0db6be57180b2f1799323636fe4d74c860b7a130c3", + "zh:83c75cf0ffa937654228b85bde542529e4ae1cc87af6abf0a1ece09108057bff", + "zh:93269070cbc52e4865e490291f798e07398fb4efe879b425821006c68dfa5e7d", + "zh:93d2467d9680d0d11028ec3a78ec8139afa18c45cff83b0e5aa84d8b9e5a91f2", + "zh:bb31aae955bc306b635d2592dcd07c37a863981caf450ffa7c8adb1cc8d70053", + "zh:c0f4324ff34349ce2ae0a8af81a04aec988f83ae7b876290ab7eb86d1a5d61af", ] } provider "registry.terraform.io/equinix/equinix" { - version = "1.11.1" - constraints = "1.11.1" + version = "1.14.1" + constraints = "1.14.1" hashes = [ - "h1:/yl9jYcrkaYLMfJTJiNoUzVKxP1y7hsA8B8QTIIz3g0=", - "zh:001983330b8845ad07f1e7d8462cd2ba2f372d54523d64e382ae5bdd4fe690a5", - "zh:1ec8c9052c01acd43f10ac92998b715b693640bb1f53e4dad7b4f5b2a2b84574", - "zh:27785aec3fa7d4b1d4638a7eb36ae70d15fe457e3371365bc16a8fb1349d9649", - "zh:2a6b6cfb08a52f32e66142b21c3df72da3e66d5158a61e4fd1d56f29772b5460", - "zh:57309a5d762744588c4a9ff3592fa446e123e62bd1ec6e502671375075d35647", - "zh:636c16ef8acc57605a0dc011dc05ef00276980553b70a2b35ab09185434902f7", - "zh:6b31691a28f1e6877e5c48894acdcc463f0baa74ae254a2acf6e148971f87810", - "zh:84c82012f51f82977b27084e1d7410c020a5772645f3037c25f7e3df1a637611", - "zh:9ea35a527e95280f3440abf2670c449951c239f1ce5e8fd685e04af60b2d28ff", - "zh:a81ef5a2f29b928c23a83c86e157daa604e70c3ef9e2d49b494556103b58e9ad", - "zh:d2bc396da3a1b0110b64a305f09092136e3b10e4cdf99a4f1e013e01ffa6812d", - "zh:ed783f06adc8702ce6c171a23f918c998c89836a6fe8f4e4c7cd15b84b8708a5", - "zh:fde39924aa0de90b7d19da2dd4f561a7a8c92efb9e19ea1c319957ccd6019fdd", + "h1:k8eFYlT/bsI54TQOG84bzqWelZK8fNzvYIkJwd+cEnM=", + "zh:1b478c206ae88a3bfd4ab376ce19e5c577b8f3389005cc159bb041b6dc9e00b1", + "zh:24b793281076cd57ac42665d919406ba4077768db01b0f1f1e7daff814159a49", + "zh:35d2902215d27592ff6cbbe478910aa40474ee0f0875a42ea06a11b32cae4ff7", + "zh:3ca24f4c577042ef4232105eb92b18fd83e59e1a99955507526a7a96edcd83de", + "zh:4f0ef4b10eca14fc091be18547d125fdf687b290ec3925bfcb3006033a6d8155", + "zh:50fe98f600a1cb15fb1b7153a5f70a2432e2920b9d99498a327db7c81fdbaaec", + "zh:8a1619f0fb5aa0eebec1133a2e7795da503425252300ffd286587a91f1316bd5", + "zh:8baf418e8acb130e32ab0402bcc2545fd1d0ac8ad3d6d337f51acb70eb99719d", + "zh:9062cdbbd2bedf1ad1ace95eca13f962d6dd8deb6db2e25e153027098e1aa985", + "zh:bc9160faff9ddb9e532e6ae7c79f8e66163ba19eadc34b0975a0c7b0084db02b", + "zh:bf67edb2daae4fe6728e4f879aecd9b4130beb82c0ad79e4cd2b159b48c93c02", + "zh:c125746c76a8580a403c56b69d702d0831523cfea3b7a3889ffc48835b7403ce", + "zh:c6fe46df23138c80d70cec18a791f02ccdf5c6c0b77a3f85964c0ddd33ad0025", + "zh:dd50a69bb647668a5255db0d01e655dc708b1e3a0ea780db2efb2418a6599ccd", ] } @@ -48,6 +49,7 @@ provider "registry.terraform.io/hashicorp/aws" { version = "3.76.1" constraints = "~> 3.0" hashes = [ + "h1:nrYpq9ne3FNUmjekbc0ayKE7wNu7BaMpV7oSC+qjAC4=", "h1:z1+WjdwuRX8Aa9a7YKXErhZ5AuvoXiDq7FHts30sZak=", "zh:1cf933104a641ffdb64d71a76806f4df35d19101b47e0eb02c9c36bd64bfdd2d", "zh:273afaf908775ade6c9d32462938e7739ee8b00a0de2ef3cdddc5bc115bb1d4f", @@ -70,6 +72,7 @@ provider "registry.terraform.io/hashicorp/aws" { provider "registry.terraform.io/hashicorp/external" { version = "2.3.1" hashes = [ + "h1:9rJggijNdRdFk//ViQPGZdK0xu9XU/9qBDijNsZJMg0=", "h1:gznGscVJ0USxy4CdihpjRKPsKvyGr/zqPvBoFLJTQDc=", "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54", "zh:2eeac58dd75b1abdf91945ac4284c9ccb2bfb17fa9bdb5f5d408148ff553b3ee", @@ -89,6 +92,7 @@ provider "registry.terraform.io/hashicorp/external" { provider "registry.terraform.io/hashicorp/local" { version = "2.4.0" hashes = [ + "h1:Bs7LAkV/iQTLv72j+cTMrvx2U3KyXrcVHaGbdns1NcE=", "h1:ZUEYUmm2t4vxwzxy1BvN1wL6SDWrDxfH7pxtzX8c6d0=", "zh:53604cd29cb92538668fe09565c739358dc53ca56f9f11312b9d7de81e48fab9", "zh:66a46e9c508716a1c98efbf793092f03d50049fa4a83cd6b2251e9a06aca2acf", @@ -108,6 +112,7 @@ provider "registry.terraform.io/hashicorp/local" { provider "registry.terraform.io/hashicorp/null" { version = "3.2.1" hashes = [ + "h1:tSj1mL6OQ8ILGqR2mDu7OYYYWf+hoir0pf9KAQ8IzO8=", "h1:ydA0/SNRVB1o95btfshvYsmxA+jZFRZcvKzZSB+4S1M=", "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", @@ -125,21 +130,21 @@ provider "registry.terraform.io/hashicorp/null" { } provider "registry.terraform.io/hashicorp/random" { - version = "3.4.3" + version = "3.5.1" hashes = [ - "h1:saZR+mhthL0OZl4SyHXZraxyaBNVMxiZzks78nWcZ2o=", - "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", - "zh:59d98081c4475f2ad77d881c4412c5129c56214892f490adf11c7e7a5a47de9b", - "zh:686ad1ee40b812b9e016317e7f34c0d63ef837e084dea4a1f578f64a6314ad53", + "h1:sZ7MTSD4FLekNN2wSNFGpM+5slfvpm5A/NLVZiB7CO0=", + "zh:04e3fbd610cb52c1017d282531364b9c53ef72b6bc533acb2a90671957324a64", + "zh:119197103301ebaf7efb91df8f0b6e0dd31e6ff943d231af35ee1831c599188d", + "zh:4d2b219d09abf3b1bb4df93d399ed156cadd61f44ad3baf5cf2954df2fba0831", + "zh:6130bdde527587bbe2dcaa7150363e96dbc5250ea20154176d82bc69df5d4ce3", + "zh:6cc326cd4000f724d3086ee05587e7710f032f94fc9af35e96a386a1c6f2214f", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:84103eae7251384c0d995f5a257c72b0096605048f757b749b7b62107a5dccb3", - "zh:8ee974b110adb78c7cd18aae82b2729e5124d8f115d484215fd5199451053de5", - "zh:9dd4561e3c847e45de603f17fa0c01ae14cae8c4b7b4e6423c9ef3904b308dda", - "zh:bb07bb3c2c0296beba0beec629ebc6474c70732387477a65966483b5efabdbc6", - "zh:e891339e96c9e5a888727b45b2e1bb3fcbdfe0fd7c5b4396e4695459b38c8cb1", - "zh:ea4739860c24dfeaac6c100b2a2e357106a89d18751f7693f3c31ecf6a996f8d", - "zh:f0c76ac303fd0ab59146c39bc121c5d7d86f878e9a69294e29444d4c653786f8", - "zh:f143a9a5af42b38fed328a161279906759ff39ac428ebcfe55606e05e1518b93", + "zh:b6d88e1d28cf2dfa24e9fdcc3efc77adcdc1c3c3b5c7ce503a423efbdd6de57b", + "zh:ba74c592622ecbcef9dc2a4d81ed321c4e44cddf7da799faa324da9bf52a22b2", + "zh:c7c5cde98fe4ef1143bd1b3ec5dc04baf0d4cc3ca2c5c7d40d17c0e9b2076865", + "zh:dac4bad52c940cd0dfc27893507c1e92393846b024c5a9db159a93c534a3da03", + "zh:de8febe2a2acd9ac454b844a4106ed295ae9520ef54dc8ed2faf29f12716b602", + "zh:eab0d0495e7e711cca367f7d4df6e322e6c562fc52151ec931176115b83ed014", ] } @@ -147,6 +152,7 @@ provider "registry.terraform.io/hashicorp/tls" { version = "4.0.4" hashes = [ "h1:GZcFizg5ZT2VrpwvxGBHQ/hO9r6g0vYdQqx3bFD3anY=", + "h1:Wd3RqmQW60k2QWPN4sK5CtjGuO1d+CRNXgC+D4rKtXc=", "zh:23671ed83e1fcf79745534841e10291bbf34046b27d6e68a5d0aab77206f4a55", "zh:45292421211ffd9e8e3eb3655677700e3c5047f71d8f7650d2ce30242335f848", "zh:59fedb519f4433c0fdb1d58b27c210b27415fddd0cd73c5312530b4309c088be", @@ -163,22 +169,22 @@ provider "registry.terraform.io/hashicorp/tls" { } provider "registry.terraform.io/linode/linode" { - version = "1.30.0" + version = "2.0.0" hashes = [ - "h1:d03YFL0XRD3H1SNwxX4tud+xw3j0HERNK81QNpD6e7g=", - "zh:197c61c5eb2252f65c18d2aa65cdc0511617b13e2388118f3fe063d7969dd7ad", - "zh:1a66470682acb13dc57308d5b1eaa19ff60c2404a3b15714e3072d02d569b1a5", - "zh:368cdcf17073a39687da830c02cf3ce50e0d8f03b7ec808b49561628be798abc", - "zh:42f2510a70afbb7fc8928df119d1e14ce1b61d2aded13b88072858ee5861feb2", - "zh:57734dd1e8255abd52a33ff79c20ef4efc3831850b22dd1a628e6301c3cf95c6", - "zh:61d614a7a4607bfc4ab6bfd0501007501957b973dbd028e0e513a3d4df07f12e", - "zh:79243f22fc0a9adfc1123abdd17c515f0ce4d8147302889033b6c44f6a48337e", - "zh:9f7cd46185bbe2c001dab1d0bd6c17a9740e7279d3fffe93755f2c964e267213", - "zh:9fdc9f8f47bde4140bc14cf082bbc2ceb63a3bebf0683df2fefd83c9e248274c", - "zh:aa1fd80a7ea245f8b852e40c68ccde2d8b6446e2138ebdec7425c67e82099881", - "zh:bb31f1ba5b0e001cf343d3a4cfafa70e6f3e30fd8a200d2cd7e077663efe0456", - "zh:da87881fa030287df2009028c49581e1fd0ff89baef0d8543b27ca506eff2971", - "zh:ed6afd7b1bc7237a9dff5c721ca3a5c7c505803cd5ea0b4ad0dfdf07ed6f9b0d", - "zh:ee653d5d08cb331ce2d8dc1010e68d363470ae87be62c0515e5d2418727cd02b", + "h1:NLg13i6WnObZOznxKCn8/Y7mbSZRcTyAN3K8ilRTDPc=", + "zh:0c6e070a352f87d1e60fb1410808312de8e6065010811ffd7482558affef803d", + "zh:431477fb56989be089561bd8e0210ab7dabbc969a7fd3b8e72570c290b5bc911", + "zh:4e09042bddcbc5cf246d079e42da8b1d2ef353c37709a5f67ebe90d23192ff82", + "zh:4fbae3fa75e825649d007706b2d36460ae9c66fc8e18eb7012f526c9bcb2eeca", + "zh:6b734bf6ceca37b587080ec5e86c659d03e33af2db1557b35d8d667083d38e86", + "zh:78856cc4fb4422537580bca76278fb253cfc50d2ea3cc9bc1a3f9553663a85c6", + "zh:902b78e81a6d4f9e0c4cbd354895196dd143bb928c73da4522a323e16965d58a", + "zh:92001fbc49e80ee2bd4b8ab1cc7388dcbe1fc9ddf754754e5bdb37d1ee48bad7", + "zh:98f9e0ffba36b2acef28c3c2e02ff56806dc08ddcc8c6242e97fc740b8f8bc80", + "zh:ab902186e66cd3c1f27b6ffb870dd1361c4af1b26bf145b1ecb84281ed8f0d9a", + "zh:bb9640323bb08090bdf3d692c9f8d9580e31bf65ee80d183fa0ab0593bebefe1", + "zh:e60f92fb3a588bf118fecc8b96aeb8631b7664287257774cf5b77b97c5962a75", + "zh:eeb4822e840b3686334b62a808d5937ec6288bcf0c8c58e592f7097d2ce055c6", + "zh:f9bba3139aab1905666b455fae57406adcbaef2db62ce8be87c769d48140de42", ] } diff --git a/modules/bastion/main.tf b/modules/bastion/main.tf index f4155d5..44074f1 100644 --- a/modules/bastion/main.tf +++ b/modules/bastion/main.tf @@ -60,7 +60,7 @@ resource "null_resource" "ocp_install_ignition" { resource "null_resource" "ipxe_files" { - depends_on = [metal_device.lb, null_resource.dircheck] + depends_on = [equinix_metal_device.lb, null_resource.dircheck] for_each = toset(var.nodes) provisioner "file" { @@ -72,7 +72,7 @@ resource "null_resource" "ipxe_files" { content = templatefile("${path.module}/assets/ipxe.tpl", { node_type = each.value - bastion_ip = metal_device.lb.access_public_ipv4 + bastion_ip = equinix_metal_device.lb.access_public_ipv4 ocp_version = var.ocp_version ocp_version_zstream = var.ocp_version_zstream }) @@ -95,7 +95,7 @@ resource "null_resource" "ipxe_files" { resource "null_resource" "ignition_append_files" { - depends_on = [metal_device.lb, null_resource.dircheck] + depends_on = [equinix_metal_device.lb, null_resource.dircheck] for_each = toset(var.nodes) provisioner "file" { @@ -107,7 +107,7 @@ resource "null_resource" "ignition_append_files" { content = templatefile("${path.module}/assets/ignition-append.json.tpl", { node_type = each.value - bastion_ip = metal_device.lb.access_public_ipv4 + bastion_ip = equinix_metal_device.lb.access_public_ipv4 cluster_name = var.cluster_name cluster_basedomain = var.cluster_basedomain }) diff --git a/versions.tf b/versions.tf index 32cedb7..c102da2 100644 --- a/versions.tf +++ b/versions.tf @@ -14,11 +14,11 @@ terraform { equinix = { source = "equinix/equinix" - version = "1.11.1" + version = "1.14.1" } null = { source = "hashicorp/null" } } - required_version = ">= 0.14" + required_version = ">= 1" }