Merge pull request #4507 from piyush-jena/k8s-1.33

variants: add k8s-1.33 variants

Author: koooosh

Cargo.lock

@@ -23,12 +23,15 @@ members = [
     "variants/aws-k8s-1.31-fips",
     "variants/aws-k8s-1.32",
     "variants/aws-k8s-1.32-fips",
+    "variants/aws-k8s-1.33",
+    "variants/aws-k8s-1.33-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/aws-k8s-1.33-nvidia",
     "variants/metal-dev",
     "variants/vmware-dev",
     "variants/vmware-k8s-1.28",
@@ -41,6 +44,8 @@ members = [
     "variants/vmware-k8s-1.31-fips",
     "variants/vmware-k8s-1.32",
     "variants/vmware-k8s-1.32-fips",
+    "variants/vmware-k8s-1.33",
+    "variants/vmware-k8s-1.33-fips",
 ]
 
 [profile.dev]

Cargo.toml

@@ -68,13 +68,15 @@ The following variants support EKS, as described above:
 * `aws-k8s-1.30`
 * `aws-k8s-1.31`
 * `aws-k8s-1.32`
+* `aws-k8s-1.33`
 * `aws-k8s-1.26-nvidia`
 * `aws-k8s-1.27-nvidia`
 * `aws-k8s-1.28-nvidia`
 * `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`
 
 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.30`
 * `vmware-k8s-1.31`
 * `vmware-k8s-1.32`
+* `vmware-k8s-1.33`
 
 The following variants are no longer supported:
 

README.md

@@ -165,6 +165,32 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %description aws-k8s-1.32-nvidia
 %{summary}.
 
+%package aws-k8s-1.33
+Summary: Settings defaults for the aws-k8s 1.33 variants
+Requires: (%{shrink:
+           %{_cross_os}variant(aws-k8s-1.33)      or
+           %{_cross_os}variant(aws-k8s-1.33-fips)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.33)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.33-fips)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description aws-k8s-1.33
+%{summary}.
+
+%package aws-k8s-1.33-nvidia
+Summary: Settings defaults for the aws-k8s 1.33 nvidia variants
+Requires: (%{shrink:
+           %{_cross_os}variant(aws-k8s-1.33-nvidia)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(aws-k8s-1.33-nvidia)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description aws-k8s-1.33-nvidia
+%{summary}.
+
 %package metal-dev
 Summary: Settings defaults for the metal-dev variant
 Requires: %{_cross_os}variant(metal-dev)
@@ -217,6 +243,20 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %description vmware-k8s-1.32
 %{summary}.
 
+%package vmware-k8s-1.33
+Summary: Settings defaults for the vmware-k8s 1.33 variants
+Requires: (%{shrink:
+           %{_cross_os}variant(vmware-k8s-1.33)      or
+           %{_cross_os}variant(vmware-k8s-1.33-fips)
+           %{nil}})
+Provides: %{_cross_os}settings-defaults(any)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.33)
+Provides: %{_cross_os}settings-defaults(vmware-k8s-1.33-fips)
+Conflicts: %{_cross_os}settings-defaults(any)
+
+%description vmware-k8s-1.33
+%{summary}.
+
 %prep
 %setup -T -c
 %cargo_prep
@@ -235,9 +275,12 @@ for defaults in \
   aws-k8s-1.31-nvidia \
   aws-k8s-1.32 \
   aws-k8s-1.32-nvidia \
+  aws-k8s-1.33 \
+  aws-k8s-1.33-nvidia \
   metal-dev \
   vmware-dev \
   vmware-k8s-1.32 \
+  vmware-k8s-1.33 \
   ;
 do
   projects+=( "-p" "settings-defaults-$(echo "${defaults}" | sed -e 's,\.,_,g')" )
@@ -269,9 +312,12 @@ for defaults in \
   aws-k8s-1.31-nvidia \
   aws-k8s-1.32 \
   aws-k8s-1.32-nvidia \
+  aws-k8s-1.33 \
+  aws-k8s-1.33-nvidia \
   metal-dev \
   vmware-dev \
   vmware-k8s-1.32 \
+  vmware-k8s-1.33 \
   ;
 do
   crate="$(echo "${defaults}" | sed -e 's,\.,_,g')"
@@ -330,6 +376,14 @@ done
 %{_cross_defaultsdir}/aws-k8s-1.32-nvidia.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.32-nvidia.conf
 
+%files aws-k8s-1.33
+%{_cross_defaultsdir}/aws-k8s-1.33.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.33.conf
+
+%files aws-k8s-1.33-nvidia
+%{_cross_defaultsdir}/aws-k8s-1.33-nvidia.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.33-nvidia.conf
+
 %files metal-dev
 %{_cross_defaultsdir}/metal-dev.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-metal-dev.conf
@@ -341,3 +395,7 @@ done
 %files vmware-k8s-1.32
 %{_cross_defaultsdir}/vmware-k8s-1.32.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.32.conf
+
+%files vmware-k8s-1.33
+%{_cross_defaultsdir}/vmware-k8s-1.33.toml
+%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.33.conf

packages/settings-defaults/settings-defaults.spec

@@ -73,6 +73,8 @@ 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)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.33)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.33-fips)
 Conflicts: %{_cross_os}settings-plugin(any)
 Conflicts: %{_cross_os}variant-flavor(nvidia)
 
@@ -91,6 +93,7 @@ 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)
+Provides: %{_cross_os}settings-plugin(aws-k8s-1.33-nvidia)
 Conflicts: %{_cross_os}settings-plugin(any)
 
 %description aws-k8s-nvidia
@@ -131,6 +134,8 @@ 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)
+Provides: %{_cross_os}settings-plugin(vmware-k8s-1.33)
+Provides: %{_cross_os}settings-plugin(vmware-k8s-1.33-fips)
 Conflicts: %{_cross_os}settings-plugin(any)
 
 %description vmware-k8s

packages/settings-plugins/settings-plugins.spec

@@ -24,10 +24,13 @@ members = [
     "settings-defaults/aws-k8s-1.31-nvidia",
     "settings-defaults/aws-k8s-1.32",
     "settings-defaults/aws-k8s-1.32-nvidia",
+    "settings-defaults/aws-k8s-1.33",
+    "settings-defaults/aws-k8s-1.33-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",
 
     # (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_33-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/Cargo.toml

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

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

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