Merge pull request #4283 from KCSesh/pick-1.26.2

Prepare 1.26.2 in 1.26.x
bottlerocket-os · Nov 4, 2024 · 360b7a3 · 360b7a3
2 parents 943d9a4 + 17297f2
commit 360b7a3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git 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

diff --git 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.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
@@ -1,5 +1,5 @@
 schema-version = 1
-release-version = "1.26.1"
+release-version = "1.26.2"
 
 [vendor.bottlerocket]
 registry = "public.ecr.aws/bottlerocket"
@@ -11,5 +11,5 @@ vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "3.1.1"
+version = "3.1.5"
 vendor = "bottlerocket"