From ac9629e5d094eb772660457b5a895decb189cc58 Mon Sep 17 00:00:00 2001 From: Simon Li Date: Mon, 4 Mar 2024 21:26:46 +0000 Subject: [PATCH 1/6] curvenote: double node size from r6a.2xlarge to r6a.4xlarge --- terraform/aws/curvenote/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/aws/curvenote/main.tf b/terraform/aws/curvenote/main.tf index ec6489923..c9facd723 100644 --- a/terraform/aws/curvenote/main.tf +++ b/terraform/aws/curvenote/main.tf @@ -38,9 +38,9 @@ module "binder-eks" { k8s_version = "1.26" k8s_api_cidrs = ["0.0.0.0/0"] number_azs = 1 - instance_type_wg1 = "r6a.2xlarge" + instance_type_wg1 = "r6a.4xlarge" use_bottlerocket = false - root_volume_size = 100 + root_volume_size = 200 wg1_size = 2 wg1_max_size = 2 From 9fb24e1444334d5e3a4b86279a32cdcf58d7afee Mon Sep 17 00:00:00 2001 From: Simon Li Date: Mon, 4 Mar 2024 21:31:30 +0000 Subject: [PATCH 2/6] curvenote: k8s 1.28 --- terraform/aws/curvenote/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/aws/curvenote/main.tf b/terraform/aws/curvenote/main.tf index c9facd723..545b640c6 100644 --- a/terraform/aws/curvenote/main.tf +++ b/terraform/aws/curvenote/main.tf @@ -35,7 +35,7 @@ module "binder-eks" { source = "../binder-eks" region = "us-east-2" cluster_name = "binderhub" - k8s_version = "1.26" + k8s_version = "1.28" k8s_api_cidrs = ["0.0.0.0/0"] number_azs = 1 instance_type_wg1 = "r6a.4xlarge" From 7375f10d4cff2b06e938b435ea7fd28de4a594cc Mon Sep 17 00:00:00 2001 From: Simon Li Date: Mon, 4 Mar 2024 22:35:57 +0000 Subject: [PATCH 3/6] curvenote: update .terraform.lock.hcl --- terraform/aws/curvenote/.terraform.lock.hcl | 138 ++++++++++---------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/terraform/aws/curvenote/.terraform.lock.hcl b/terraform/aws/curvenote/.terraform.lock.hcl index f071bf5d6..fa51a3fb3 100644 --- a/terraform/aws/curvenote/.terraform.lock.hcl +++ b/terraform/aws/curvenote/.terraform.lock.hcl @@ -2,104 +2,104 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "5.5.0" + version = "5.39.1" constraints = ">= 3.72.0, >= 4.0.0, >= 4.47.0, >= 4.57.0, >= 5.0.0, ~> 5.5" hashes = [ - "h1:WOweXv4ZjePZwdxuzE2UmRWOPhhcQDNxGu2wOcpHFWY=", - "zh:10fe0ef4191323c920c1844f27dbc88114547d5f78fad915c1769c908f40d916", - "zh:565fc7c3a1f42474fa75f143cb8115e11b894ed7fd9973569b00bd429fb92b4e", - "zh:5ba6132b1d442ed679ad8ea89fb5602aa0893e8dcd002a52ab3d76591aa18c8b", - "zh:5c2580630cd5034bae800445074c17950aea17f089bcdae7af637173122f8b03", - "zh:656d77220c6053fd5adb86d3bfb57dd42f98220d81590ffd643156ffeca36608", - "zh:65c7b3e333b734ce641735a23539d4fb392a675a5a9b892e8369781b1f3386a2", - "zh:682d55b2e6e9c40e20d679aa53d561797b1f3450e5187c9f4e8c359b69f06df3", - "zh:79ebc0993d6128819d70dd896cd743e3bab3e3cdc4c02f2a2dbd138471c23179", - "zh:8d44214c738f0410f829e1c761b021c92b3364daf9fcd08097216cc84eaff997", + "h1:hQLlAd6O1LdQHy1GdWtgT5fcOlc3TWW+SaaFkpe+e8E=", + "zh:05c50a5d8edb3ba4ebc4eb6e0d0b5e319142f5983b27821710ed7d475d335bdc", + "zh:082986a5784dd21957e632371b289e549f051a4ea21d5c78c6d744c3537f03c5", + "zh:192ae622ba562eacc4921ed549a794506179233d724fdd15a4f147f3400724a0", + "zh:19a1d4637a62de90b0da174c0bf01000cd900488f7e8f709d8a37f082c59756b", + "zh:1d7689a8583515f1705972d7ce57ccfab96215b19905530d2c78c02dcfaff583", + "zh:22c446a21209a52ab74b4ba1ede0b220531e97ce479430047e493a2c45e1d8cb", + "zh:4154de82290ab4e9f81bac1ea62342de8b3b7a608f99258c190d4dd1c6663e47", + "zh:6bc4859ccdc54f28af9286b2fa090a31dcb345138d68c471510b737f6a052011", + "zh:73c69e000e0b321e78a4a12fef60d37285f2afec0ea7be9e06163d985101cb59", + "zh:890a3422f5e445b49bae30facf448d0ec9cd647e9155d0b685b5b39e9d331a94", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:a0b1bc008e95c5a7285f5e7dd116ce60ba7a6c1c3bd8ac3e3b63d4e1438d8e49", - "zh:cf40fb60efc5df42fc5716c7e458868251c82fc78b623f12d1bc994b6fcc7ef2", - "zh:cfd8f3f391cddecfc5e44fe57f0633067470e9038517115ba69d8ee533d5d74e", - "zh:d6552490599e02a756e72b7091b591493cee25548ce7120ad05210b4ff2492bd", - "zh:f77dfe665fd4b3d9e36fdc989d7feff4cf6bf17161c0b1a0f25a0fcf402c779d", + "zh:9cd88bec0f5205df9032e3126d4e57edd1c5cc8d45cda25626882dafc485a3b0", + "zh:a3a8e3276d0fbf051bbafa192a2998b05745f2cf285ac8c36a9ad167a75c037f", + "zh:d47e4dcf4c0ad71b9a7c720be4f3a89f6786a82e77bbe8d950794562792a1da5", + "zh:f74e5b2af508c7de80a6ae5198df54a795eeba5058a0cd247828943f0c54f6e0", ] } provider "registry.terraform.io/hashicorp/cloudinit" { - version = "2.3.2" + version = "2.3.3" constraints = ">= 2.0.0" hashes = [ - "h1:Vl0aixAYTV/bjathX7VArC5TVNkxBCsi3Vq7R4z1uvc=", - "zh:2487e498736ed90f53de8f66fe2b8c05665b9f8ff1506f751c5ee227c7f457d1", - "zh:3d8627d142942336cf65eea6eb6403692f47e9072ff3fa11c3f774a3b93130b3", - "zh:434b643054aeafb5df28d5529b72acc20c6f5ded24decad73b98657af2b53f4f", - "zh:436aa6c2b07d82aa6a9dd746a3e3a627f72787c27c80552ceda6dc52d01f4b6f", - "zh:458274c5aabe65ef4dbd61d43ce759287788e35a2da004e796373f88edcaa422", - "zh:54bc70fa6fb7da33292ae4d9ceef5398d637c7373e729ed4fce59bd7b8d67372", + "h1:U6EC4/cJJ6Df3LztUQ/I4YuljGQQeQ+LdLndAwSSiTs=", + "zh:0bd6ee14ca5cf0f0c83d3bb965346b1225ccd06a6247e80774aaaf54c729daa7", + "zh:3055ad0dcc98de1d4e45b72c5889ae91b62f4ae4e54dbc56c4821be0fdfbed91", + "zh:32764cfcff0d7379ca8b7dde376ac5551854d454c5881945f1952b785a312fa2", + "zh:55c2a4dc3ebdeaa1dec3a36db96dab253c7fa10b9fe1209862e1ee77a01e0aa1", + "zh:5c71f260ba5674d656d12f67cde3bb494498e6b6b6e66945ef85688f185dcf63", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:893ba267e18749c1a956b69be569f0d7bc043a49c3a0eb4d0d09a8e8b2ca3136", - "zh:95493b7517bce116f75cdd4c63b7c82a9d0d48ec2ef2f5eb836d262ef96d0aa7", - "zh:9ae21ab393be52e3e84e5cce0ef20e690d21f6c10ade7d9d9d22b39851bfeddc", - "zh:cc3b01ac2472e6d59358d54d5e4945032efbc8008739a6d4946ca1b621a16040", - "zh:f23bfe9758f06a1ec10ea3a81c9deedf3a7b42963568997d84a5153f35c5839a", + "zh:9617280a853ec7caedb8beb7864e4b29faf9c850a453283980c28fccef2c493d", + "zh:ac8bda21950f8dddade3e9bc15f7bcfdee743738483be5724169943cafa611f5", + "zh:ba9ab567bbe63dee9197a763b3104ea9217ba27449ed54d3afa6657f412e3496", + "zh:effd1a7e34bae3879c02f03ed3afa979433a518e11de1f8afd35a8710231ac14", + "zh:f021538c86d0ac250d75e59efde6d869bbfff711eb744c8bddce79d2475bf46d", + "zh:f1e3984597948a2103391a26600e177b19f16a5a4c66acee27a4343fb141571f", ] } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.21.1" + version = "2.26.0" constraints = ">= 2.10.0, ~> 2.21" hashes = [ - "h1:gP8IU3gFfXYRfGZr5Qws9JryZsOGsluAVpiAoZW7eo0=", - "zh:156a437d7edd6813e9cb7bdff16ebce28cec08b07ba1b0f5e9cec029a217bc27", - "zh:1a21c255d8099e303560e252579c54e99b5f24f2efde772c7e39502c62472605", - "zh:27b2021f86e5eaf6b9ee7c77d7a9e32bc496e59dd0808fb15a5687879736acf6", - "zh:31fa284c1c873a85c3b5cfc26cf7e7214d27b3b8ba7ea5134ab7d53800894c42", - "zh:4be9cc1654e994229c0d598f4e07487fc8b513337de9719d79b45ce07fc4e123", - "zh:5f684ed161f54213a1414ac71b3971a527c3a6bfbaaf687a7c8cc39dcd68c512", - "zh:6d58f1832665c256afb68110c99c8112926406ae0b64dd5f250c2954fc26928e", - "zh:9dadfa4a019d1e90decb1fab14278ee2dbefd42e8f58fe7fa567a9bf51b01e0e", - "zh:a68ce7208a1ef4502528efb8ce9f774db56c421dcaccd3eb10ae68f1324a6963", - "zh:acdd5b45a7e80bc9d254ad0c2f9cb4715104117425f0d22409685909a790a6dd", + "h1:MMxX/EY9AEGwp5DbGQ+LTd3c9YmjwrnPJHLlyc9u0eU=", + "zh:3f8ee1bffab1ba4f6ae549daae1648974214880d3606b6821cb0aceb365284a4", + "zh:5596b1248231cc3b8f6a98f5b78df7120cd3153fd2b34b369dc20356a75bf35b", + "zh:64420c9e4aa49c5e443afcd60f3e8d293ea6bd78797d402e21e23605f7757954", + "zh:8327a488854e15f8d7eaf8272c3b9d6d1d9a6e68212a8dcb111d7b4023aac6b5", + "zh:94c1c9b65280847d28a3e90e5046650858ac0bf87feefd2349336444e21e68e8", + "zh:a3fb0b0b4bfd1844bb94011ae80111cedc188085235cf466313ca2151e75c8ca", + "zh:ab5e381928144e0c2a9d9768a48e38797642e5c5fb2184370c7c08df500e5db3", + "zh:da78995e8d6daf3acfd4c455ebbd12f6bf154cadf455f14ef35c0862e58dd2ec", + "zh:e24cdd5b90196df93215f40d821af3a7b4473c53992be4c3038940d117a50eb4", + "zh:e632efb3bce6d089b7c08507660af8b2c5e3f94c34fe401bfa228f154405e26e", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fb451e882118fe92e1cb2e60ac2d77592f5f7282b3608b878b5bdc38bbe4fd5b", + "zh:f5aea9da0eba25d35fee49db193c4b44cd3746a5578065092c62a53077e50b84", ] } provider "registry.terraform.io/hashicorp/time" { - version = "0.9.1" + version = "0.10.0" constraints = ">= 0.9.0" hashes = [ - "h1:NUv/YtEytDQncBQ2mTxnUZEy/rmDlPYmE9h2iokR0vk=", - "zh:00a1476ecf18c735cc08e27bfa835c33f8ac8fa6fa746b01cd3bcbad8ca84f7f", - "zh:3007f8fc4a4f8614c43e8ef1d4b0c773a5de1dcac50e701d8abc9fdc8fcb6bf5", - "zh:5f79d0730fdec8cb148b277de3f00485eff3e9cf1ff47fb715b1c969e5bbd9d4", + "h1:EeF/Lb4db1Kl1HEHzT1StTC7RRqHn/eB7aDR3C3yjVg=", + "zh:0ab31efe760cc86c9eef9e8eb070ae9e15c52c617243bbd9041632d44ea70781", + "zh:0ee4e906e28f23c598632eeac297ab098d6d6a90629d15516814ab90ad42aec8", + "zh:3bbb3e9da728b82428c6f18533b5b7c014e8ff1b8d9b2587107c966b985e5bcc", + "zh:6771c72db4e4486f2c2603c81dfddd9e28b6554d1ded2996b4cb37f887b467de", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8c8094689a2bed4bb597d24a418bbbf846e15507f08be447d0a5acea67c2265a", - "zh:a6d9206e95d5681229429b406bc7a9ba4b2d9b67470bda7df88fa161508ace57", - "zh:aa299ec058f23ebe68976c7581017de50da6204883950de228ed9246f309e7f1", - "zh:b129f00f45fba1991db0aa954a6ba48d90f64a738629119bfb8e9a844b66e80b", - "zh:ef6cecf5f50cda971c1b215847938ced4cb4a30a18095509c068643b14030b00", - "zh:f1f46a4f6c65886d2dd27b66d92632232adc64f92145bf8403fe64d5ffa5caea", - "zh:f79d6155cda7d559c60d74883a24879a01c4d5f6fd7e8d1e3250f3cd215fb904", - "zh:fd59fa73074805c3575f08cd627eef7acda14ab6dac2c135a66e7a38d262201c", + "zh:833c636d86c2c8f23296a7da5d492bdfd7260e22899fc8af8cc3937eb41a7391", + "zh:c545f1497ae0978ffc979645e594b57ff06c30b4144486f4f362d686366e2e42", + "zh:def83c6a85db611b8f1d996d32869f59397c23b8b78e39a978c8a2296b0588b2", + "zh:df9579b72cc8e5fac6efee20c7d0a8b72d3d859b50828b1c473d620ab939e2c7", + "zh:e281a8ecbb33c185e2d0976dc526c93b7359e3ffdc8130df7422863f4952c00e", + "zh:ecb1af3ae67ac7933b5630606672c94ec1f54b119bf77d3091f16d55ab634461", + "zh:f8109f13e07a741e1e8a52134f84583f97a819e33600be44623a21f6424d6593", ] } provider "registry.terraform.io/hashicorp/tls" { - version = "4.0.4" - constraints = ">= 3.0.0" + version = "4.0.5" + constraints = ">= 3.0.0, ~> 4.0" hashes = [ - "h1:pe9vq86dZZKCm+8k1RhzARwENslF3SXb9ErHbQfgjXU=", - "zh:23671ed83e1fcf79745534841e10291bbf34046b27d6e68a5d0aab77206f4a55", - "zh:45292421211ffd9e8e3eb3655677700e3c5047f71d8f7650d2ce30242335f848", - "zh:59fedb519f4433c0fdb1d58b27c210b27415fddd0cd73c5312530b4309c088be", - "zh:5a8eec2409a9ff7cd0758a9d818c74bcba92a240e6c5e54b99df68fff312bbd5", - "zh:5e6a4b39f3171f53292ab88058a59e64825f2b842760a4869e64dc1dc093d1fe", - "zh:810547d0bf9311d21c81cc306126d3547e7bd3f194fc295836acf164b9f8424e", - "zh:824a5f3617624243bed0259d7dd37d76017097dc3193dac669be342b90b2ab48", - "zh:9361ccc7048be5dcbc2fafe2d8216939765b3160bd52734f7a9fd917a39ecbd8", - "zh:aa02ea625aaf672e649296bce7580f62d724268189fe9ad7c1b36bb0fa12fa60", - "zh:c71b4cd40d6ec7815dfeefd57d88bc592c0c42f5e5858dcc88245d371b4b8b1e", - "zh:dabcd52f36b43d250a3d71ad7abfa07b5622c69068d989e60b79b2bb4f220316", + "h1:e4LBdJoZJNOQXPWgOAG0UuPBVhCStu98PieNlqJTmeU=", + "zh:01cfb11cb74654c003f6d4e32bbef8f5969ee2856394a96d127da4949c65153e", + "zh:0472ea1574026aa1e8ca82bb6df2c40cd0478e9336b7a8a64e652119a2fa4f32", + "zh:1a8ddba2b1550c5d02003ea5d6cdda2eef6870ece86c5619f33edd699c9dc14b", + "zh:1e3bb505c000adb12cdf60af5b08f0ed68bc3955b0d4d4a126db5ca4d429eb4a", + "zh:6636401b2463c25e03e68a6b786acf91a311c78444b1dc4f97c539f9f78de22a", + "zh:76858f9d8b460e7b2a338c477671d07286b0d287fd2d2e3214030ae8f61dd56e", + "zh:a13b69fb43cb8746793b3069c4d897bb18f454290b496f19d03c3387d1c9a2dc", + "zh:a90ca81bb9bb509063b736842250ecff0f886a91baae8de65c8430168001dad9", + "zh:c4de401395936e41234f1956ebadbd2ed9f414e6908f27d578614aaa529870d4", + "zh:c657e121af8fde19964482997f0de2d5173217274f6997e16389e7707ed8ece8", + "zh:d68b07a67fbd604c38ec9733069fbf23441436fecf554de6c75c032f82e1ef19", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } From 86152d827715d82638a490d9dd6aa449cdc72b5a Mon Sep 17 00:00:00 2001 From: Simon Li Date: Mon, 4 Mar 2024 22:36:36 +0000 Subject: [PATCH 4/6] Update to 1.27 first (only single minor update allowed) --- terraform/aws/curvenote/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/aws/curvenote/main.tf b/terraform/aws/curvenote/main.tf index 545b640c6..391589ab7 100644 --- a/terraform/aws/curvenote/main.tf +++ b/terraform/aws/curvenote/main.tf @@ -35,7 +35,7 @@ module "binder-eks" { source = "../binder-eks" region = "us-east-2" cluster_name = "binderhub" - k8s_version = "1.28" + k8s_version = "1.27" k8s_api_cidrs = ["0.0.0.0/0"] number_azs = 1 instance_type_wg1 = "r6a.4xlarge" From 29aee45c5116079ccf6da66a62f061067480a8f9 Mon Sep 17 00:00:00 2001 From: Simon Li Date: Tue, 5 Mar 2024 00:02:37 +0000 Subject: [PATCH 5/6] k8s 1.28 --- terraform/aws/curvenote/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/aws/curvenote/main.tf b/terraform/aws/curvenote/main.tf index 391589ab7..545b640c6 100644 --- a/terraform/aws/curvenote/main.tf +++ b/terraform/aws/curvenote/main.tf @@ -35,7 +35,7 @@ module "binder-eks" { source = "../binder-eks" region = "us-east-2" cluster_name = "binderhub" - k8s_version = "1.27" + k8s_version = "1.28" k8s_api_cidrs = ["0.0.0.0/0"] number_azs = 1 instance_type_wg1 = "r6a.4xlarge" From df05588b09d6477da9a3d2c6f3c807b36d8f0c4f Mon Sep 17 00:00:00 2001 From: Simon Li Date: Tue, 5 Mar 2024 10:47:44 +0000 Subject: [PATCH 6/6] k8s 1.29 --- terraform/aws/curvenote/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/aws/curvenote/main.tf b/terraform/aws/curvenote/main.tf index 545b640c6..e045a7179 100644 --- a/terraform/aws/curvenote/main.tf +++ b/terraform/aws/curvenote/main.tf @@ -35,7 +35,7 @@ module "binder-eks" { source = "../binder-eks" region = "us-east-2" cluster_name = "binderhub" - k8s_version = "1.28" + k8s_version = "1.29" k8s_api_cidrs = ["0.0.0.0/0"] number_azs = 1 instance_type_wg1 = "r6a.4xlarge"