From f4da533d78d250b2a21e46336e42602931dc0c7c Mon Sep 17 00:00:00 2001 From: Armaan Tobaccowalla Date: Sun, 7 Nov 2021 11:25:21 -0500 Subject: [PATCH 1/2] Update providers --- terraform/.terraform.lock.hcl | 199 +++++++++++++++++++++------------- terraform/provider.tf | 2 +- 2 files changed, 124 insertions(+), 77 deletions(-) diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl index 0ec8ff53..f3651e0f 100644 --- a/terraform/.terraform.lock.hcl +++ b/terraform/.terraform.lock.hcl @@ -2,58 +2,81 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/cyrilgdn/postgresql" { - version = "1.11.2" + version = "1.14.0" constraints = "~> 1.8" hashes = [ - "h1:jxA3dCAzKazh0vLXUTOrvQF349QZkwLnmSqkd2rwvtY=", - "zh:0e1c014d74454e11abc03ed6f8b765e322ffab7d0d42f9690bc8000616a7dc5f", - "zh:10b6443b1eda9af0be7cbcc0c707cfe41d89ec2b8962892f788613641b2a2a9f", - "zh:209b6e36308befe6032a4c92f9cd7d8b01b1dd35924cce4005797a7c3f164987", - "zh:2838aff2a2d144d63c22c465364de58016d89589ded05c46ab6cb5bd5fdeb5c5", - "zh:37ed32b4f7c388cfcbaf97efec552e889fc298376a5888ed5c4201734578cc40", - "zh:4a46115298aab30b16f9b120fc63674e9f08e63ebd36d1c4d635e09ea27967ad", - "zh:4e3911b21fa2ecf2eb793691d3cf4a7fbb8c70fa27ee8f5bcdd667e8002e16d5", - "zh:52cdcc9c1ceaae14256db53e8d1bcf182f58177ddd0640c816b26e5ef729b139", - "zh:6a4cc872e93abc5ff5cf96b720f40e4e29e76c952c3f66d4d225e40c425d8a38", - "zh:c708fbc279fcc5f1eba6aa0a359767fb97802c85f70d50ef023645244fdf23a5", - "zh:d7d7d14c6e4442fc87af3e267bfad74885d0ad106e4feb02f9e659f1f14300f0", + "h1:QyrI7ZVtwZsz39bDCkSfXdoH/VEuQlBQKhEfD1Z7BWo=", + "zh:0752d45a210dc6f12c816ff28cc1e7525c3d645513696928f8338f35809efd23", + "zh:4d09fb054cd115a56a216772e366f66ca2e6a042e282bbbe4797ed27ef6a20e1", + "zh:6775aec3648c1346778a2973c6c315b3bc56cfa0d39e361093c7f605ee45083f", + "zh:69ca89054e769425503dc3bc5dc46e5d9b66423febe569d9dc51073bfcd07533", + "zh:833868737a1b0dda5a1bc751495e81c0c64abf24f14ed46af7bd73797e9b2ddc", + "zh:c8ca05ac00f605f893428577dc65175fe446ab45780b0d1f51eb5a414a4ec924", + "zh:d337c9c3413d29b6c53b9dd41af562b09a21246a185ecd40b97578badbd5c795", + "zh:d387e0f06e7a77e966bea3b76219ccff6eba00ba753eea6655603dd9478059d3", + "zh:e2dee5a0af2b2fd9c6ae66ab70c6fdd4cdf1fb42c52c0e11f5e3a982dad52cd6", + "zh:e9c270d57688ab581fd2aa54895d97f998f9aca5dc7fc21323683c87fb8af140", + "zh:ead7cc067582c674fe49223337be9f15d30381dd9798711df4d66ac55a343f88", + "zh:eede7aefe3374d48b7ce82b34a33d4baf3c598d4b5ecad6d72c72b28ed30aba8", + "zh:ff9cfd21dfcb425f5d27254b3d213f400dd3549c6be751a77836ecade0e47f82", ] } provider "registry.terraform.io/hashicorp/aws" { - version = "3.33.0" - constraints = ">= 2.0.0, >= 2.68.0, >= 3.3.0, ~> 3.18" + version = "3.64.2" + constraints = ">= 2.0.0, >= 2.68.0, ~> 3.18, >= 3.40.0, >= 3.56.0" hashes = [ - "h1:UJcZV5+xJmHHDCsm+s8+xMonccZvVD0jdGwHAoi7nJg=", - "zh:0e89b10323a59de9dd6f286423cc172cb1733683d654c886493c3bd4e43e6290", - "zh:288df55f0f4fac1e920cfa61616ac42a4e4414bd7a637902db03d0c7101f14ca", - "zh:303c9136c5bf97e6c1deda6e27f0d0931fe0eaaab547bf219b996623fb0ad522", - "zh:457a5da9f323e2781942df534153d000ea81727798ee0771177009d84b04aad7", - "zh:857fa3e29cc25ace76556a5edfded41628a3380cebf457e627576a83084852f8", - "zh:85e1eb383372f834630fac7b02ec9ae1e33d24d61cf5a7d832583a16e6b5add4", - "zh:9dd01eb05ac73146ac5f25421b7683fe4bffec23e408162887e1265f9bfe8462", - "zh:b1561e1335754ec93a54f45c18dc1cab70f38bc08adf244d793791134f5641ef", - "zh:bb96f57b80e3d94ee4bc05a5450fdd796424272b46cfc67ff9d094d5316c5fac", - "zh:e4ce241d8b5dd1124dc0f1da6c0840ab777de8717dac6e76afbbad9883f5ce34", - "zh:f2b292e813844d6d611db89017fc420ac05f2e3b25324e3c893481d375e23396", + "h1:oFsgTmmt/eJ8KLo59PSmYu/irUHJiPnQEey0VqaOOck=", + "zh:0b029a2282beabfe410eb2969e18ca773d3473415e442be4dc8ce0eb6d1cd8c5", + "zh:3209de3266a1138f1ccb09f094fdd98b6f55afc06e291db0abe092ec5dbe7640", + "zh:40648266551631cbc15f8a76e80faf300510e3b38c2544d43fc25e37e6802727", + "zh:483c8af92ae70146f2790a70c1a810251e7135aa912b66e769c934eddceebe32", + "zh:4d106d8d415d8df342f3f85e58c35418e6c55e3cb7f02897f832cefac4dca68c", + "zh:972626a6ddb31d5216606d12ab5c30fbf8d51ed2bbe0efcdd7cffa68c1141557", + "zh:a230d55ec52b1695148d40296877ee23e0b302e817154f9b838eb117c87b13fa", + "zh:c95fddfbd7f870db949da0601323e866e0f0fb0d4a93e96725ae5b88029e84d5", + "zh:ea0c7f568074f835f22273c8e7e61e87f5277e32004c72122915fd3c8df49ccc", + "zh:f96d25887e6e2d2ae47659e2c586efea2167995b59a479ae65a02b097da86474", + "zh:fe7502d8e52d3b5ccb2b3c178e7ea894344783093aa71ffb20e978914c976182", + ] +} + +provider "registry.terraform.io/hashicorp/cloudinit" { + version = "2.2.0" + constraints = ">= 2.0.0" + hashes = [ + "h1:tQLNREqesrdCQ/bIJnl0+yUK+XfdWzAG0wo4lp10LvM=", + "zh:76825122171f9ea2287fd27e23e80a7eb482f6491a4f41a096d77b666896ee96", + "zh:795a36dee548e30ca9c9d474af9ad6d29290e0a9816154ad38d55381cd0ab12d", + "zh:9200f02cb917fb99e44b40a68936fd60d338e4d30a718b7e2e48024a795a61b9", + "zh:a33cf255dc670c20678063aa84218e2c1b7a67d557f480d8ec0f68bc428ed472", + "zh:ba3c1b2cd0879286c1f531862c027ec04783ece81de67c9a3b97076f1ce7f58f", + "zh:bd575456394428a1a02191d2e46af0c00e41fd4f28cfe117d57b6aeb5154a0fb", + "zh:c68dd1db83d8437c36c92dc3fc11d71ced9def3483dd28c45f8640cfcd59de9a", + "zh:cbfe34a90852ed03cc074601527bb580a648127255c08589bc3ef4bf4f2e7e0c", + "zh:d6ffd7398c6d1f359b96f5b757e77b99b339fbb91df1b96ac974fe71bc87695c", + "zh:d9c15285f847d7a52df59e044184fb3ba1b7679fd0386291ed183782683d9517", + "zh:f7dd02f6d36844da23c9a27bb084503812c29c1aec4aba97237fec16860fdc8c", ] } provider "registry.terraform.io/hashicorp/github" { - version = "4.5.2" + version = "4.17.0" hashes = [ - "h1:7H2CZZoOFRe7BEZukBPjasgNlb4TNWrneUrRVCDFjR4=", - "zh:0bd14b4ab08970fd95a6e6f9de0ea128949e31d03dbf9b24b8a585d000f9d186", - "zh:22970d45ff5abc671574133397cca711b18b2fecf71fdb72ac37f4e16cb1ef59", - "zh:3f976037e257fe153b592bf0e95c182ad8bee859c5ad364c017855b67c977e83", - "zh:8468ef880152de2d576a2a436842ab30fce5edd16b9eb11be9768ffd4e22c8ee", - "zh:a752d1625449c2f769372e0f4291f9c81aa132880379186ed7ec18a851f46093", - "zh:ac74cbc20bf1f80228b25c0a37e0729f8e7f0b79f6aa9ee98eda595724bfaa5d", - "zh:b643023d50b2d261d11beb86e61d5bf7e579b517ec6b8a8abfe26e2a8a8481f4", - "zh:c098ac282a8bff702456a080a26d088002e36726ff961cb3f3d87aa5db874098", - "zh:c45027c4aa80f5ae14a6b81afbae0f10f161d9417eaa1da157caa7eb7db22d9f", - "zh:d905cb43ea3f3eadff73a4ccaf88933fc32513813230bfed8d6f5b039d74a9fe", - "zh:de4d157a176681fba735c5fb060278c9a986be5827908c5089c14cbd54e29b74", + "h1:sZeGxNQ/Xt9hbAPiH3s+JPFtdYA5fH3GwdgzuPf6uJ0=", + "zh:172fc888630839a4e2097fa2e5fc490ca2e5c5639b8c0ed8cd8aa4656382a270", + "zh:18d7a0e7c9083516a9ed03eab31d29d625ffc9ba2364ecb8669b6a1c4a6f5154", + "zh:1a3f97c624371d63c2e9797dcec16792cbbecc64f533d5dfe68e675c5d900a57", + "zh:5a18b3ab9270a3c679c992aa48651d9a8a2135d961bfba401f534bce77e358a9", + "zh:5c7c9c3b4592f118367bc9577e708ec6e4ec747a992093421c84544c893b76e1", + "zh:72fa658a47e250f5f71cb4655401c08fad4d64f9728608a3c8186ed98967cf4b", + "zh:81eb8825e1c0520e1dc8ac001c2c723176cce45799e663f9c2d8e66330c36518", + "zh:987375ee8f6805dfc896b5916857d3426dbd3ac9fbdbe500bde4fc20257027a4", + "zh:b88f9e18b14d42f0918df915a713540854636ac665572a02481ce01ac16a200e", + "zh:c66c7979d1cede2ba574e18c5642a3d3c89716c73d3ba5f74c2cdee4503b8ead", + "zh:cd2e26bb885e0936bcd6db7e27610af0887fb5646746edbb0ec53d8c50184c31", + "zh:d0d796840d949e9139f7767eb23eb2b2afa592f724cbad2dca509617c80cd0c6", + "zh:ecf9dfadfa291f641580d6a3d0fe6c3b12507f5eebb72ead4f59786c53188c9b", ] } @@ -76,20 +99,21 @@ provider "registry.terraform.io/hashicorp/helm" { } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "1.13.3" + version = "1.13.4" constraints = ">= 1.11.1, ~> 1.13" hashes = [ - "h1:whoGs/NeucMF8U/urPaeXdQUb+ppaO1Ae4r5aJRhfrU=", - "zh:11fd58df9c297a4f3cab82ce8eb2f54f1be27f78fa23be2273ecd545ab254b91", - "zh:5b9e6f352c5666d791e2658a1d18bf0990f3ab70c99c916c393a2ee7f385364c", - "zh:5c94f1350471a5c8e8ee6675874608c506a0bfd3164bdd91b802842723547e2c", - "zh:5d9c5c44dba9addbb86491339012096e74778bb4ea93b70f12333bffba3d05e6", - "zh:6336f9cbb0b580f247cebb97fb7d4cc5e7fe9cc734d8d958d84c4ea3f1e24041", - "zh:bca3b9d4dcbe6f804f5611a83add371dc03b5aa92271f60ebdc2216bfedfab28", - "zh:cbcdc87a593090f490f7899f4f2d302e0c7023155591fcf65e6fadd69f5452f0", - "zh:ec2886a1adbfe3c861b2deb9446369111b9c6116701ae73ef372dc7df5bb3c9e", - "zh:edb5b4172610672bb4d7425511961fda2047b8a00675b99ae6887cd2ece4bda9", - "zh:ff7ea7743246181ea739643d7751c37041c4016eb6bbc39beb1e3b4e99629112", + "h1:xZ0YM8/XezNWMhWKHWWVW8CQA7QzA1eJnXyYoq3R9uk=", + "zh:0658034b1b0e241f6d6fc8dac2073755dcbab8f82645c0a46cec052469c518b2", + "zh:11a08ffa9b86670711cb8f2754ac8034b0cdf3d9bad4f3c22695f749a892c630", + "zh:3e90e15a58f699f22bcbe27d3cf45064f9e1a2f1fb50992afc6ea55a59100d4c", + "zh:5e5a335655e40ceb4576af3790aead62646942972c206f49a3dc52275d925f11", + "zh:6bbf068c35380e75fbd7f5186c37175c6058bd6160d59957a023af3e4c9f43c5", + "zh:6bd839cce4ce786201b3d0d43b6ad80e3bf9642f74b1490b9cf72ca8d8c90575", + "zh:804ba2f1d03f315b071434fd7201eeb1e705fcb82f9a1dc4bec760e4231becfa", + "zh:957963a9f287589836a56be24bb9a172919f5a3f18098adb9f185f2a6699680b", + "zh:b099aea7f5213450f3b0d4e439aeb83aba965920b89474aa94f2bc0d6f698fe7", + "zh:b8d610a387f0df4b4c5c27b9319749d1bf60b01c69ea65d2d129c2a61afa0c7b", + "zh:cbf56221840b360befc00fe2336a9236d1ff0f32456453030ed6f58b49deb8df", ] } @@ -169,37 +193,60 @@ provider "registry.terraform.io/hashicorp/template" { } provider "registry.terraform.io/hashicorp/time" { - version = "0.7.0" + version = "0.7.2" constraints = "~> 0.6" hashes = [ - "h1:1VPBq+jeoCf0wVCxnzK6BNnOmNbXf3fRnDmS43Jw7Oo=", - "zh:1f53008d9d445ac56da84eb548fc2354fe1b120703d788bf47f460e4aec18b85", - "zh:327c26cec73e7aa4bc0bb156c1a10f3f053d8f8af35c4b9e59ccb371e82dfed5", - "zh:38beff8856deb579251889192b49f29d674e24c605070a0bf6c694c8664e9d02", - "zh:56aee9534d32a1cbeee76920bc0a19d85dc51454f26a6ef5ec9db6598748001e", - "zh:79b96a8cd365ab1ec4d11f2f816fb07c67cfb50d337d8f9fac06b56c6c325f73", - "zh:7fd11d98b9547c04365ff85d8f9d27a294a14d0e16683a4927810963ad6172a4", - "zh:85f6ebf6dab5333158549123d92aec89c6c617673e0fd50b5e999c24e8973e44", - "zh:a26fd2c3eecbec7d6549e33fac80d4a1498f4ac5b8089c1a1632b97708230103", - "zh:a597d56f6765f493855e50542cba96b46b80104b918ec89f05195e5c3f7e6db0", - "zh:ef6ab738eb260de05e3d67a442cbe5c988189fcf26c976864888e3100e6a8d09", + "h1:YYLAfhMFP5nhV2iZPslqsLkZN+6sZo7gMJW7pLcLfM8=", + "zh:0bbe0158c2a9e3f5be911b7e94477586110c51746bb13d102054f22754565bda", + "zh:3250af7fd49b8aaf2ccc895588af05197d886e38b727e3ba33bcbb8cc96ad34d", + "zh:35e4de0437f4fa9c1ad69aaf8136413be2369ea607d78e04bb68dc66a6a520b8", + "zh:369756417a6272e79cad31eb2c82c202f6a4b6e4204a893f656644ba9e149fa2", + "zh:390370f1179d89b33c3a0731691e772d5450a7d59fc66671ec625e201db74aa2", + "zh:3d12ac905259d225c685bc42e5507ed0fbdaa5a09c30dce7c1932d908df857f7", + "zh:75f63e5e1c68e6c5bccba4568c3564e2774eb3a7a19189eb8e2b6e0d58c8f8cc", + "zh:7c22a2078a608e3e0278c4cbc9c483909062ebd1843bddaf8f176346c6d378b1", + "zh:7cfb3c02f78f0060d59c757c4726ab45a962ce4a9cf4833beca704a1020785bd", + "zh:a0325917f47c28a2ed088dedcea0d9520d91b264e63cc667fe4336ac993c0c11", + "zh:c181551d4c0a40b52e236f1755cc340aeca0fb5dcfd08b3b1c393a7667d2f327", ] } provider "registry.terraform.io/hashicorp/vault" { - version = "2.19.0" + version = "2.24.1" constraints = "~> 2.16" hashes = [ - "h1:ZF9gGmvcqyM6KRoBwynQ01C+FtWS9s96sukTP+HMEyI=", - "zh:3aa278b0ddb522270233673250fd01bf46422b995f85ab862e40264b68f72181", - "zh:4fdc08743deb2c0c79ad8d459f6643fd0c75aac785c4a903103b35a98da1229a", - "zh:55dad60c6d23a842db85fa79f6601f689cd761ae24256662923c5c5f7b735ce5", - "zh:7e891e189773f9bb506048783c913207c73363117942a05101bfb1b9ab6e4634", - "zh:852862a3868ceb3e52cf120d7c40c12b304847bbdfdd801f6fa367ae4926fe56", - "zh:9844a25a2ad10f52e7c7898143be90c1fe7bba51c0fbbc05e7219629c08ac044", - "zh:a4e42e987ae7c0d868b8848802b189a98b86133461f2b9ecd4ec0f798b855e6f", - "zh:b1950043668e3a9654e7aaa8fa6de960e31f07a3546df4cd57d4ff50e247f1ad", - "zh:faae594a8683d58070ec4362fa606e59518052823c51065f28c4013b674d2976", - "zh:fd0cc6a461c144ae4b6c427be84bbafa057a6a7906fc3b50a972148d0e6072b4", + "h1:MUzJ+jOOPBoyGNWGjESE+t2rIjTobw08Y73jgU+d+EU=", + "zh:1968be03bbc83c9f512a60f0a018cb0cf4c9a4a0f9e606f9a7436ae06108200f", + "zh:23ef25b530dcf2f60692e261d2a56c112138d79a739f2c720bee818cf040a20f", + "zh:2b80879cf8110254eeeb55b36ce542e9cdaefc047d450368ff0ca631b29d41d6", + "zh:3d803047407a4e7ccb51cd88b38648e50517e70b97842ae1262b5c5a92eb8ede", + "zh:7edfd0323a839903e7fc5f45acce8dd61c43b356c09016e1bd43d6880bd82be6", + "zh:7efa2c6d1d0bac9478adb27fc68035ca9dc2107dae55d921a760a8ad237eb691", + "zh:a1f9d34e2ac8b3a3d177faef4f11690068919ef7d73256def6685cfd9282f83d", + "zh:a6c34746e0085ae49e3845fc58597d2d5778fcb2136fedb413b3e30ba77dd2bd", + "zh:a73eb4bc061b5babd7ea4d5f3f85f4b4c6d379982098411a29a7d7459fc37ab2", + "zh:aadecf464ead4ae30821495d8181e842c18a2537c018245509a96532eeaf7678", + "zh:e3ae8c48804065fa4f85095002f945adbd5cd3966c0b1afced7d839007586105", + ] +} + +provider "registry.terraform.io/terraform-aws-modules/http" { + version = "2.4.1" + constraints = ">= 2.4.1" + hashes = [ + "h1:ZnkXcawrIr611RvZpoDzbtPU7SVFyHym+7p1t+PQh20=", + "zh:0111f54de2a9815ded291f23136d41f3d2731c58ea663a2e8f0fef02d377d697", + "zh:0740152d76f0ccf54f4d0e8e0753739a5233b022acd60b5d2353d248c4c17204", + "zh:569518f46809ec9cdc082b4dfd4e828236eee2b50f87b301d624cfd83b8f5b0d", + "zh:7669f7691de91eec9f381e9a4be81aa4560f050348a86c6ea7804925752a01bb", + "zh:81cd53e796ec806aca2d8e92a2aed9135661e170eeff6cf0418e54f98816cd05", + "zh:82f01abd905090f978b169ac85d7a5952322a5f0f460269dd981b3596652d304", + "zh:9a235610066e0f7e567e69c23a53327271a6fc568b06bf152d8fe6594749ed2b", + "zh:aeabdd8e633d143feb67c52248c85358951321e35b43943aeab577c005abd30a", + "zh:c20d22dba5c79731918e7192bc3d0b364d47e98a74f47d287e6cc66236bc0ed0", + "zh:c4fea2cb18c31ed7723deec5ebaff85d6795bb6b6ed3b954794af064d17a7f9f", + "zh:e21e88b6e7e55b9f29b046730d9928c65a4f181fd5f60a42f1cd41b46a0a938d", + "zh:eddb888a74dea348a0acdfee13a08875bacddde384bd9c28342a534269665568", + "zh:f46d5f1403b8d8dfafab9bdd7129d3080bb62a91ea726f477fd43560887b8c4a", ] } diff --git a/terraform/provider.tf b/terraform/provider.tf index d926880c..ce6c3d38 100644 --- a/terraform/provider.tf +++ b/terraform/provider.tf @@ -29,7 +29,7 @@ provider "postgresql" { } provider "github" { - organization = "pennlabs" + owner = "pennlabs" } terraform { From d4e8d947b6e36b776c528e59949198179f479561 Mon Sep 17 00:00:00 2001 From: Armaan Tobaccowalla Date: Sun, 7 Nov 2021 15:59:24 -0500 Subject: [PATCH 2/2] Configure EKS for fargate --- terraform/eks.tf | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/terraform/eks.tf b/terraform/eks.tf index 51b57d6e..70456e9b 100644 --- a/terraform/eks.tf +++ b/terraform/eks.tf @@ -1,14 +1,16 @@ // Production module "eks-production" { // https://registry.terraform.io/modules/terraform-aws-modules/eks/aws/latest - source = "terraform-aws-modules/eks/aws" - version = "13.2.1" - cluster_name = local.k8s_cluster_name - cluster_version = "1.18" - subnets = module.vpc.private_subnets - vpc_id = module.vpc.vpc_id - write_kubeconfig = false - enable_irsa = true + source = "terraform-aws-modules/eks/aws" + version = "17.23.0" + cluster_name = local.k8s_cluster_name + cluster_version = "1.18" + subnets = module.vpc.private_subnets + vpc_id = module.vpc.vpc_id + write_kubeconfig = false + enable_irsa = true + cluster_endpoint_private_access = true + worker_create_cluster_primary_security_group_rules = true map_roles = [ { rolearn = aws_iam_role.kubectl.arn @@ -27,6 +29,23 @@ module "eks-production" { public_ip = true }, ] + // fargate_profiles = { + // default = { + // name = "default" + // selectors = [ + // { + // namespace = "cert-manager" + // }, + // { + // namespace = "default" + // }, + // { + // namespace = "kube-system" + // }, + // ] + // } + // } + tags = { created-by = "terraform" }