Merge pull request bottlerocket-os#4735 from ytsssun/k8s-135-support

variants: add k8s-1.35 variants

Author: ytsssun

Cargo.lock

@@ -25,6 +25,8 @@ members = [
     "variants/aws-k8s-1.33-fips",
     "variants/aws-k8s-1.34",
     "variants/aws-k8s-1.34-fips",
+    "variants/aws-k8s-1.35",
+    "variants/aws-k8s-1.35-fips",
     "variants/aws-k8s-1.29-nvidia",
     "variants/aws-k8s-1.29-nvidia-fips",
     "variants/aws-k8s-1.30-nvidia",
@@ -37,6 +39,8 @@ members = [
     "variants/aws-k8s-1.33-nvidia-fips",
     "variants/aws-k8s-1.34-nvidia",
     "variants/aws-k8s-1.34-nvidia-fips",
+    "variants/aws-k8s-1.35-nvidia",
+    "variants/aws-k8s-1.35-nvidia-fips",
     "variants/metal-dev",
     "variants/vmware-dev",
     "variants/vmware-k8s-1.29",
@@ -51,6 +55,8 @@ members = [
     "variants/vmware-k8s-1.33-fips",
     "variants/vmware-k8s-1.34",
     "variants/vmware-k8s-1.34-fips",
+    "variants/vmware-k8s-1.35",
+    "variants/vmware-k8s-1.35-fips",
 ]
 
 [profile.dev]

Cargo.toml

@@ -67,12 +67,14 @@ The following variants support EKS, as described above:
 * `aws-k8s-1.32`
 * `aws-k8s-1.33`
 * `aws-k8s-1.34`
+* `aws-k8s-1.35`
 * `aws-k8s-1.29-nvidia`
 * `aws-k8s-1.30-nvidia`
 * `aws-k8s-1.31-nvidia`
 * `aws-k8s-1.32-nvidia`
 * `aws-k8s-1.33-nvidia`
 * `aws-k8s-1.34-nvidia`
+* `aws-k8s-1.35-nvidia`
 
 The following variants support ECS:
 
@@ -90,6 +92,7 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware:
 * `vmware-k8s-1.32`
 * `vmware-k8s-1.33`
 * `vmware-k8s-1.34`
+* `vmware-k8s-1.35`
 
 The following variants are no longer supported:
 

README.md

@@ -17,7 +17,7 @@ digest = "+iBHhekVVER58JhyEFs3aSGdYb2D55lG6vVgNvXm9A0="
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "12.0.1"
+version = "12.2.0"
 vendor = "bottlerocket"
-source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v12.0.1"
-digest = "iLjbTfU19pWc5eDoeJKx+itSFRutNjNx6w/1kgk9+bw="
+source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v12.2.0"
+digest = "3r2Iq3DCVaXO019LnP9pgobbO1a7N8tXdHqokupBWRM="

Twoliter.lock

@@ -17,5 +17,5 @@ vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "12.0.1"
+version = "12.2.0"
 vendor = "bottlerocket"

Twoliter.toml

@@ -211,6 +211,34 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %description aws-k8s-1.34-nvidia
 %{summary}.
 
+%package aws-k8s-1.35
+Summary: Settings defaults for the aws-k8s 1.35 variants
+Requires: (%{shrink:
+           %{_cross_os}variant(aws-k8s-1.35)      or
+           %{_cross_os}variant(aws-k8s-1.35-fips)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.35)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.35-fips)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description aws-k8s-1.35
+%{summary}.
+
+%package aws-k8s-1.35-nvidia
+Summary: Settings defaults for the aws-k8s 1.35 nvidia variants
+Requires: (%{shrink:
+           %{_cross_os}variant(aws-k8s-1.35-nvidia)      or
+           %{_cross_os}variant(aws-k8s-1.35-nvidia-fips)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.35-nvidia)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.35-nvidia-fips)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description aws-k8s-1.35-nvidia
+%{summary}.
+
 %package metal-dev
 Summary: Settings defaults for the metal-dev variant
 Requires: %{_cross_os}variant(metal-dev)
@@ -271,6 +299,20 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %description vmware-k8s-1.33
 %{summary}.
 
+%package vmware-k8s-1.35
+Summary: Settings defaults for the vmware-k8s 1.35 variants
+Requires: (%{shrink:
+           %{_cross_os}variant(vmware-k8s-1.35)      or
+           %{_cross_os}variant(vmware-k8s-1.35-fips)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.35)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.35-fips)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description vmware-k8s-1.35
+%{summary}.
+
 %package vmware-k8s-1.34
 Summary: Settings defaults for the vmware-k8s 1.34 variants
 Requires: (%{shrink:
@@ -305,11 +347,14 @@ for defaults in \
   aws-k8s-1.33-nvidia \
   aws-k8s-1.34 \
   aws-k8s-1.34-nvidia \
+  aws-k8s-1.35 \
+  aws-k8s-1.35-nvidia \
   metal-dev \
   vmware-dev \
   vmware-k8s-1.32 \
   vmware-k8s-1.33 \
   vmware-k8s-1.34 \
+  vmware-k8s-1.35 \
   ;
 do
   projects+=( "-p" "settings-defaults-$(echo "${defaults}" | sed -e 's,\.,_,g')" )
@@ -343,11 +388,14 @@ for defaults in \
   aws-k8s-1.33-nvidia \
   aws-k8s-1.34 \
   aws-k8s-1.34-nvidia \
+  aws-k8s-1.35 \
+  aws-k8s-1.35-nvidia \
   metal-dev \
   vmware-dev \
   vmware-k8s-1.32 \
   vmware-k8s-1.33 \
   vmware-k8s-1.34 \
+  vmware-k8s-1.35 \
   ;
 do
   crate="$(echo "${defaults}" | sed -e 's,\.,_,g')"
@@ -414,6 +462,14 @@ done
 %{_cross_defaultsdir}/aws-k8s-1.34-nvidia.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.34-nvidia.conf
 
+%files aws-k8s-1.35
+%{_cross_defaultsdir}/aws-k8s-1.35.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.35.conf
+
+%files aws-k8s-1.35-nvidia
+%{_cross_defaultsdir}/aws-k8s-1.35-nvidia.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.35-nvidia.conf
+
 %files metal-dev
 %{_cross_defaultsdir}/metal-dev.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-metal-dev.conf
@@ -433,3 +489,7 @@ done
 %files vmware-k8s-1.34
 %{_cross_defaultsdir}/vmware-k8s-1.34.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.34.conf
+
+%files vmware-k8s-1.35
+%{_cross_defaultsdir}/vmware-k8s-1.35.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.35.conf

packages/settings-defaults/settings-defaults.spec

@@ -82,6 +82,8 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.33)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.33-fips)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.34)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.34-fips)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.35)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.35-fips)
 Conflicts: %{_cross_os}settings-plugin(any)
 Conflicts: %{_cross_os}variant-flavor(nvidia)
 
