diff --git a/deployment/terraform/environments/oss-vdb-test/.terraform.lock.hcl b/deployment/terraform/environments/oss-vdb-test/.terraform.lock.hcl index 426b636df94..d7c8cab1fb3 100644 --- a/deployment/terraform/environments/oss-vdb-test/.terraform.lock.hcl +++ b/deployment/terraform/environments/oss-vdb-test/.terraform.lock.hcl @@ -31,36 +31,41 @@ provider "registry.terraform.io/hashicorp/external" { } provider "registry.terraform.io/hashicorp/google" { - version = "4.80.0" + version = "5.2.0" + constraints = "~> 5.2.0" hashes = [ - "h1:2GKhnCFsq7PI7NstLEbSLO0cIG+ueuZM4PdVuKKvtXA=", - "h1:2k00/l0+sHXTEki03kZeNlsyUREa22WbA5S/Y3j+ar8=", - "h1:A79d3yjnaGCbKU6m9mWmlQcRc34UsXiKUyix00tC46k=", - "h1:Qo3ZiqnumrQcA1jVCsF9ewvMjkf7M9QGVJ11wIhU4y4=", - "h1:SviyRPKEtISguVTlBr5LcoygMq7ubupDoRygeHYZjHk=", - "h1:aNrX87IEvpZdvWmCxKxU/b/OKgC2RgMXcXT9qCBF16Q=", - "h1:eybpnZBGAw6+RHPduszy9yuedC70sj1QTj6nJ7TbUVI=", - "h1:g0ypb/BK/CuGLR6TMuBm2QlqtdhooVQIZA/9N1dgx4Y=", - "h1:lOoeHZBO3vvkjA9cLUl3Qp/u4XtEaqa5sZQ37QTcaIs=", - "h1:t4qxRlTvZ3ZTfaYYAAGqqZlxHD55b9uFlnheBV2wUg0=", - "h1:wg2tU9Txa+uU9eXl1Tm1xQnOVLQXe3umflRa5QlFY3k=", + "h1:GuKgYrg5q36jxuqrntYHEhnCSsHoNm0tb1af8x8+WLc=", + "zh:1d4c5b154d4764a0e3e8893193dc71ba5a4cdb2d9d9dd20f69312cc75399b038", + "zh:26c5c6ad5edc27c643f43d950ffe982267b732723a09fef74c672ede7a7459f7", + "zh:2b48824692ecc7fe8ae3366010a7cf8b441aa2ecb4b6e9777638952844eff19e", + "zh:2f77cbb0528e58228117c7976e8864e7604614123c8b33d7329ffb0d084505b9", + "zh:408e6a680c4b7235dc677b8ba6ccbda0bf07ffcbd3d13767474eea2c5177488f", + "zh:68c2e914cf71ff490b4dbc6487900c35f702285cb0047614eccafb6ff057b748", + "zh:849052c81c2ea4c703b22af9ae524d3f45e42c7e9a3553c1ff7a95f49fde6886", + "zh:8f764a4ddcd5eea9f81cc72bb2fd29e2549a91b66faf8df8583c584298a26a86", + "zh:dddc597b4af5e2dc772ec4291e39daffb4dc46f2cccde1d3a6d2cbe8d291743d", + "zh:de9752d744bd91fd35e589fea0d8a72f983fe6fc872cfd19841758dcb8629a3b", + "zh:ec40d112e5022e2ba408bdfab1fd2d4f30c0183db02a771fdf26cd3a8c7e9949", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "4.80.0" + version = "5.2.0" hashes = [ - "h1:0L3KXXVb0liVvWlNJoxDvgb6Gs4pCgT/iIR/v2dKrDc=", - "h1:EKNYKpN6/Urr9Am0NFnMRy/lb6IamWXeXdQfM+DOe4M=", - "h1:Gwer5v5wNOJg8F9UvDAcksngP4lGbNjE5AkfpoVdDLQ=", - "h1:GxdgC45f+nvwbrLlrgPu+2cMb6Z2mVf6Rw//Z9/efbs=", - "h1:S/ZbHK00AFvTOVxjwwMfOMCJi1DC3gQOvfmwRh1uSEw=", - "h1:W6kK0kw/V6w0orPkUIhZXWqvHJtmlUdBt+Dry1ZCZR4=", - "h1:b+ptWMt9FvSVG4cXmHtJyI8sSp1iHsPcy2PEhWvvy2Q=", - "h1:drCUOZLrX7fbOuKCRRfcEEx+lv6kxvzsCzx5eOWp5qU=", - "h1:oURZmE82CNvKIxO7mLuaKVjtNQSqIy+vOGmzO81tHLc=", - "h1:rDE/sAUykoZIjJgl3qgUwbePo1Xalb9WFAjnkVKxkzQ=", - "h1:tua0uDSBfGbG49U8rn3lJ//CnEEwPlvs9jUpF+fePME=", + "h1:BU2RJbanotVXVA6EWPLgT1X0ktSPnU8DXRPWKmuGzwU=", + "zh:09834404dd19d9191d29a2a58a6838ecd9f70b54e24e39c75f3063d4345671e5", + "zh:34c8564245834b2f8a2ed7e70880b1553e79dd55083cdadc0791fb2f611cd5a1", + "zh:7ee42223685859efea71bfe90c2b0e37a1ef0b79d523c415fa4196c307dc6024", + "zh:898c2038a828dce2a5acd497a60dd1074cd06f7c45a3b17f3fb7351d61f87f11", + "zh:8d46416318f51f38291724af1c0758abc45424c5f6e76e7405da6284e017e23a", + "zh:a1cb9ddf8f9aca6970efb349cf70fcffa051eb73675137d585a1da857ed2d47f", + "zh:b2f906c9261c7d9ce978f0f2915e26c829a363358d49c788e6cdbb3ebe7965b9", + "zh:b35f0c6167860f2014287336bc52f3c9cd6f5c5e0a1488ac76c2f8dc929077d4", + "zh:b6157769ad44e7e31aed666cdda5cd7e697ec422e0b94c28ba88a393fa5abfbe", + "zh:e15b215803700dae0ff68545f66c56a596e399ad3ecb1a76a924d9bc185b4385", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f9c8fac2a1500b647c9fab69cb5e29c2207c0f1682e497deaf0007ed226e8e4b", ] } diff --git a/deployment/terraform/environments/oss-vdb-test/main.tf b/deployment/terraform/environments/oss-vdb-test/main.tf index cec5e8513f1..22a5b60b56d 100644 --- a/deployment/terraform/environments/oss-vdb-test/main.tf +++ b/deployment/terraform/environments/oss-vdb-test/main.tf @@ -19,4 +19,23 @@ terraform { bucket = "oss-vdb-tf" prefix = "oss-vdb-test" } + + required_providers { + google = { + source = "hashicorp/google" + version = "~> 5.2.0" + } + google-beta = { + source = "hashicorp/google-beta" + version = "~> 5.2.0" + } + external = { + source = "hashicorp/external" + version = "~> 2.3.1" + } + null = { + source = "hashicorp/null" + version = "~> 3.2.1" + } + } } diff --git a/deployment/terraform/environments/oss-vdb/.terraform.lock.hcl b/deployment/terraform/environments/oss-vdb/.terraform.lock.hcl index 426b636df94..028b742cad5 100644 --- a/deployment/terraform/environments/oss-vdb/.terraform.lock.hcl +++ b/deployment/terraform/environments/oss-vdb/.terraform.lock.hcl @@ -31,36 +31,42 @@ provider "registry.terraform.io/hashicorp/external" { } provider "registry.terraform.io/hashicorp/google" { - version = "4.80.0" + version = "5.2.0" + constraints = "~> 5.2.0" hashes = [ - "h1:2GKhnCFsq7PI7NstLEbSLO0cIG+ueuZM4PdVuKKvtXA=", - "h1:2k00/l0+sHXTEki03kZeNlsyUREa22WbA5S/Y3j+ar8=", - "h1:A79d3yjnaGCbKU6m9mWmlQcRc34UsXiKUyix00tC46k=", - "h1:Qo3ZiqnumrQcA1jVCsF9ewvMjkf7M9QGVJ11wIhU4y4=", - "h1:SviyRPKEtISguVTlBr5LcoygMq7ubupDoRygeHYZjHk=", - "h1:aNrX87IEvpZdvWmCxKxU/b/OKgC2RgMXcXT9qCBF16Q=", - "h1:eybpnZBGAw6+RHPduszy9yuedC70sj1QTj6nJ7TbUVI=", - "h1:g0ypb/BK/CuGLR6TMuBm2QlqtdhooVQIZA/9N1dgx4Y=", - "h1:lOoeHZBO3vvkjA9cLUl3Qp/u4XtEaqa5sZQ37QTcaIs=", - "h1:t4qxRlTvZ3ZTfaYYAAGqqZlxHD55b9uFlnheBV2wUg0=", - "h1:wg2tU9Txa+uU9eXl1Tm1xQnOVLQXe3umflRa5QlFY3k=", + "h1:GuKgYrg5q36jxuqrntYHEhnCSsHoNm0tb1af8x8+WLc=", + "zh:1d4c5b154d4764a0e3e8893193dc71ba5a4cdb2d9d9dd20f69312cc75399b038", + "zh:26c5c6ad5edc27c643f43d950ffe982267b732723a09fef74c672ede7a7459f7", + "zh:2b48824692ecc7fe8ae3366010a7cf8b441aa2ecb4b6e9777638952844eff19e", + "zh:2f77cbb0528e58228117c7976e8864e7604614123c8b33d7329ffb0d084505b9", + "zh:408e6a680c4b7235dc677b8ba6ccbda0bf07ffcbd3d13767474eea2c5177488f", + "zh:68c2e914cf71ff490b4dbc6487900c35f702285cb0047614eccafb6ff057b748", + "zh:849052c81c2ea4c703b22af9ae524d3f45e42c7e9a3553c1ff7a95f49fde6886", + "zh:8f764a4ddcd5eea9f81cc72bb2fd29e2549a91b66faf8df8583c584298a26a86", + "zh:dddc597b4af5e2dc772ec4291e39daffb4dc46f2cccde1d3a6d2cbe8d291743d", + "zh:de9752d744bd91fd35e589fea0d8a72f983fe6fc872cfd19841758dcb8629a3b", + "zh:ec40d112e5022e2ba408bdfab1fd2d4f30c0183db02a771fdf26cd3a8c7e9949", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/google-beta" { - version = "4.80.0" + version = "5.2.0" + constraints = "~> 5.2.0" hashes = [ - "h1:0L3KXXVb0liVvWlNJoxDvgb6Gs4pCgT/iIR/v2dKrDc=", - "h1:EKNYKpN6/Urr9Am0NFnMRy/lb6IamWXeXdQfM+DOe4M=", - "h1:Gwer5v5wNOJg8F9UvDAcksngP4lGbNjE5AkfpoVdDLQ=", - "h1:GxdgC45f+nvwbrLlrgPu+2cMb6Z2mVf6Rw//Z9/efbs=", - "h1:S/ZbHK00AFvTOVxjwwMfOMCJi1DC3gQOvfmwRh1uSEw=", - "h1:W6kK0kw/V6w0orPkUIhZXWqvHJtmlUdBt+Dry1ZCZR4=", - "h1:b+ptWMt9FvSVG4cXmHtJyI8sSp1iHsPcy2PEhWvvy2Q=", - "h1:drCUOZLrX7fbOuKCRRfcEEx+lv6kxvzsCzx5eOWp5qU=", - "h1:oURZmE82CNvKIxO7mLuaKVjtNQSqIy+vOGmzO81tHLc=", - "h1:rDE/sAUykoZIjJgl3qgUwbePo1Xalb9WFAjnkVKxkzQ=", - "h1:tua0uDSBfGbG49U8rn3lJ//CnEEwPlvs9jUpF+fePME=", + "h1:BU2RJbanotVXVA6EWPLgT1X0ktSPnU8DXRPWKmuGzwU=", + "zh:09834404dd19d9191d29a2a58a6838ecd9f70b54e24e39c75f3063d4345671e5", + "zh:34c8564245834b2f8a2ed7e70880b1553e79dd55083cdadc0791fb2f611cd5a1", + "zh:7ee42223685859efea71bfe90c2b0e37a1ef0b79d523c415fa4196c307dc6024", + "zh:898c2038a828dce2a5acd497a60dd1074cd06f7c45a3b17f3fb7351d61f87f11", + "zh:8d46416318f51f38291724af1c0758abc45424c5f6e76e7405da6284e017e23a", + "zh:a1cb9ddf8f9aca6970efb349cf70fcffa051eb73675137d585a1da857ed2d47f", + "zh:b2f906c9261c7d9ce978f0f2915e26c829a363358d49c788e6cdbb3ebe7965b9", + "zh:b35f0c6167860f2014287336bc52f3c9cd6f5c5e0a1488ac76c2f8dc929077d4", + "zh:b6157769ad44e7e31aed666cdda5cd7e697ec422e0b94c28ba88a393fa5abfbe", + "zh:e15b215803700dae0ff68545f66c56a596e399ad3ecb1a76a924d9bc185b4385", + "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f9c8fac2a1500b647c9fab69cb5e29c2207c0f1682e497deaf0007ed226e8e4b", ] } diff --git a/deployment/terraform/environments/oss-vdb/main.tf b/deployment/terraform/environments/oss-vdb/main.tf index e3d547066d9..9c9c9b08caa 100644 --- a/deployment/terraform/environments/oss-vdb/main.tf +++ b/deployment/terraform/environments/oss-vdb/main.tf @@ -19,4 +19,22 @@ terraform { bucket = "oss-vdb-tf" prefix = "oss-vdb" } + required_providers { + google = { + source = "hashicorp/google" + version = "~> 5.2.0" + } + google-beta = { + source = "hashicorp/google-beta" + version = "~> 5.2.0" + } + external = { + source = "hashicorp/external" + version = "~> 2.3.1" + } + null = { + source = "hashicorp/null" + version = "~> 3.2.1" + } + } } diff --git a/deployment/terraform/modules/osv/workers_gke.tf b/deployment/terraform/modules/osv/workers_gke.tf index bcbbf92cf02..01a07d25a7f 100644 --- a/deployment/terraform/modules/osv/workers_gke.tf +++ b/deployment/terraform/modules/osv/workers_gke.tf @@ -107,11 +107,11 @@ resource "google_container_node_pool" "highend" { workloadType = "highend" } - taint = [{ + taint { effect = "NO_EXECUTE" key = "workloadType" value = "highend" - }] + } } } @@ -143,11 +143,11 @@ resource "google_container_node_pool" "importer_pool" { workloadType = "importer-pool" } - taint = [{ + taint { effect = "NO_EXECUTE" key = "workloadType" value = "importer-pool" - }] + } } }