Merge pull request #360 from bottlerocket-os/develop

vigh-m · web-flow · commit b758cd1fd8ae · 2025-01-24T11:18:41.000-08:00
Merge changes from develop to 5.4.x for 5.4.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+# v5.4.2 (2025-01-24)
+
+## OS Changes
+
+* Update nvidia-container-toolkit and libnvidia-container to v1.17.4 ([#358])
+
+## Build Changes
+
+* Update Bottlerocket SDK to v0.50.1 ([#345])
+
+## Orchestrator Changes
+
+### Kubernetes
+* Update EKS 1.28-1.31 versions to latest ([#356])
+
+[#358]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/358
+[#345]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/345
+[#356]: https://github.com/bottlerocket-os/bottlerocket-core-kit/pull/356
+
 # v5.4.1 (2025-01-16)
 
 ## OS Change
diff --git a/Twoliter.lock b/Twoliter.lock
@@ -3,7 +3,7 @@ kit = []
 
 [sdk]
 name = "bottlerocket-sdk"
-version = "0.50.0"
+version = "0.50.1"
 vendor = "bottlerocket"
-source = "public.ecr.aws/bottlerocket/bottlerocket-sdk:v0.50.0"
-digest = "Rjpy/gVgBhU/B696xaK1Y4/drz4pNJu+fyyZSIk9oLE="
+source = "public.ecr.aws/bottlerocket/bottlerocket-sdk:v0.50.1"
+digest = "HEh3Lx3F6P4OEPnFubF++RMpMW2vlfp/Tc/tGjnBRcM="
diff --git a/Twoliter.toml b/Twoliter.toml
@@ -1,10 +1,10 @@
 schema-version = 1
-release-version = "5.4.1"
+release-version = "5.4.2"
 
 [vendor.bottlerocket]
 registry = "public.ecr.aws/bottlerocket"
 
 [sdk]
 name = "bottlerocket-sdk"
-version = "0.50.0"
+version = "0.50.1"
 vendor = "bottlerocket"
diff --git a/advisories/3.3.0/BRSA-udcwjbo4nlwj.toml b/advisories/3.3.0/BRSA-udcwjbo4nlwj.toml
@@ -0,0 +1,22 @@
+[advisory]
+id = "BRSA-udcwjbo4nlwj"
+title = "nvidia-container-toolkit CVE-2024-0135"
+cve = "CVE-2024-0135"
+severity = "high"
+description = "A flaw was found in the NVIDIA Container Toolkit where a specially crafted container image could lead to modification of a host binary."
+
+[[advisory.products]]
+package-name = "nvidia-container-toolkit"
+patched-version = "1.17.1"
+patched-epoch = "1"
+
+[[advisory.products]]
+package-name = "libnvidia-container"
+patched-version = "1.17.1"
+patched-epoch = "1"
+
+[updateinfo]
+author = "giinglis"
+issue-date = 2024-11-12T21:04:22Z
+arches = ["aarch64", "x86_64"]
+version = "3.3.0"
diff --git a/packages/kubernetes-1.28/Cargo.toml b/packages/kubernetes-1.28/Cargo.toml
@@ -14,8 +14,8 @@ path = "../packages.rs"
 package-name = "kubernetes-1.28"
 
 [[package.metadata.build-package.external-files]]
-url = "https://distro.eks.amazonaws.com/kubernetes-1-28/releases/38/artifacts/kubernetes/v1.28.15/kubernetes-src.tar.gz"
-sha512 = "5eee692289fc554b0001c588a5d4a4c5eeaf6a5919d815a1575d3ffa5758b743f1de6850779f45cfe3ed002a58cc6a74660e0332662bba88d8b9ebf5668896c7"
+url = "https://distro.eks.amazonaws.com/kubernetes-1-28/releases/41/artifacts/kubernetes/v1.28.15/kubernetes-src.tar.gz"
+sha512 = "0aef3a3b300d8e3d1b22357ee118077b45dd235a06ae318bcca440964b116267f71c523e49021457f1ff7cdd1f3c558be0b1c477a0ce6efd288f471d23152515"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/kubernetes-1.28/kubernetes-1.28.spec b/packages/kubernetes-1.28/kubernetes-1.28.spec
@@ -38,7 +38,7 @@ Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause
 URL: https://%{goimport}
-Source0: https://distro.eks.amazonaws.com/kubernetes-1-28/releases/38/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
+Source0: https://distro.eks.amazonaws.com/kubernetes-1-28/releases/41/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
 Source1: kubelet.service
 Source2: kubelet-env
 Source3: kubelet-config
diff --git a/packages/kubernetes-1.29/Cargo.toml b/packages/kubernetes-1.29/Cargo.toml
@@ -14,8 +14,8 @@ path = "../packages.rs"
 package-name = "kubernetes-1.29"
 
 [[package.metadata.build-package.external-files]]
-url = "https://distro.eks.amazonaws.com/kubernetes-1-29/releases/27/artifacts/kubernetes/v1.29.11/kubernetes-src.tar.gz"
-sha512 = "c06e7b45164363ed18667222d8cabbfc07c346cfd7243b3ff49ac7b3b47ca9ce5630d33eb6d1823dc70579a5cff0378dcd9a1c7078b66217f6e2a4d4c4d909f6"
+url = "https://distro.eks.amazonaws.com/kubernetes-1-29/releases/30/artifacts/kubernetes/v1.29.12/kubernetes-src.tar.gz"
+sha512 = "8dce868ee0e168f4f5779541c5b0b3dbe13c88311e511db87faff9f8ff1326806d0ddab19ad897e6a1041d08ab8b78149f9ad7b07706b27b5697fbf9d2d6c91b"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/kubernetes-1.29/kubernetes-1.29.spec b/packages/kubernetes-1.29/kubernetes-1.29.spec
@@ -10,7 +10,7 @@
 %global gorepo kubernetes
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 1.29.11
+%global gover 1.29.12
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0
@@ -38,7 +38,7 @@ Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause
 URL: https://%{goimport}
-Source0: https://distro.eks.amazonaws.com/kubernetes-1-29/releases/27/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
+Source0: https://distro.eks.amazonaws.com/kubernetes-1-29/releases/30/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
 Source1: kubelet.service
 Source2: kubelet-env
 Source3: kubelet-config
diff --git a/packages/kubernetes-1.30/Cargo.toml b/packages/kubernetes-1.30/Cargo.toml
@@ -14,8 +14,8 @@ path = "../packages.rs"
 package-name = "kubernetes-1.30"
 
 [[package.metadata.build-package.external-files]]
-url = "https://distro.eks.amazonaws.com/kubernetes-1-30/releases/20/artifacts/kubernetes/v1.30.7/kubernetes-src.tar.gz"
-sha512 = "590651f6bee133079e2d0907d1242b9b57b7254436f7206118f24239d57ee232d9755b94e85cf153471ccf63345896ae1de5c7df0d1543fe3ff478b871aed5b1"
+url = "https://distro.eks.amazonaws.com/kubernetes-1-30/releases/23/artifacts/kubernetes/v1.30.8/kubernetes-src.tar.gz"
+sha512 = "06d308d962354ab763871a613fcbc83992b1e84482a90a7a0a7c218cd19c80471095c204dd416c8947547a0faf4ec3f0490bfef12ec663abc6db5af0727d9a9b"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/kubernetes-1.30/kubernetes-1.30.spec b/packages/kubernetes-1.30/kubernetes-1.30.spec
@@ -10,7 +10,7 @@
 %global gorepo kubernetes
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 1.30.7
+%global gover 1.30.8
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0
@@ -38,7 +38,7 @@ Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause
 URL: https://%{goimport}
-Source0: https://distro.eks.amazonaws.com/kubernetes-1-30/releases/20/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
+Source0: https://distro.eks.amazonaws.com/kubernetes-1-30/releases/23/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
 Source1: kubelet.service
 Source2: kubelet-env
 Source3: kubelet-config
diff --git a/packages/kubernetes-1.31/Cargo.toml b/packages/kubernetes-1.31/Cargo.toml
@@ -14,8 +14,8 @@ path = "../packages.rs"
 package-name = "kubernetes-1.31"
 
 [[package.metadata.build-package.external-files]]
-url = "https://distro.eks.amazonaws.com/kubernetes-1-31/releases/9/artifacts/kubernetes/v1.31.3/kubernetes-src.tar.gz"
-sha512 = "c383516d9661ef5545dbd88194b805e913571bd78b709373b4601dd15d95020812d14eea33836a692fdb14a4c1d7be0b328723e4f8adcfc4685649c4ccecfa14"
+url = "https://distro.eks.amazonaws.com/kubernetes-1-31/releases/12/artifacts/kubernetes/v1.31.4/kubernetes-src.tar.gz"
+sha512 = "822cb865536757b1e62e3799a36dc2e2bde914aedef7a4e8179946a363a5bfd415d0c5a0f4c1ad031266b429cea2faff5fa75f12f63ac13cb25525b40ecd1dd4"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/kubernetes-1.31/kubernetes-1.31.spec b/packages/kubernetes-1.31/kubernetes-1.31.spec
@@ -10,7 +10,7 @@
 %global gorepo kubernetes
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 1.31.3
+%global gover 1.31.4
 %global rpmver %{gover}
 
 %global _dwz_low_mem_die_limit 0
@@ -38,7 +38,7 @@ Summary: Container cluster management
 # base Apache-2.0, third_party Apache-2.0 AND BSD-3-Clause
 License: Apache-2.0 AND BSD-3-Clause
 URL: https://%{goimport}
-Source0: https://distro.eks.amazonaws.com/kubernetes-1-31/releases/9/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
+Source0: https://distro.eks.amazonaws.com/kubernetes-1-31/releases/12/artifacts/kubernetes/v%{gover}/kubernetes-src.tar.gz
 Source1: kubelet.service
 Source2: kubelet-env
 Source3: kubelet-config
diff --git a/packages/libnvidia-container/Cargo.toml b/packages/libnvidia-container/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://github.com/NVIDIA/libnvidia-container/releases"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/NVIDIA/libnvidia-container/archive/v1.17.3/libnvidia-container-1.17.3.tar.gz"
-sha512 = "24293e369fea42ebe64163464f600808c0d18e8b4efeea12095de22e16d43837cb6441f46baf52e8c966810c76b0f5045737a96d173e2ecf8cd15fff37cd4c4f"
+url = "https://github.com/NVIDIA/libnvidia-container/archive/v1.17.4/libnvidia-container-1.17.4.tar.gz"
+sha512 = "a5edb4eec8cc4a9bd221c3cbb14515656854700b1a6aef7b47147d96b67511d5cfcae38c740fd946452768da0f993edf6c656697cd01189de88b67a4ae00aae5"
 
 [[package.metadata.build-package.external-files]]
 url = "https://github.com/NVIDIA/nvidia-modprobe/archive/550.54.14/nvidia-modprobe-550.54.14.tar.gz"
diff --git a/packages/libnvidia-container/libnvidia-container.spec b/packages/libnvidia-container/libnvidia-container.spec
@@ -1,7 +1,7 @@
 %global nvidia_modprobe_version 550.54.14
 
 Name: %{_cross_os}libnvidia-container
-Version: 1.17.3
+Version: 1.17.4
 Release: 1%{?dist}
 Epoch: 1
 Summary: NVIDIA container runtime library
diff --git a/packages/nvidia-container-toolkit/Cargo.toml b/packages/nvidia-container-toolkit/Cargo.toml
@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://github.com/NVIDIA/nvidia-container-toolkit/releases"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.17.3/nvidia-container-toolkit-1.17.3.tar.gz"
-sha512 = "8c7a4290a1decc448c72e9a09213e0dc4e418ec633cefb16bb6b01fef7c502d23ed72cc1f3cc6583cad07feae5ca3cf44dad73e1274e042e3b26bdc7a4152b95"
+url = "https://github.com/NVIDIA/nvidia-container-toolkit/archive/v1.17.4/nvidia-container-toolkit-1.17.4.tar.gz"
+sha512 = "ba79670cfc5e0abec388af858f2f7f1a153c5bc90f0b9540ffc6a095b8724f08c329742bc22cdc700299e063668bf574a7ac0bfa4c964763370c9b0500d5057c"
 
 [build-dependencies]
 glibc = { path = "../glibc" }
diff --git a/packages/nvidia-container-toolkit/nvidia-container-toolkit.spec b/packages/nvidia-container-toolkit/nvidia-container-toolkit.spec
@@ -2,7 +2,7 @@
 %global gorepo nvidia-container-toolkit
 %global goimport %{goproject}/%{gorepo}
 
-%global gover 1.17.3
+%global gover 1.17.4
 %global rpmver %{gover}
 
 Name: %{_cross_os}nvidia-container-toolkit
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/clarify.toml b/sources/clarify.toml
diff --git a/sources/deny.toml b/sources/deny.toml
