variants: add k8s-1.32 variants

Cargo.toml

@@ -25,11 +25,14 @@ members = [
     "variants/aws-k8s-1.30-fips",
     "variants/aws-k8s-1.31",
     "variants/aws-k8s-1.31-fips",
+    "variants/aws-k8s-1.32",
+    "variants/aws-k8s-1.32-fips",
     "variants/aws-k8s-1.27-nvidia",
     "variants/aws-k8s-1.28-nvidia",
     "variants/aws-k8s-1.29-nvidia",
     "variants/aws-k8s-1.30-nvidia",
     "variants/aws-k8s-1.31-nvidia",
+    "variants/aws-k8s-1.32-nvidia",
     "variants/metal-dev",
     "variants/vmware-dev",
     "variants/vmware-k8s-1.28",
@@ -40,6 +43,8 @@ members = [
     "variants/vmware-k8s-1.30-fips",
     "variants/vmware-k8s-1.31",
     "variants/vmware-k8s-1.31-fips",
+    "variants/vmware-k8s-1.32",
+    "variants/vmware-k8s-1.32-fips",
 ]
 
 [profile.dev]

README.md

@@ -69,6 +69,7 @@ The following variants support EKS, as described above:
 * `aws-k8s-1.29`
 * `aws-k8s-1.30`
 * `aws-k8s-1.31`
+* `aws-k8s-1.32`
 * `aws-k8s-1.24-nvidia`
 * `aws-k8s-1.25-nvidia`
 * `aws-k8s-1.26-nvidia`
@@ -77,6 +78,7 @@ The following variants support EKS, as described above:
 * `aws-k8s-1.29-nvidia`
 * `aws-k8s-1.30-nvidia`
 * `aws-k8s-1.31-nvidia`
+* `aws-k8s-1.32-nvidia`
 
 The following variants support ECS:
 
@@ -91,6 +93,7 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware:
 * `vmware-k8s-1.29`
 * `vmware-k8s-1.30`
 * `vmware-k8s-1.31`
+* `vmware-k8s-1.32`
 
 The following variants are no longer supported:
 
@@ -387,7 +390,7 @@ See the ["Capabilities Settings" section in the `settings.oci-defaults.*` refere
 ##### OCI Defaults: Resource Limits
 
 See the ["Resource Limits Settings" section in the `settings.oci-defaults.*` reference](https://bottlerocket.dev/en/os/latest/#/api/settings/oci-defaults/).
-  
+
 #### Container image registry settings
 
 See the [`settings.container-registry.*` reference](https://bottlerocket.dev/en/os/latest/#/api/settings/container-registry/).
@@ -407,7 +410,7 @@ See the [`settings.network.*` reference](https://bottlerocket.dev/en/os/latest/#
 ##### Proxy settings
 
 See the ["Proxy Settings" section in the `settings.networks.*` reference](https://bottlerocket.dev/en/os/latest/#/api/settings/network/).
-  
+
 #### Metrics settings
 
 See the [`settings.metrics.*` reference](https://bottlerocket.dev/en/os/latest/#/api/settings/metrics/).

packages/settings-defaults/settings-defaults.spec

@@ -132,7 +132,7 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %{summary}.
 
 %package aws-k8s-1.31
-Summary: Settings defaults for the aws-k8s 1.27 through 1.30 variants
+Summary: Settings defaults for the aws-k8s 1.27 through 1.31 variants
 Requires: (%{shrink:
            %{_cross_os}variant(aws-k8s-1.27)      or
            %{_cross_os}variant(aws-k8s-1.28)      or
@@ -160,7 +160,7 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %{summary}.
 
 %package aws-k8s-1.31-nvidia
-Summary: Settings defaults for the aws-k8s 1.27 through 1.30 nvidia variants
+Summary: Settings defaults for the aws-k8s 1.27 through 1.31 nvidia variants
 Requires: (%{shrink:
            %{_cross_os}variant(aws-k8s-1.27-nvidia) or
            %{_cross_os}variant(aws-k8s-1.28-nvidia) or
@@ -179,6 +179,32 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %description aws-k8s-1.31-nvidia
 %{summary}.
 
+%package aws-k8s-1.32
+Summary: Settings defaults for the aws-k8s 1.32 variants
+Requires: (%{shrink:
+           %{_cross_os}variant(aws-k8s-1.32)      or
+           %{_cross_os}variant(aws-k8s-1.32-fips)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.32)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.32-fips)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description aws-k8s-1.32
+%{summary}.
+
+%package aws-k8s-1.32-nvidia
+Summary: Settings defaults for the aws-k8s 1.32 nvidia variants
+Requires: (%{shrink:
+           %{_cross_os}variant(aws-k8s-1.32-nvidia)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.32-nvidia)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description aws-k8s-1.32-nvidia
+%{summary}.
+
 %package metal-dev
 Summary: Settings defaults for the metal-dev variant
 Requires: %{_cross_os}variant(metal-dev)
@@ -199,8 +225,8 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %description vmware-dev
 %{summary}.
 
-%package vmware-k8s-1.31
-Summary: Settings defaults for the vmware-k8s 1.27 through 1.30 variants
+%package vmware-k8s-1.32
+Summary: Settings defaults for the vmware-k8s 1.27 through 1.32 variants
 Requires: (%{shrink:
            %{_cross_os}variant(vmware-k8s-1.27)      or
            %{_cross_os}variant(vmware-k8s-1.28)      or
@@ -210,8 +236,10 @@ Requires: (%{shrink:
            %{_cross_os}variant(vmware-k8s-1.30)      or
            %{_cross_os}variant(vmware-k8s-1.30-fips) or
            %{_cross_os}variant(vmware-k8s-1.31)      or
-           %{_cross_os}variant(vmware-k8s-1.31-fips)
-           %{nil}})
+           %{_cross_os}variant(vmware-k8s-1.31-fips) or
+           %{_cross_os}variant(vmware-k8s-1.32)      or
+           %{_cross_os}variant(vmware-k8s-1.32-fips)
+          %{nil}})
 Provides: %{_cross_os}settings-defaults(any)
 Provides: %{_cross_os}settings-defaults(vmware-k8s-1.27)
 Provides: %{_cross_os}settings-defaults(vmware-k8s-1.28)
@@ -222,9 +250,11 @@ Provides: %{_cross_os}settings-defaults(vmware-k8s-1.30)
 Provides: %{_cross_os}settings-defaults(vmware-k8s-1.30-fips)
 Provides: %{_cross_os}settings-defaults(vmware-k8s-1.31)
 Provides: %{_cross_os}settings-defaults(vmware-k8s-1.31-fips)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.32)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.32-fips)
 Conflicts: %{_cross_os}settings-defaults(any)
 
-%description vmware-k8s-1.31
+%description vmware-k8s-1.32
 %{summary}.
 
 %prep
@@ -247,9 +277,11 @@ for defaults in \
   aws-k8s-1.26-nvidia \
   aws-k8s-1.31 \
   aws-k8s-1.31-nvidia \
+  aws-k8s-1.32 \
+  aws-k8s-1.32-nvidia \
   metal-dev \
   vmware-dev \
-  vmware-k8s-1.31 \
+  vmware-k8s-1.32 \
   ;
 do
   projects+=( "-p" "settings-defaults-$(echo "${defaults}" | sed -e 's,\.,_,g')" )
@@ -283,9 +315,11 @@ for defaults in \
   aws-k8s-1.26-nvidia \
   aws-k8s-1.31 \
   aws-k8s-1.31-nvidia \
+  aws-k8s-1.32 \
+  aws-k8s-1.32-nvidia \
   metal-dev \
   vmware-dev \
-  vmware-k8s-1.31 \
+  vmware-k8s-1.32 \
   ;
 do
   crate="$(echo "${defaults}" | sed -e 's,\.,_,g')"
@@ -352,6 +386,14 @@ done
 %{_cross_defaultsdir}/aws-k8s-1.31-nvidia.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.31-nvidia.conf
 
+%files aws-k8s-1.32
+%{_cross_defaultsdir}/aws-k8s-1.32.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.32.conf
+
+%files aws-k8s-1.32-nvidia
+%{_cross_defaultsdir}/aws-k8s-1.32-nvidia.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.32-nvidia.conf
+
 %files metal-dev
 %{_cross_defaultsdir}/metal-dev.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-metal-dev.conf
@@ -360,6 +402,6 @@ done
 %{_cross_defaultsdir}/vmware-dev.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-vmware-dev.conf
 
-%files vmware-k8s-1.31
-%{_cross_defaultsdir}/vmware-k8s-1.31.toml
-%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.31.conf
+%files vmware-k8s-1.32
+%{_cross_defaultsdir}/vmware-k8s-1.32.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.32.conf

packages/settings-plugins/settings-plugins.spec

@@ -73,6 +73,8 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.30)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-fips)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.31)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.31-fips)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.32)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.32-fips)
 Conflicts: %{_cross_os}settings-plugin(any)
 Conflicts: %{_cross_os}variant-flavor(nvidia)
 
@@ -92,6 +94,7 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.28-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.29-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.31-nvidia)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.32-nvidia)
 Conflicts: %{_cross_os}settings-plugin(any)
 
 %description aws-k8s-nvidia
@@ -130,6 +133,8 @@ Provides: %{_cross_os}settings-plugin(vmware-k8s-1.30)
 Provides: %{_cross_os}settings-plugin(vmware-k8s-1.30-fips)
 Provides: %{_cross_os}settings-plugin(vmware-k8s-1.31)
 Provides: %{_cross_os}settings-plugin(vmware-k8s-1.31-fips)
+Provides: %{_cross_os}settings-plugin(vmware-k8s-1.32)
+Provides: %{_cross_os}settings-plugin(vmware-k8s-1.32-fips)
 Conflicts: %{_cross_os}settings-plugin(any)
 
 %description vmware-k8s

sources/Cargo.toml

@@ -29,10 +29,12 @@ members = [
     "settings-defaults/aws-k8s-1.26-nvidia",
     "settings-defaults/aws-k8s-1.31",
     "settings-defaults/aws-k8s-1.31-nvidia",
+    "settings-defaults/aws-k8s-1.32",
+    "settings-defaults/aws-k8s-1.32-nvidia",
     "settings-defaults/metal-dev",
     "settings-defaults/metal-k8s-1.30",
     "settings-defaults/vmware-dev",
-    "settings-defaults/vmware-k8s-1.31",
+    "settings-defaults/vmware-k8s-1.32",
 
     # (all previous migrations archived; add new ones after this line)
     "settings-migrations/v1.21.0/pluto-remove-generators-v0-1-0",

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

@@ -0,0 +1,13 @@
+[package]
+name = "settings-defaults-aws-k8s-1_32-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.32-nvidia/defaults.d/15-aws-tuf.toml

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

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

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

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

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

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/26-aws-autoscaling.toml

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

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/31-send-metrics-aws.toml

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

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/50-kubernetes-aws.toml

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

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml

@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-containerd-nvidia.toml

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml

@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-aws-external-cloud-provider.toml

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml

@@ -0,0 +1 @@
+../../../shared-defaults/kubernetes-aws-credential-provider.toml

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/60-lockdown-none.toml

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

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/70-oci-hooks.toml

@@ -0,0 +1 @@
+../../../shared-defaults/nvidia-oci-hooks-containerd-cri.toml

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml

@@ -0,0 +1 @@
+../../../shared-defaults/nvidia-k8s-container-toolkit.toml

sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml

@@ -0,0 +1 @@
+../../../shared-defaults/nvidia-k8s-device-plugin.toml

sources/settings-defaults/vmware-k8s-1.31/Cargo.toml → sources/settings-defaults/aws-k8s-1.32/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "settings-defaults-vmware-k8s-1_31"
+name = "settings-defaults-aws-k8s-1_32"
 version = "0.1.0"
 edition = "2021"
 license = "Apache-2.0 OR MIT"

sources/settings-defaults/aws-k8s-1.32/defaults.d/10-defaults.toml

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

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

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

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

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