variants: add k8s-1.36 variants

Cargo.toml

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

README.md

@@ -67,12 +67,14 @@ The following variants support EKS, as described above:
 * `aws-k8s-1.33`
 * `aws-k8s-1.34`
 * `aws-k8s-1.35`
+* `aws-k8s-1.36`
 * `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`
+* `aws-k8s-1.36-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.33`
 * `vmware-k8s-1.34`
 * `vmware-k8s-1.35`
+* `vmware-k8s-1.36`
 
 The following variants are no longer supported:
 

Release.toml

@@ -1,4 +1,4 @@
-version = "1.60.0"
+version = "1.61.0"
 
 [migrations]
 "(0.3.1, 0.3.2)" = ["migrate_v0.3.2_admin-container-v0-5-0.lz4"]
@@ -468,3 +468,4 @@ version = "1.60.0"
     "migrate_v1.60.0_kubernetes-topology-manager-policy-options.lz4",
     "migrate_v1.60.0_container-runtime-max-concurrent-unpacks.lz4",
 ]
+"(1.60.0, 1.61.0)" = []

Twoliter.lock

@@ -17,7 +17,7 @@ digest = "P53kyrWy7GdGpasy3WpIAiUNvH0YI/K3IPo4Fnk3Lws="
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "14.2.0"
+version = "14.3.0"
 vendor = "bottlerocket"
-source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v14.2.0"
-digest = "gYCGdzwB2xxCZY8kdwiYUqwGC3hWMM7yQm8kR/9dRvo="
+source = "public.ecr.aws/bottlerocket/bottlerocket-core-kit:v14.3.0"
+digest = "LVzsIAIk1ReTF1ftGAnyjL2Y6dfx6L9WulRuEqJrrZw="

Twoliter.toml

@@ -1,5 +1,5 @@
 schema-version = 2
-release-version = "1.60.0"
+release-version = "1.61.0"
 project-vendor = "Bottlerocket"
 
 [vendor.bottlerocket]
@@ -17,5 +17,5 @@ vendor = "bottlerocket"
 
 [[kit]]
 name = "bottlerocket-core-kit"
-version = "14.2.0"
+version = "14.3.0"
 vendor = "bottlerocket"

packages/settings-defaults/settings-defaults.spec

@@ -231,6 +231,34 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %description aws-k8s-1.35-nvidia
 %{summary}.
 
+%package aws-k8s-1.36
+Summary: Settings defaults for the aws-k8s 1.36 variants
+Requires: (%{shrink:
+           %{_cross_os}variant(aws-k8s-1.36)      or
+           %{_cross_os}variant(aws-k8s-1.36-fips)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.36)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.36-fips)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description aws-k8s-1.36
+%{summary}.
+
+%package aws-k8s-1.36-nvidia
+Summary: Settings defaults for the aws-k8s 1.36 nvidia variants
+Requires: (%{shrink:
+           %{_cross_os}variant(aws-k8s-1.36-nvidia)      or
+           %{_cross_os}variant(aws-k8s-1.36-nvidia-fips)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.36-nvidia)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.36-nvidia-fips)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description aws-k8s-1.36-nvidia
+%{summary}.
+
 %package metal-dev
 Summary: Settings defaults for the metal-dev variant
 Requires: %{_cross_os}variant(metal-dev)
@@ -287,6 +315,20 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %description vmware-k8s-1.33
 %{summary}.
 
+%package vmware-k8s-1.34
+Summary: Settings defaults for the vmware-k8s 1.34 variants
+Requires: (%{shrink:
+           %{_cross_os}variant(vmware-k8s-1.34)      or
+           %{_cross_os}variant(vmware-k8s-1.34-fips)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34-fips)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description vmware-k8s-1.34
+%{summary}.
+
 %package vmware-k8s-1.35
 Summary: Settings defaults for the vmware-k8s 1.35 variants
 Requires: (%{shrink:
@@ -301,18 +343,18 @@ 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
+%package vmware-k8s-1.36
+Summary: Settings defaults for the vmware-k8s 1.35 variants
 Requires: (%{shrink:
-           %{_cross_os}variant(vmware-k8s-1.34)      or
-           %{_cross_os}variant(vmware-k8s-1.34-fips)
+           %{_cross_os}variant(vmware-k8s-1.36)      or
+           %{_cross_os}variant(vmware-k8s-1.36-fips)
            %{nil}})
 Provides: %{_cross_os}settings-defaults(any)
-Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34)
-Provides: %{_cross_os}settings-defaults(vmware-k8s-1.34-fips)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.36)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.36-fips)
 Conflicts: %{_cross_os}settings-defaults(any)
 
