From 21352608d1e898c3ac8cc90e03922fe3eb7b3bc0 Mon Sep 17 00:00:00 2001
From: "Sean P. Kelly" <seankell@amazon.com>
Date: Sat, 2 Nov 2024 00:11:12 +0000
Subject: [PATCH 1/3] twoliter: bump to bottlerocket-core-kit v3.1.5

(cherry picked from commit 10b79701c148743b192ffc6ca53512d6ddb222ba)
---
 Twoliter.lock | 6 +++---
 Twoliter.toml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Twoliter.lock b/Twoliter.lock
index d08e8fd61a8..9d23d4db94d 100644
--- a/Twoliter.lock
+++ b/Twoliter.lock
@@ -9,7 +9,7 @@ digest = "V2lUX6Rs9rZLg8POxV7P785Mr5nallfyxor0Scrvh3Y="
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "3.1.1"
+version = "3.1.5"
 vendor = "bottlerocket"
-source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v3.1.1"
-digest = "8P5eQMZxig/1Ix7oOZ7NO7c5yKdKXVd6Zu8cPQW9MTI="
+source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v3.1.5"
+digest = "727tW1DGSJOH5D0oiQVur9lB6l63+Rpxuvx2Ovu1PI4="
diff --git a/Twoliter.toml b/Twoliter.toml
index a9688125b45..1681041f8ac 100644
--- a/Twoliter.toml
+++ b/Twoliter.toml
@@ -11,5 +11,5 @@ vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "3.1.1"
+version = "3.1.5"
 vendor = "bottlerocket"

From 4e683b1752e58da6b6c0f8fc86b6eb29d5313565 Mon Sep 17 00:00:00 2001
From: Kyle Sessions <kssessio@amazon.com>
Date: Mon, 4 Nov 2024 18:36:17 +0000
Subject: [PATCH 2/3] release: update Bottlerocket version to 1.26.2

Signed-off-by: Kyle Sessions <kssessio@amazon.com>
(cherry picked from commit 7029a02522689d647ee921c1b919144effb38a0b)
---
 Release.toml  | 3 ++-
 Twoliter.toml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Release.toml b/Release.toml
index 399281e04e5..10314a49664 100644
--- a/Release.toml
+++ b/Release.toml
@@ -1,4 +1,4 @@
-version = "1.26.1"
+version = "1.26.2"
 
 [migrations]
 "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -367,3 +367,4 @@ version = "1.26.1"
 ]
 "(1.25.0, 1.26.0)" = []
 "(1.26.0, 1.26.1)" = []
+"(1.26.1, 1.26.2)" = []
diff --git a/Twoliter.toml b/Twoliter.toml
index 1681041f8ac..8050bfe6c1e 100644
--- a/Twoliter.toml
+++ b/Twoliter.toml
@@ -1,5 +1,5 @@
 schema-version = 1
-release-version = "1.26.1"
+release-version = "1.26.2"
 
 [vendor.bottlerocket]
 registry = "public.ecr.aws/bottlerocket"

From 17297f26e664be23282013f3d41f0a79e67e3f5c Mon Sep 17 00:00:00 2001
From: Kyle Sessions <kssessio@amazon.com>
Date: Mon, 4 Nov 2024 18:43:56 +0000
Subject: [PATCH 3/3] changelog: add 1.26.2 release notes

Signed-off-by: Kyle Sessions <kssessio@amazon.com>
(cherry picked from commit 9d619e056fc8d3e71f573e5fa1b94aeeb1e9b0b4)
---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 993cdd8b811..880287e3c69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# v1.26.2 (2024-11-04)
+
+## Release Highlights
+* Wait for kubelet device-manager socket before starting nvidia-k8s-device-plugin ([bottlerocket-core-kit#238](https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/238))
+
+## Build Changes
+
+### OS Changes
+* Update bottlerocket-core-kit to 3.1.5 ([#4280])
+
+[#4280]: https://github.com/bottlerocket-os/bottlerocket/pull/4280
+
 # v1.26.1 (2024-10-24)
 
 ## Release Highlights