@@ -105,6 +107,8 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.33-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.33-nvidia-fips)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.34-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.34-nvidia-fips)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.35-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.35-nvidia-fips)
 Conflicts: %{_cross_os}settings-plugin(any)
 
 %description aws-k8s-nvidia
@@ -146,6 +150,8 @@ Provides: %{_cross_os}settings-plugin(vmware-k8s-1.33)
 Provides: %{_cross_os}settings-plugin(vmware-k8s-1.33-fips)
 Provides: %{_cross_os}settings-plugin(vmware-k8s-1.34)
 Provides: %{_cross_os}settings-plugin(vmware-k8s-1.34-fips)
+Provides: %{_cross_os}settings-plugin(vmware-k8s-1.35)
+Provides: %{_cross_os}settings-plugin(vmware-k8s-1.35-fips)
 Conflicts: %{_cross_os}settings-plugin(any)
 
 %description vmware-k8s

packages/settings-plugins/settings-plugins.spec

@@ -26,12 +26,15 @@ members = [
     "settings-defaults/aws-k8s-1.33-nvidia",
     "settings-defaults/aws-k8s-1.34",
     "settings-defaults/aws-k8s-1.34-nvidia",
+    "settings-defaults/aws-k8s-1.35",
+    "settings-defaults/aws-k8s-1.35-nvidia",
     "settings-defaults/metal-dev",
     "settings-defaults/metal-k8s-1.30",
     "settings-defaults/vmware-dev",
     "settings-defaults/vmware-k8s-1.32",
     "settings-defaults/vmware-k8s-1.33",
     "settings-defaults/vmware-k8s-1.34",
+    "settings-defaults/vmware-k8s-1.35",
 
     # (all previous migrations archived; add new ones after this line)
     "settings-migrations/v1.34.0/kubelet-device-plugins-mig-settings",

sources/Cargo.lock

@@ -0,0 +1,13 @@
+[package]
+name = "settings-defaults-aws-k8s-1_35-nvidia"
+version = "0.1.0"
+edition = "2021"
+license = "Apache-2.0 OR MIT"
+publish = false
+build = "../build-defaults.rs"
+
+[lib]
+path = "../defaults-toml.rs"
+
+[build-dependencies]
+bottlerocket-defaults-helper.workspace = true