-%description vmware-k8s-1.34
+%description vmware-k8s-1.36
 %{summary}.
 
 %prep
@@ -337,12 +379,15 @@ for defaults in \
   aws-k8s-1.34-nvidia \
   aws-k8s-1.35 \
   aws-k8s-1.35-nvidia \
+  aws-k8s-1.36 \
+  aws-k8s-1.36-nvidia \
   metal-dev \
   vmware-dev \
   vmware-k8s-1.32 \
   vmware-k8s-1.33 \
   vmware-k8s-1.34 \
   vmware-k8s-1.35 \
+  vmware-k8s-1.36 \
   ;
 do
   projects+=( "-p" "settings-defaults-$(echo "${defaults}" | sed -e 's,\.,_,g')" )
@@ -378,12 +423,15 @@ for defaults in \
   aws-k8s-1.34-nvidia \
   aws-k8s-1.35 \
   aws-k8s-1.35-nvidia \
+  aws-k8s-1.36 \
+  aws-k8s-1.36-nvidia \
   metal-dev \
   vmware-dev \
   vmware-k8s-1.32 \
   vmware-k8s-1.33 \
   vmware-k8s-1.34 \
   vmware-k8s-1.35 \
+  vmware-k8s-1.36 \
   ;
 do
   crate="$(echo "${defaults}" | sed -e 's,\.,_,g')"
@@ -458,6 +506,14 @@ done
 %{_cross_defaultsdir}/aws-k8s-1.35-nvidia.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.35-nvidia.conf
 
+%files aws-k8s-1.36
+%{_cross_defaultsdir}/aws-k8s-1.36.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.36.conf
+
+%files aws-k8s-1.36-nvidia
+%{_cross_defaultsdir}/aws-k8s-1.36-nvidia.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.36-nvidia.conf
+
 %files metal-dev
 %{_cross_defaultsdir}/metal-dev.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-metal-dev.conf
@@ -481,3 +537,7 @@ done
 %files vmware-k8s-1.35
 %{_cross_defaultsdir}/vmware-k8s-1.35.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.35.conf
+
+%files vmware-k8s-1.36
+%{_cross_defaultsdir}/vmware-k8s-1.36.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.36.conf

packages/settings-plugins/settings-plugins.spec

@@ -82,6 +82,8 @@ 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)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.36)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.36-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.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)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.36-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.36-nvidia-fips)
 Conflicts: %{_cross_os}settings-plugin(any)
 
 %description aws-k8s-nvidia
@@ -146,6 +150,8 @@ 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)
+Provides: %{_cross_os}settings-plugin(vmware-k8s-1.36)
+Provides: %{_cross_os}settings-plugin(vmware-k8s-1.36-fips)
 Conflicts: %{_cross_os}settings-plugin(any)
 
 %description vmware-k8s

sources/Cargo.toml

@@ -28,13 +28,16 @@ members = [
     "settings-defaults/aws-k8s-1.34-nvidia",
     "settings-defaults/aws-k8s-1.35",
     "settings-defaults/aws-k8s-1.35-nvidia",
+    "settings-defaults/aws-k8s-1.36",
+    "settings-defaults/aws-k8s-1.36-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",
+    "settings-defaults/vmware-k8s-1.36",
 
     # (all previous migrations archived; add new ones after this line)
     "settings-migrations/v1.34.0/kubelet-device-plugins-mig-settings",

sources/settings-defaults/aws-k8s-1.36-nvidia/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "settings-defaults-aws-k8s-1_36-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

sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/10-defaults.toml

@@ -0,0 +1 @@
+../../../shared-defaults/defaults.toml

sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/11-updates.toml

@@ -0,0 +1 @@
+../../../shared-defaults/updates.toml

sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/15-aws-tuf.toml

@@ -0,0 +1 @@
+../../../shared-defaults/aws-tuf.toml

sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/20-aws-host-containers.toml

@@ -0,0 +1 @@
+../../../shared-defaults/aws-host-containers.toml

sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/21-aws-bootstrap-container.toml

@@ -0,0 +1 @@
+../../../shared-defaults/aws-bootstrap-container.toml

sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/25-cf-signal.toml

@@ -0,0 +1 @@
+../../../shared-defaults/cf-signal.toml