Merge pull request bottlerocket-os#4497 from piyush-jena/k8s-125-deprecation

Deprecate k8s-1.25* variants

Author: piyush-jena

BUILDING.md

@@ -10,8 +10,6 @@ members = [
     "variants/aws-ecs-2-fips",
     "variants/aws-ecs-1-nvidia",
     "variants/aws-ecs-2-nvidia",
-    "variants/aws-k8s-1.25",
-    "variants/aws-k8s-1.25-nvidia",
     "variants/aws-k8s-1.26",
     "variants/aws-k8s-1.26-nvidia",
     "variants/aws-k8s-1.27",

Cargo.lock

@@ -71,26 +71,6 @@ Conflicts: %{_cross_os}settings-defaults(any)
 %description aws-ecs-2-nvidia
 %{summary}.
 
-%package aws-k8s-1.25
-Summary: Settings defaults for the aws-k8s-1.25 variant
-Requires: %{_cross_os}variant(aws-k8s-1.25)
-Provides: %{_cross_os}settings-defaults(any)
-Provides: %{_cross_os}settings-defaults(aws-k8s-1.25)
-Conflicts: %{_cross_os}settings-defaults(any)
-
-%description aws-k8s-1.25
-%{summary}.
-
-%package aws-k8s-1.25-nvidia
-Summary: Settings defaults for the aws-k8s-1.25-nvidia variant
-Requires: %{_cross_os}variant(aws-k8s-1.25-nvidia)
-Provides: %{_cross_os}settings-defaults(any)
-Provides: %{_cross_os}settings-defaults(aws-k8s-1.25-nvidia)
-Conflicts: %{_cross_os}settings-defaults(any)
-
-%description aws-k8s-1.25-nvidia
-%{summary}.
-
 %package aws-k8s-1.26
 Summary: Settings defaults for the aws-k8s-1.26 variant
 Requires: %{_cross_os}variant(aws-k8s-1.26)
@@ -249,8 +229,6 @@ for defaults in \
   aws-ecs-1-nvidia \
   aws-ecs-2 \
   aws-ecs-2-nvidia \
-  aws-k8s-1.25 \
-  aws-k8s-1.25-nvidia \
   aws-k8s-1.26 \
   aws-k8s-1.26-nvidia \
   aws-k8s-1.31 \
@@ -285,8 +263,6 @@ for defaults in \
   aws-ecs-1-nvidia \
   aws-ecs-2 \
   aws-ecs-2-nvidia \
-  aws-k8s-1.25 \
-  aws-k8s-1.25-nvidia \
   aws-k8s-1.26 \
   aws-k8s-1.26-nvidia \
   aws-k8s-1.31 \
@@ -330,14 +306,6 @@ done
 %{_cross_defaultsdir}/aws-ecs-2-nvidia.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-aws-ecs-2-nvidia.conf
 
-%files aws-k8s-1.25
-%{_cross_defaultsdir}/aws-k8s-1.25.toml
-%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.25.conf
-
-%files aws-k8s-1.25-nvidia
-%{_cross_defaultsdir}/aws-k8s-1.25-nvidia.toml
-%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.25-nvidia.conf
-
 %files aws-k8s-1.26
 %{_cross_defaultsdir}/aws-k8s-1.26.toml
 %{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.26.conf

Cargo.toml

@@ -61,7 +61,6 @@ Conflicts: %{_cross_os}settings-plugin(any)
 Summary: Settings plugin for the aws-k8s variants
 Requires: %{_cross_os}variant-family(aws-k8s)
 Provides: %{_cross_os}settings-plugin(any)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.25)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.26)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.27)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.28)
@@ -85,7 +84,6 @@ Conflicts: %{_cross_os}variant-flavor(nvidia)
 Summary: Settings plugin for the aws-k8s-nvidia variants
 Requires: (%{_cross_os}variant-family(aws-k8s) and %{_cross_os}variant-flavor(nvidia))
 Provides: %{_cross_os}settings-plugin(any)
-Provides: %{_cross_os}settings-plugin(aws-k8s-1.25-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.26-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.27-nvidia)
 Provides: %{_cross_os}settings-plugin(aws-k8s-1.28-nvidia)

README.md

@@ -18,8 +18,6 @@ members = [
     "settings-defaults/aws-ecs-1-nvidia",
     "settings-defaults/aws-ecs-2",
     "settings-defaults/aws-ecs-2-nvidia",
-    "settings-defaults/aws-k8s-1.25",
-    "settings-defaults/aws-k8s-1.25-nvidia",
     "settings-defaults/aws-k8s-1.26",
     "settings-defaults/aws-k8s-1.26-nvidia",
     "settings-defaults/aws-k8s-1.31",