From b221c18b61f261a68a5aa474e40e62c46ca3760d Mon Sep 17 00:00:00 2001 From: David Flanagan Date: Mon, 3 Apr 2023 12:01:56 +0100 Subject: [PATCH 1/3] fix: remove deprecated template_file provider --- .terraform.lock.hcl | 253 +++++++++++++++++------------------- modules/bastion/main.tf | 55 +++----- modules/bastion/versions.tf | 3 - modules/install/main.tf | 35 ++--- modules/install/versions.tf | 3 - modules/prereq/main.tf | 23 ++-- modules/prereq/versions.tf | 3 - 7 files changed, 157 insertions(+), 218 deletions(-) diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 28e74ea..0b9f68d 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,23 +2,24 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cloudflare/cloudflare" { - version = "3.6.0" + version = "4.2.0" hashes = [ - "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", + "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", ] } @@ -26,7 +27,7 @@ provider "registry.terraform.io/equinix/metal" { version = "3.2.1" constraints = "3.2.1" hashes = [ - "h1:ZlFTM53deZU/b5I1CopmZEgmuhY7C8Z16Ko8/wF7E7g=", + "h1:/yl9jYcrkaYLMfJTJiNoUzVKxP1y7hsA8B8QTIIz3g0=", "zh:001983330b8845ad07f1e7d8462cd2ba2f372d54523d64e382ae5bdd4fe690a5", "zh:1ec8c9052c01acd43f10ac92998b715b693640bb1f53e4dad7b4f5b2a2b84574", "zh:27785aec3fa7d4b1d4638a7eb36ae70d15fe457e3371365bc16a8fb1349d9649", @@ -44,154 +45,140 @@ provider "registry.terraform.io/equinix/metal" { } provider "registry.terraform.io/hashicorp/aws" { - version = "3.71.0" + version = "3.76.1" constraints = "~> 3.0" hashes = [ - "h1:5+M8SPZlb3FxcmAX4RykKzNrTHkpjoP1UpHcenOXcxo=", - "zh:173134d8861a33ed60a48942ad2b96b9d06e85c506d7f927bead47a28f4ebdd2", - "zh:2996c8e96930f526f1761e99d14c0b18d83e287b1362aa2fa1444cf848ece613", - "zh:43903da1e0a809a1fb5832e957dbe2321b86630d6bfdd8b47728647a72fd912d", - "zh:43e71fd8924e7f7b56a0b2a82e29edf07c53c2b41ee7bb442a2f1c27e03e86ae", - "zh:4f4c73711f64a3ff85f88bf6b2594e5431d996b7a59041ff6cbc352f069fc122", - "zh:5045241b8695ffbd0730bdcd91393b10ffd0cfbeaad6254036e42ead6687d8fd", - "zh:6a8811a0fb1035c09aebf1f9b15295523a9a7a2627fd783f50c6168a82e192dd", - "zh:8d273c04d7a8c36d4366329adf041c480a0f1be10a7269269c88413300aebdb8", - "zh:b90505897ae4943a74de2b88b6a9e7d97bf6dc325a0222235996580edff28656", - "zh:ea5e422942ac6fc958229d27d4381c89d21d70c5c2c67a6c06ff357bcded76f6", - "zh:f1536d7ff2d3bfd668e3ac33d8956b4f988f87fdfdcc371c7d94b98d5dba53e2", + "h1:z1+WjdwuRX8Aa9a7YKXErhZ5AuvoXiDq7FHts30sZak=", + "zh:1cf933104a641ffdb64d71a76806f4df35d19101b47e0eb02c9c36bd64bfdd2d", + "zh:273afaf908775ade6c9d32462938e7739ee8b00a0de2ef3cdddc5bc115bb1d4f", + "zh:2bc24ae989e38f575de034083082c69b41c54b8df69d35728853257c400ce0f4", + "zh:53ba88dbdaf9f818d35001c3d519a787f457283d9341f562dc3d0af51fd9606e", + "zh:5cdac7afea68bbd89d3bdb345d99470226482eff41f375f220fe338d2e5808da", + "zh:63127808890ac4be6cff6554985510b15ac715df698d550a3e722722dc56523c", + "zh:97a1237791f15373743189b078a0e0f2fa4dd7d7474077423376cd186312dc55", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:a4f625e97e5f25073c08080e4a619f959bc0149fc853a6b1b49ab41d58b59665", + "zh:b56cca54019237941f7614e8d2712586a6ab3092e8e9492c70f06563259171e9", + "zh:d4bc33bfd6ac78fb61e6d48a61c179907dfdbdf149b89fb97272c663989a7fcd", + "zh:e0089d73fa56d128c574601305634a774eebacf4a84babba71da10040cecf99a", + "zh:e957531f1d92a6474c9b02bd9200da91b99ba07a0ab761c8e3176400dd41721c", + "zh:eceb85818d57d8270db4df7564cf4ed51b5c650a361aaa017c42227158e1946b", + "zh:f565e5caa1b349ec404c6d03d01c68b02233f5485ed038d0aab810dd4023a880", ] } provider "registry.terraform.io/hashicorp/external" { - version = "2.2.0" + version = "2.3.1" hashes = [ - "h1:V1XoXkVwM+Bg73BNtbMxScjTcty2jbRZzgSdHrYxQ+4=", - "zh:094c3cfae140fbb70fb0e272b1df833b4d7467c6c819fbf59a3e8ac0922f95b6", - "zh:15c3906abbc1cd03a72afd02bda9caeeb5f6ca421292c32ddeb2acd7a3488669", - "zh:388c14bceeb1593bb16cadedc8f5ad7d41d398197db049dc0871bc847aa61083", - "zh:5696772136b6763faade0cc065fafc2bf06493021b943826be0144790fae514a", - "zh:6427c693b1b750644d5b633395e54617dc36ae717a531a5cde8cb0246b6593ca", - "zh:7196d9845eeffa3158f5e3067bf8b7ad489490aa26d29e2da1ad4c8924463469", + "h1:gznGscVJ0USxy4CdihpjRKPsKvyGr/zqPvBoFLJTQDc=", + "zh:001e2886dc81fc98cf17cf34c0d53cb2dae1e869464792576e11b0f34ee92f54", + "zh:2eeac58dd75b1abdf91945ac4284c9ccb2bfb17fa9bdb5f5d408148ff553b3ee", + "zh:2fc39079ba61411a737df2908942e6970cb67ed2f4fb19090cd44ce2082903dd", + "zh:472a71c624952cff7aa98a7b967f6c7bb53153dbd2b8f356ceb286e6743bb4e2", + "zh:4cff06d31272aac8bc35e9b7faec42cf4554cbcbae1092eaab6ab7f643c215d9", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8850d3ce9e5f5776b9349890ce4e2c4056defe16ed741dc845045942a6d9e025", - "zh:a2c6fc6cf087b35ebd6b6f20272ed32d4217ea9936c1dd630baa46d86718a455", - "zh:ac709be4ea5c9a6e1ab80e864d24cd9f8e6aaea29fb5dbe1de0897e2e86c3c17", - "zh:dcf806f044801fae5b21ae2754dc3c19c68e458d4584965752ce49be75305ff5", - "zh:f875b34be86c3439899828978638ef7e2d41a9e5e32397858a0c31daeaa1abc2", + "zh:7ed16ccd2049fa089616b98c0bd57219f407958f318f3c697843e2397ddf70df", + "zh:842696362c92bf2645eb85c739410fd51376be6c488733efae44f4ce688da50e", + "zh:8985129f2eccfd7f1841ce06f3bf2bbede6352ec9e9f926fbaa6b1a05313b326", + "zh:a5f0602d8ec991a5411ef42f872aa90f6347e93886ce67905c53cfea37278e05", + "zh:bf4ab82cbe5256dcef16949973bf6aa1a98c2c73a98d6a44ee7bc40809d002b8", + "zh:e70770be62aa70198fa899526d671643ff99eecf265bf1a50e798fc3480bd417", ] } provider "registry.terraform.io/hashicorp/local" { - version = "2.1.0" + version = "2.4.0" hashes = [ - "h1:EYZdckuGU3n6APs97nS2LxZm3dDtGqyM4qaIvsmac8o=", - "h1:KfieWtVyGWwplSoLIB5usKAUnrIkDQBkWaR5TI+4WYg=", - "zh:0f1ec65101fa35050978d483d6e8916664b7556800348456ff3d09454ac1eae2", - "zh:36e42ac19f5d68467aacf07e6adcf83c7486f2e5b5f4339e9671f68525fc87ab", - "zh:6db9db2a1819e77b1642ec3b5e95042b202aee8151a0256d289f2e141bf3ceb3", - "zh:719dfd97bb9ddce99f7d741260b8ece2682b363735c764cac83303f02386075a", - "zh:7598bb86e0378fd97eaa04638c1a4c75f960f62f69d3662e6d80ffa5a89847fe", - "zh:ad0a188b52517fec9eca393f1e2c9daea362b33ae2eb38a857b6b09949a727c1", - "zh:c46846c8df66a13fee6eff7dc5d528a7f868ae0dcf92d79deaac73cc297ed20c", - "zh:dc1a20a2eec12095d04bf6da5321f535351a594a636912361db20eb2a707ccc4", - "zh:e57ab4771a9d999401f6badd8b018558357d3cbdf3d33cc0c4f83e818ca8e94b", - "zh:ebdcde208072b4b0f8d305ebf2bfdc62c926e0717599dcf8ec2fd8c5845031c3", - "zh:ef34c52b68933bedd0868a13ccfd59ff1c820f299760b3c02e008dc95e2ece91", + "h1:ZUEYUmm2t4vxwzxy1BvN1wL6SDWrDxfH7pxtzX8c6d0=", + "zh:53604cd29cb92538668fe09565c739358dc53ca56f9f11312b9d7de81e48fab9", + "zh:66a46e9c508716a1c98efbf793092f03d50049fa4a83cd6b2251e9a06aca2acf", + "zh:70a6f6a852dd83768d0778ce9817d81d4b3f073fab8fa570bff92dcb0824f732", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:82a803f2f484c8b766e2e9c32343e9c89b91997b9f8d2697f9f3837f62926b35", + "zh:9708a4e40d6cc4b8afd1352e5186e6e1502f6ae599867c120967aebe9d90ed04", + "zh:973f65ce0d67c585f4ec250c1e634c9b22d9c4288b484ee2a871d7fa1e317406", + "zh:c8fa0f98f9316e4cfef082aa9b785ba16e36ff754d6aba8b456dab9500e671c6", + "zh:cfa5342a5f5188b20db246c73ac823918c189468e1382cb3c48a9c0c08fc5bf7", + "zh:e0e2b477c7e899c63b06b38cd8684a893d834d6d0b5e9b033cedc06dd7ffe9e2", + "zh:f62d7d05ea1ee566f732505200ab38d94315a4add27947a60afa29860822d3fc", + "zh:fa7ce69dde358e172bd719014ad637634bbdabc49363104f4fca759b4b73f2ce", ] } provider "registry.terraform.io/hashicorp/null" { - version = "3.1.0" + version = "3.2.1" hashes = [ - "h1:vpC6bgUQoJ0znqIKVFevOdq+YQw42bRq0u+H3nto8nA=", - "h1:xhbHC6in3nQryvTQBWKxebi3inG5OCgHgc4fRxL0ymc=", - "zh:02a1675fd8de126a00460942aaae242e65ca3380b5bb192e8773ef3da9073fd2", - "zh:53e30545ff8926a8e30ad30648991ca8b93b6fa496272cd23b26763c8ee84515", - "zh:5f9200bf708913621d0f6514179d89700e9aa3097c77dac730e8ba6e5901d521", - "zh:9ebf4d9704faba06b3ec7242c773c0fbfe12d62db7d00356d4f55385fc69bfb2", - "zh:a6576c81adc70326e4e1c999c04ad9ca37113a6e925aefab4765e5a5198efa7e", - "zh:a8a42d13346347aff6c63a37cda9b2c6aa5cc384a55b2fe6d6adfa390e609c53", - "zh:c797744d08a5307d50210e0454f91ca4d1c7621c68740441cf4579390452321d", - "zh:cecb6a304046df34c11229f20a80b24b1603960b794d68361a67c5efe58e62b8", - "zh:e1371aa1e502000d9974cfaff5be4cfa02f47b17400005a16f14d2ef30dc2a70", - "zh:fc39cc1fe71234a0b0369d5c5c7f876c71b956d23d7d6f518289737a001ba69b", - "zh:fea4227271ebf7d9e2b61b89ce2328c7262acd9fd190e1fd6d15a591abfa848e", + "h1:ydA0/SNRVB1o95btfshvYsmxA+jZFRZcvKzZSB+4S1M=", + "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", + "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", + "zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5", + "zh:74cb22c6700e48486b7cabefa10b33b801dfcab56f1a6ac9b6624531f3d36ea3", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:79e553aff77f1cfa9012a2218b8238dd672ea5e1b2924775ac9ac24d2a75c238", + "zh:a1e06ddda0b5ac48f7e7c7d59e1ab5a4073bbcf876c73c0299e4610ed53859dc", + "zh:c37a97090f1a82222925d45d84483b2aa702ef7ab66532af6cbcfb567818b970", + "zh:e4453fbebf90c53ca3323a92e7ca0f9961427d2f0ce0d2b65523cc04d5d999c2", + "zh:e80a746921946d8b6761e77305b752ad188da60688cfd2059322875d363be5f5", + "zh:fbdb892d9822ed0e4cb60f2fedbdbb556e4da0d88d3b942ae963ed6ff091e48f", + "zh:fca01a623d90d0cad0843102f9b8b9fe0d3ff8244593bd817f126582b52dd694", ] } provider "registry.terraform.io/hashicorp/random" { - version = "3.1.0" + version = "3.4.3" hashes = [ - "h1:BZMEPucF+pbu9gsPk0G0BHx7YP04+tKdq2MrRDF1EDM=", - "h1:rKYu5ZUbXwrLG1w81k7H3nce/Ys6yAxXhWcbtk36HjY=", - "zh:2bbb3339f0643b5daa07480ef4397bd23a79963cc364cdfbb4e86354cb7725bc", - "zh:3cd456047805bf639fbf2c761b1848880ea703a054f76db51852008b11008626", - "zh:4f251b0eda5bb5e3dc26ea4400dba200018213654b69b4a5f96abee815b4f5ff", - "zh:7011332745ea061e517fe1319bd6c75054a314155cb2c1199a5b01fe1889a7e2", - "zh:738ed82858317ccc246691c8b85995bc125ac3b4143043219bd0437adc56c992", - "zh:7dbe52fac7bb21227acd7529b487511c91f4107db9cc4414f50d04ffc3cab427", - "zh:a3a9251fb15f93e4cfc1789800fc2d7414bbc18944ad4c5c98f466e6477c42bc", - "zh:a543ec1a3a8c20635cf374110bd2f87c07374cf2c50617eee2c669b3ceeeaa9f", - "zh:d9ab41d556a48bd7059f0810cf020500635bfc696c9fc3adab5ea8915c1d886b", - "zh:d9e13427a7d011dbd654e591b0337e6074eef8c3b9bb11b2e39eaaf257044fd7", - "zh:f7605bd1437752114baf601bdf6931debe6dc6bfe3006eb7e9bb9080931dca8a", - ] -} - -provider "registry.terraform.io/hashicorp/template" { - version = "2.2.0" - hashes = [ - "h1:0wlehNaxBX7GJQnPfQwTNvvAf38Jm0Nv7ssKGMaG6Og=", - "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", - "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", - "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", - "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", - "zh:0e3a6c8e16f17f19010accd0844187d524580d9fdb0731f675ffcf4afba03d16", - "zh:45f2c594b6f2f34ea663704cc72048b212fe7d16fb4cfd959365fa997228a776", - "zh:77ea3e5a0446784d77114b5e851c970a3dde1e08fa6de38210b8385d7605d451", - "zh:8a154388f3708e3df5a69122a23bdfaf760a523788a5081976b3d5616f7d30ae", - "zh:992843002f2db5a11e626b3fc23dc0c87ad3729b3b3cff08e32ffb3df97edbde", - "zh:ad906f4cebd3ec5e43d5cd6dc8f4c5c9cc3b33d2243c89c5fc18f97f7277b51d", - "zh:c979425ddb256511137ecd093e23283234da0154b7fa8b21c2687182d9aea8b2", + "h1:saZR+mhthL0OZl4SyHXZraxyaBNVMxiZzks78nWcZ2o=", + "zh:41c53ba47085d8261590990f8633c8906696fa0a3c4b384ff6a7ecbf84339752", + "zh:59d98081c4475f2ad77d881c4412c5129c56214892f490adf11c7e7a5a47de9b", + "zh:686ad1ee40b812b9e016317e7f34c0d63ef837e084dea4a1f578f64a6314ad53", + "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", + "zh:84103eae7251384c0d995f5a257c72b0096605048f757b749b7b62107a5dccb3", + "zh:8ee974b110adb78c7cd18aae82b2729e5124d8f115d484215fd5199451053de5", + "zh:9dd4561e3c847e45de603f17fa0c01ae14cae8c4b7b4e6423c9ef3904b308dda", + "zh:bb07bb3c2c0296beba0beec629ebc6474c70732387477a65966483b5efabdbc6", + "zh:e891339e96c9e5a888727b45b2e1bb3fcbdfe0fd7c5b4396e4695459b38c8cb1", + "zh:ea4739860c24dfeaac6c100b2a2e357106a89d18751f7693f3c31ecf6a996f8d", + "zh:f0c76ac303fd0ab59146c39bc121c5d7d86f878e9a69294e29444d4c653786f8", + "zh:f143a9a5af42b38fed328a161279906759ff39ac428ebcfe55606e05e1518b93", ] } provider "registry.terraform.io/hashicorp/tls" { - version = "3.1.0" + version = "4.0.4" hashes = [ - "h1:XTU9f6sGMZHOT8r/+LWCz2BZOPH127FBTPjMMEAAu1U=", - "h1:fUJX8Zxx38e2kBln+zWr1Tl41X+OuiE++REjrEyiOM4=", - "zh:3d46616b41fea215566f4a957b6d3a1aa43f1f75c26776d72a98bdba79439db6", - "zh:623a203817a6dafa86f1b4141b645159e07ec418c82fe40acd4d2a27543cbaa2", - "zh:668217e78b210a6572e7b0ecb4134a6781cc4d738f4f5d09eb756085b082592e", - "zh:95354df03710691773c8f50a32e31fca25f124b7f3d6078265fdf3c4e1384dca", - "zh:9f97ab190380430d57392303e3f36f4f7835c74ea83276baa98d6b9a997c3698", - "zh:a16f0bab665f8d933e95ca055b9c8d5707f1a0dd8c8ecca6c13091f40dc1e99d", - "zh:be274d5008c24dc0d6540c19e22dbb31ee6bfdd0b2cddd4d97f3cd8a8d657841", - "zh:d5faa9dce0a5fc9d26b2463cea5be35f8586ab75030e7fa4d4920cd73ee26989", - "zh:e9b672210b7fb410780e7b429975adcc76dd557738ecc7c890ea18942eb321a5", - "zh:eb1f8368573d2370605d6dbf60f9aaa5b64e55741d96b5fb026dbfe91de67c0d", - "zh:fc1e12b713837b85daf6c3bb703d7795eaf1c5177aebae1afcf811dd7009f4b0", + "h1:GZcFizg5ZT2VrpwvxGBHQ/hO9r6g0vYdQqx3bFD3anY=", + "zh:23671ed83e1fcf79745534841e10291bbf34046b27d6e68a5d0aab77206f4a55", + "zh:45292421211ffd9e8e3eb3655677700e3c5047f71d8f7650d2ce30242335f848", + "zh:59fedb519f4433c0fdb1d58b27c210b27415fddd0cd73c5312530b4309c088be", + "zh:5a8eec2409a9ff7cd0758a9d818c74bcba92a240e6c5e54b99df68fff312bbd5", + "zh:5e6a4b39f3171f53292ab88058a59e64825f2b842760a4869e64dc1dc093d1fe", + "zh:810547d0bf9311d21c81cc306126d3547e7bd3f194fc295836acf164b9f8424e", + "zh:824a5f3617624243bed0259d7dd37d76017097dc3193dac669be342b90b2ab48", + "zh:9361ccc7048be5dcbc2fafe2d8216939765b3160bd52734f7a9fd917a39ecbd8", + "zh:aa02ea625aaf672e649296bce7580f62d724268189fe9ad7c1b36bb0fa12fa60", + "zh:c71b4cd40d6ec7815dfeefd57d88bc592c0c42f5e5858dcc88245d371b4b8b1e", + "zh:dabcd52f36b43d250a3d71ad7abfa07b5622c69068d989e60b79b2bb4f220316", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/linode/linode" { - version = "1.25.1" + version = "1.30.0" hashes = [ - "h1:Ow8xAUWoIJKqOBH6fnC3njnsWwjjIeN4oqqWd100lf4=", - "zh:011d31d5ba135db140a9e4d34b6a358b05f26e9649fa3ac252ba5753be87dbc7", - "zh:0c61b38aa196c7bbc12285893c9a8a5e995e56fd6a013329774c670b62b38897", - "zh:1227a34a2002145aa4817999a08cdba3f0f412d51d24f4848aa0a9b08a58f186", - "zh:4f6c119d150576ee737aa532062378e577a0754b85c32eec988ee094af798a07", - "zh:62751d4e56c38cd4952a69746a2c941a28d6b76fa12173fb7d135ba999d3b7ae", - "zh:743c1f54c40c2a129df35c0deb0a4af899472ff85fb79a58a282b2107072954c", - "zh:78a7c6d4a75eae1e6753bf74341245739f65d90ff4c78bdeab49a579db678a52", - "zh:835b587b57caa1e695bdc932e0036efafd3a069bfae3151e1d574c854eaef24c", - "zh:93a797797f7c566af735802a4da17a0adbf4b5303cb2fcd62173289a2211b059", - "zh:942bb3aef76f55067379d991a64f9641f44f5d40ed8d31f8857683bb75ee3f47", - "zh:9bd2bc6fa211153cff5487ac3a8afad24f742cd946985eade67dc413c0a47d84", - "zh:a4f9dfef3a29e861282b6ef8917819f351da8fb00b390cb75549718b6c8b9dc4", - "zh:af185b9471439c37dc0580871eb230a36f4cfc0dbb75c3ec911242a56b92efda", - "zh:eb7dfa4e9041a947ff776b9fd0da06790bd5ea23c26e4c5332f88f9ff3b24cff", + "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", ] } diff --git a/modules/bastion/main.tf b/modules/bastion/main.tf index 38b4433..f1a2fc5 100644 --- a/modules/bastion/main.tf +++ b/modules/bastion/main.tf @@ -1,33 +1,3 @@ -data "template_file" "user_data" { - template = file("${path.module}/assets/user_data_${var.operating_system}.sh") -} - -data "template_file" "ipxe_script" { - depends_on = [metal_device.lb] - for_each = toset(var.nodes) - template = file("${path.module}/assets/ipxe.tpl") - - vars = { - node_type = each.value - bastion_ip = metal_device.lb.access_public_ipv4 - ocp_version = var.ocp_version - ocp_version_zstream = var.ocp_version_zstream - } -} - -data "template_file" "ignition_append" { - depends_on = [metal_device.lb] - for_each = toset(var.nodes) - template = file("${path.module}/assets/ignition-append.json.tpl") - - vars = { - node_type = each.value - bastion_ip = metal_device.lb.access_public_ipv4 - cluster_name = var.cluster_name - cluster_basedomain = var.cluster_basedomain - } -} - locals { arch = "x86_64" coreos_baseurl = "http://54.172.173.155/pub/openshift-v4/dependencies/rhcos" @@ -46,8 +16,7 @@ resource "metal_device" "lb" { operating_system = var.operating_system billing_cycle = var.billing_cycle project_id = var.project_id - user_data = data.template_file.user_data.rendered - + user_data = file("${path.module}/assets/user_data_${var.operating_system}.sh") } resource "null_resource" "dircheck" { @@ -91,8 +60,8 @@ resource "null_resource" "ocp_install_ignition" { resource "null_resource" "ipxe_files" { - depends_on = [null_resource.dircheck] - for_each = data.template_file.ipxe_script + depends_on = [metal_device.lb, null_resource.dircheck] + for_each = toset(var.nodes) provisioner "file" { @@ -101,7 +70,12 @@ resource "null_resource" "ipxe_files" { host = metal_device.lb.access_public_ipv4 } - content = each.value.rendered + content = templatefile("${path.module}/assets/ipxe.tpl", { + node_type = each.value + bastion_ip = metal_device.lb.access_public_ipv4 + ocp_version = var.ocp_version + ocp_version_zstream = var.ocp_version_zstream + }) destination = "/usr/share/nginx/html/${each.key}.ipxe" } @@ -121,8 +95,8 @@ resource "null_resource" "ipxe_files" { resource "null_resource" "ignition_append_files" { - depends_on = [null_resource.dircheck] - for_each = data.template_file.ignition_append + depends_on = [metal_device.lb, null_resource.dircheck] + for_each = toset(var.nodes) provisioner "file" { @@ -131,7 +105,12 @@ resource "null_resource" "ignition_append_files" { host = metal_device.lb.access_public_ipv4 } - content = each.value.rendered + content = templatefile("${path.module}/assets/ignition-append.json.tpl", { + node_type = each.value + bastion_ip = metal_device.lb.access_public_ipv4 + cluster_name = var.cluster_name + cluster_basedomain = var.cluster_basedomain + }) destination = "/usr/share/nginx/html/${each.key}-append.ign" } diff --git a/modules/bastion/versions.tf b/modules/bastion/versions.tf index 6672148..2bbc5e0 100644 --- a/modules/bastion/versions.tf +++ b/modules/bastion/versions.tf @@ -6,9 +6,6 @@ terraform { null = { source = "hashicorp/null" } - template = { - source = "hashicorp/template" - } } required_version = ">= 0.14" } diff --git a/modules/install/main.tf b/modules/install/main.tf index a44948d..8af6f35 100644 --- a/modules/install/main.tf +++ b/modules/install/main.tf @@ -46,20 +46,6 @@ locals { haproxy_cfg_file = "/etc/haproxy/haproxy.cfg" } -data "template_file" "haproxy_lb" { - depends_on = [var.depends] - template = file("${path.module}/assets/haproxy.cfg.tpl") - - vars = { - expanded_controlplane = local.expanded_controlplane - expanded_compute_http = tonumber(var.count_compute) >= 1 ? local.expanded_compute_http : local.expanded_controlplane_http - expanded_compute_https = tonumber(var.count_compute) >= 1 ? local.expanded_compute_https : local.expanded_controlplane_https - expanded_mcs = local.expanded_mcs - expanded_bootstrap_api = local.expanded_bootstrap_api - expanded_bootstrap_mcs = local.expanded_bootstrap_mcs - } -} - resource "null_resource" "reconfig_lb" { depends_on = [var.depends] @@ -71,7 +57,14 @@ resource "null_resource" "reconfig_lb" { host = var.bastion_ip } - content = data.template_file.haproxy_lb.rendered + content = templatefile("${path.module}/assets/haproxy.cfg.tpl", { + expanded_controlplane = local.expanded_controlplane + expanded_compute_http = tonumber(var.count_compute) >= 1 ? local.expanded_compute_http : local.expanded_controlplane_http + expanded_compute_https = tonumber(var.count_compute) >= 1 ? local.expanded_compute_https : local.expanded_controlplane_https + expanded_mcs = local.expanded_mcs + expanded_bootstrap_api = local.expanded_bootstrap_api + expanded_bootstrap_mcs = local.expanded_bootstrap_mcs + }) destination = local.haproxy_cfg_file } @@ -135,13 +128,6 @@ resource "null_resource" "ocp_installer_wait_for_bootstrap" { } } -data "template_file" "nfs_exports" { - template = <<-EOT - ${local.expanded_controlplane_nfs} - ${local.expanded_compute_nfs} - EOT -} - resource "null_resource" "reconfig_nfs_exports" { depends_on = [var.depends] @@ -153,7 +139,10 @@ resource "null_resource" "reconfig_nfs_exports" { host = var.bastion_ip } - content = data.template_file.nfs_exports.rendered + content = <<-EOT + ${local.expanded_controlplane_nfs} + ${local.expanded_compute_nfs} + EOT destination = "/etc/exports" } diff --git a/modules/install/versions.tf b/modules/install/versions.tf index 3e70104..fc7a334 100644 --- a/modules/install/versions.tf +++ b/modules/install/versions.tf @@ -3,9 +3,6 @@ terraform { null = { source = "hashicorp/null" } - template = { - source = "hashicorp/template" - } } required_version = ">= 0.13" } diff --git a/modules/prereq/main.tf b/modules/prereq/main.tf index 2371603..363ab87 100644 --- a/modules/prereq/main.tf +++ b/modules/prereq/main.tf @@ -56,29 +56,22 @@ resource "null_resource" "ocp_pullsecret" { } } -data "template_file" "installer_config" { - depends_on = [null_resource.ocp_pullsecret, null_resource.ocp_installer] - template = file("${path.module}/assets/install-config.yaml.tpl") - vars = { - cluster_name = var.cluster_name - cluster_basedomain = var.cluster_basedomain - ssh_public_key = var.ssh_public_key - count_controlplane = var.count_controlplane - count_compute = var.count_compute - } -} - resource "null_resource" "ocp_install_config" { - depends_on = [data.template_file.installer_config, null_resource.ocp_installer, null_resource.ocp_pullsecret] + depends_on = [null_resource.ocp_installer, null_resource.ocp_pullsecret] provisioner "file" { - connection { private_key = file(var.ssh_private_key_path) host = var.bastion_ip } - content = data.template_file.installer_config.rendered + content = templatefile("${path.module}/assets/install-config.yaml.tpl", { + cluster_name = var.cluster_name + cluster_basedomain = var.cluster_basedomain + ssh_public_key = var.ssh_public_key + count_controlplane = var.count_controlplane + count_compute = var.count_compute + }) destination = "/tmp/artifacts/install/install-config.yaml" } diff --git a/modules/prereq/versions.tf b/modules/prereq/versions.tf index 3e70104..fc7a334 100644 --- a/modules/prereq/versions.tf +++ b/modules/prereq/versions.tf @@ -3,9 +3,6 @@ terraform { null = { source = "hashicorp/null" } - template = { - source = "hashicorp/template" - } } required_version = ">= 0.13" } From 6e36c4f96bf7c5e84dbc20e8c9907fa658f1a8e7 Mon Sep 17 00:00:00 2001 From: David Flanagan Date: Mon, 10 Apr 2023 13:13:16 +0100 Subject: [PATCH 2/3] fix: metros and curl follow redirects --- assets/cnv/11_cnv_sample.sh | 2 +- main.tf | 8 ++++---- modules/bastion/main.tf | 8 ++++---- modules/bastion/variables.tf | 6 +++--- modules/install/assets/nfs-provisioner.sh | 6 +++--- modules/install/main.tf | 2 +- modules/node/main.tf | 2 +- modules/node/variables.tf | 2 +- modules/prereq/assets/get-ocp-installer.sh | 4 ++-- modules/prereq/assets/get-pull-secret.sh | 4 ++-- modules/sshkey/main.tf | 2 +- variables.tf | 10 +++++----- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/assets/cnv/11_cnv_sample.sh b/assets/cnv/11_cnv_sample.sh index f6fe2be..92469ae 100755 --- a/assets/cnv/11_cnv_sample.sh +++ b/assets/cnv/11_cnv_sample.sh @@ -12,7 +12,7 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@lb-0.${TF_V ## Stage a Windows 2019 image from Vagrant on you bastion/LB -version=`curl -L -H "Accept: application/json" https://app.vagrantup.com/peru/boxes/windows-server-2019-standard-x64-eval | jq -r '.versions[0].version'` +version=`curl -fsSL -L -H "Accept: application/json" https://app.vagrantup.com/peru/boxes/windows-server-2019-standard-x64-eval | jq -r '.versions[0].version'` #ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${TF_VAR_ssh_private_key_path} root@lb-0.${TF_VAR_cluster_name}.${TF_VAR_cluster_basedomain} << EOF # wget https://app.vagrantup.com/peru/boxes/windows-server-2016-standard-x64-eval/versions/${version}/providers/libvirt.box -O /usr/share/nginx/html/libvirt.box diff --git a/main.tf b/main.tf index c3b1796..99351d5 100644 --- a/main.tf +++ b/main.tf @@ -13,7 +13,7 @@ module "bastion" { depends_on = [module.sshkey] project_id = var.project_id - facility = var.facility + metro = var.metro plan = var.plan_controlplane operating_system = var.bastion_operating_system ssh_private_key_path = module.sshkey.ssh_private_key_file @@ -60,7 +60,7 @@ module "openshift_bootstrap" { cluster_basedomain = var.cluster_basedomain node_count = var.count_bootstrap plan = var.plan_controlplane - facility = var.facility + metro = var.metro ssh_private_key_path = module.sshkey.ssh_private_key_file project_id = var.project_id bastion_ip = module.bastion.lb_ip @@ -88,7 +88,7 @@ module "openshift_controlplane" { cluster_basedomain = var.cluster_basedomain node_count = var.count_controlplane plan = var.plan_controlplane - facility = var.facility + metro = var.metro ssh_private_key_path = module.sshkey.ssh_private_key_file project_id = var.project_id bastion_ip = module.bastion.lb_ip @@ -116,7 +116,7 @@ module "openshift_workers" { cluster_basedomain = var.cluster_basedomain node_count = var.count_compute plan = var.plan_compute - facility = var.facility + metro = var.metro ssh_private_key_path = module.sshkey.ssh_private_key_file project_id = var.project_id bastion_ip = module.bastion.lb_ip diff --git a/modules/bastion/main.tf b/modules/bastion/main.tf index f1a2fc5..d7606c6 100644 --- a/modules/bastion/main.tf +++ b/modules/bastion/main.tf @@ -12,7 +12,7 @@ locals { resource "metal_device" "lb" { hostname = "lb-0.${var.cluster_name}.${var.cluster_basedomain}" plan = var.plan - facilities = [var.facility] + metro = var.metro operating_system = var.operating_system billing_cycle = var.billing_cycle project_id = var.project_id @@ -50,9 +50,9 @@ resource "null_resource" "ocp_install_ignition" { inline = [ - "curl -o /usr/share/nginx/html/${local.coreos_img} ${local.coreos_url}/${local.coreos_img}", - "curl -o /usr/share/nginx/html/${local.coreos_kernel} ${local.coreos_url}/${local.coreos_kernel}", - "curl -o /usr/share/nginx/html/${local.coreos_initrd} ${local.coreos_url}/${local.coreos_initrd}", + "curl -fsSL -o /usr/share/nginx/html/${local.coreos_img} ${local.coreos_url}/${local.coreos_img}", + "curl -fsSL -o /usr/share/nginx/html/${local.coreos_kernel} ${local.coreos_url}/${local.coreos_kernel}", + "curl -fsSL -o /usr/share/nginx/html/${local.coreos_initrd} ${local.coreos_url}/${local.coreos_initrd}", "chmod -R 0755 /usr/share/nginx/html/" ] } diff --git a/modules/bastion/variables.tf b/modules/bastion/variables.tf index 5227967..2313e94 100644 --- a/modules/bastion/variables.tf +++ b/modules/bastion/variables.tf @@ -17,13 +17,13 @@ variable "billing_cycle" { variable "plan" { description = "The server type to deploy" - default = "c2.medium.x86" + default = "c3.small.x86" type = string } -variable "facility" { +variable "metro" { description = "The location of the servers" - default = "sjc1" + default = "da" type = string } diff --git a/modules/install/assets/nfs-provisioner.sh b/modules/install/assets/nfs-provisioner.sh index e8a4ab1..760e8d2 100755 --- a/modules/install/assets/nfs-provisioner.sh +++ b/modules/install/assets/nfs-provisioner.sh @@ -7,9 +7,9 @@ BASTION_IP=$2 export KUBECONFIG=$RDIR/artifacts/install/auth/kubeconfig; # Pull NFS Provisioner manifests -curl https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs-client/deploy/rbac.yaml > $RDIR/artifacts/install/nfsp-rbac.yaml -curl https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs-client/deploy/deployment.yaml > $RDIR/artifacts/install/nfsp-deployment.yaml -curl https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs-client/deploy/class.yaml > $RDIR/artifacts/install/nfsp-class.yaml +curl -fsSL https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs-client/deploy/rbac.yaml > $RDIR/artifacts/install/nfsp-rbac.yaml +curl -fsSL https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs-client/deploy/deployment.yaml > $RDIR/artifacts/install/nfsp-deployment.yaml +curl -fsSL https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs-client/deploy/class.yaml > $RDIR/artifacts/install/nfsp-class.yaml # Retarget oc binary export oc=$RDIR/artifacts/oc diff --git a/modules/install/main.tf b/modules/install/main.tf index 8af6f35..d86dac7 100644 --- a/modules/install/main.tf +++ b/modules/install/main.tf @@ -94,7 +94,7 @@ resource "null_resource" "check_port" { inline = [<= 1 ? var.bootstrap_ip[0] : var.bastion_ip}:6443) != '403' ]]; do + while [[ $(curl -fsSL -k -s -o /dev/null -w ''%%{http_code}'' https://${length(var.bootstrap_ip) >= 1 ? var.bootstrap_ip[0] : var.bastion_ip}:6443) != '403' ]]; do ((i++)); echo "Waiting for TCP6443 on bootstrap/API (Retrying $i of 1200)"; sleep 2; diff --git a/modules/node/main.tf b/modules/node/main.tf index 4922297..04935e4 100644 --- a/modules/node/main.tf +++ b/modules/node/main.tf @@ -4,7 +4,7 @@ resource "metal_device" "node" { operating_system = "custom_ipxe" ipxe_script_url = "http://${var.bastion_ip}:8080/${var.node_type}.ipxe" plan = var.plan - facilities = [var.facility] + metro = var.metro count = var.node_count billing_cycle = "hourly" project_id = var.project_id diff --git a/modules/node/variables.tf b/modules/node/variables.tf index 285cbb2..16d0155 100644 --- a/modules/node/variables.tf +++ b/modules/node/variables.tf @@ -1,6 +1,6 @@ variable "plan" {} variable "node_count" {} -variable "facility" {} +variable "metro" {} variable "cluster_name" {} variable "cluster_basedomain" {} variable "ssh_private_key_path" {} diff --git a/modules/prereq/assets/get-ocp-installer.sh b/modules/prereq/assets/get-ocp-installer.sh index ec58e74..ad0c153 100755 --- a/modules/prereq/assets/get-ocp-installer.sh +++ b/modules/prereq/assets/get-ocp-installer.sh @@ -7,9 +7,9 @@ if [ -f $RDIR/artifacts/openshift-install.tar.gz ] && [ -f $RDIR/artifacts/oc.ta echo 'Openshift Installer Exists' else mkdir $RDIR/artifacts; - curl http://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest-${OCP_VERSION}/openshift-install-linux.tar.gz \ + curl -fsSL http://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest-${OCP_VERSION}/openshift-install-linux.tar.gz \ --output $RDIR/artifacts/openshift-install.tar.gz; - curl http://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz \ + curl -fsSL http://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz \ --output $RDIR/artifacts/oc.tar.gz; fi diff --git a/modules/prereq/assets/get-pull-secret.sh b/modules/prereq/assets/get-pull-secret.sh index 34289f1..e4226d8 100755 --- a/modules/prereq/assets/get-pull-secret.sh +++ b/modules/prereq/assets/get-pull-secret.sh @@ -2,7 +2,7 @@ export OFFLINE_ACCESS_TOKEN="$1" -export BEARER=$(curl \ +export BEARER=$(curl -fsSL \ --silent \ --data-urlencode "grant_type=refresh_token" \ --data-urlencode "client_id=cloud-services" \ @@ -10,7 +10,7 @@ export BEARER=$(curl \ https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token | \ jq -r .access_token) -export PULLSECRET=$(curl --silent -X POST https://api.openshift.com/api/accounts_mgmt/v1/access_token --header "Content-Type:application/json" --header "Authorization: Bearer $BEARER") +export PULLSECRET=$(curl -fsSL --silent -X POST https://api.openshift.com/api/accounts_mgmt/v1/access_token --header "Content-Type:application/json" --header "Authorization: Bearer $BEARER") ## Combine template outside of terraform: ##{ cat install-config.yaml.backup ; echo "pullSecret: '${PULLSECRET}'" ; } diff --git a/modules/sshkey/main.tf b/modules/sshkey/main.tf index f806c5c..02067be 100644 --- a/modules/sshkey/main.tf +++ b/modules/sshkey/main.tf @@ -21,7 +21,7 @@ resource "metal_ssh_key" "ssh_pub_key" { } resource "local_file" "cluster_private_key_pem" { - content = chomp(tls_private_key.ssh_key_pair.private_key_pem) + content = chomp(tls_private_key.ssh_key_pair.private_key_openssh) filename = pathexpand(format("~/.ssh/%s", local.ssh_key_name)) file_permission = "0600" } diff --git a/variables.tf b/variables.tf index e7213fb..9ed3580 100644 --- a/variables.tf +++ b/variables.tf @@ -30,19 +30,19 @@ variable "bastion_operating_system" { default = "rhel_7" } -variable "facility" { - description = "Your primary facility" - default = "da11" +variable "metro" { + description = "Your primary metro" + default = "da" } variable "plan_controlplane" { description = "Plan for Control Plane Nodes" - default = "c3.medium.x86" + default = "c3.small.x86" } variable "plan_compute" { description = "Plan for Compute Nodes" - default = "c2.medium.x86" + default = "c3.small.x86" } variable "count_bootstrap" { From 784e20b8b7162fad7f9b214bb9c3be75f14a8ab3 Mon Sep 17 00:00:00 2001 From: Marques Johansson Date: Thu, 27 Apr 2023 10:27:16 -0400 Subject: [PATCH 3/3] 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" }