From 1212ff63b4c2e59bb14363dd2eef4ca128b3b718 Mon Sep 17 00:00:00 2001 From: Kush Upadhyay Date: Mon, 27 Jan 2025 23:28:00 +0000 Subject: [PATCH 1/4] settings-defaults: drop aws-k8s-1.24 and aws-k8s-1.24-nvidia Signed-off-by: Kush Upadhyay --- .../settings-defaults/settings-defaults.spec | 32 ------------------- sources/Cargo.lock | 14 -------- sources/Cargo.toml | 2 -- .../aws-k8s-1.24-nvidia/Cargo.toml | 13 -------- .../defaults.d/10-defaults.toml | 1 - .../defaults.d/15-aws-tuf.toml | 1 - .../defaults.d/20-aws-host-containers.toml | 1 - .../defaults.d/25-cf-signal.toml | 1 - .../defaults.d/26-aws-autoscaling.toml | 1 - .../defaults.d/30-metrics.toml | 1 - .../defaults.d/31-send-metrics-aws.toml | 1 - .../defaults.d/40-aws-creds.toml | 1 - .../defaults.d/50-kubernetes-aws.toml | 1 - .../51-kubernetes-containerd-nvidia.toml | 1 - .../defaults.d/52-kubernetes-services.toml | 1 - .../defaults.d/53-containerd-cri-pki.toml | 1 - ...rnetes-device-ownership-default-false.toml | 1 - .../defaults.d/60-lockdown-none.toml | 1 - .../defaults.d/70-oci-hooks.toml | 1 - .../75-oci-defaults-containerd-cri.toml | 1 - .../76-oci-defaults-capabilities.toml | 1 - ...faults-containerd-cri-resource-limits.toml | 1 - .../80-nvidia-k8s-container-toolkit.toml | 1 - .../81-nvidia-k8s-device-plugin.toml | 1 - .../defaults.d/90-boot.toml | 1 - .../settings-defaults/aws-k8s-1.24/Cargo.toml | 13 -------- .../aws-k8s-1.24/defaults.d/10-defaults.toml | 1 - .../aws-k8s-1.24/defaults.d/15-aws-tuf.toml | 1 - .../defaults.d/20-aws-host-containers.toml | 1 - .../aws-k8s-1.24/defaults.d/25-cf-signal.toml | 1 - .../defaults.d/26-aws-autoscaling.toml | 1 - .../aws-k8s-1.24/defaults.d/30-metrics.toml | 1 - .../defaults.d/31-send-metrics-aws.toml | 1 - .../aws-k8s-1.24/defaults.d/40-aws-creds.toml | 1 - .../defaults.d/50-kubernetes-aws.toml | 1 - .../defaults.d/51-kubernetes-containerd.toml | 1 - .../defaults.d/52-kubernetes-services.toml | 1 - .../defaults.d/53-containerd-cri-pki.toml | 1 - ...rnetes-device-ownership-default-false.toml | 1 - .../defaults.d/60-lockdown-integrity.toml | 1 - .../aws-k8s-1.24/defaults.d/70-oci-hooks.toml | 1 - .../75-oci-defaults-containerd-cri.toml | 1 - .../76-oci-defaults-capabilities.toml | 1 - ...faults-containerd-cri-resource-limits.toml | 1 - .../aws-k8s-1.24/defaults.d/90-boot.toml | 1 - 45 files changed, 114 deletions(-) delete mode 100644 sources/settings-defaults/aws-k8s-1.24-nvidia/Cargo.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/10-defaults.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/15-aws-tuf.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/20-aws-host-containers.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/25-cf-signal.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/26-aws-autoscaling.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/30-metrics.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/31-send-metrics-aws.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/40-aws-creds.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/50-kubernetes-aws.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/52-kubernetes-services.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/53-containerd-cri-pki.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/60-lockdown-none.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/70-oci-hooks.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/76-oci-defaults-capabilities.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/90-boot.toml delete mode 100644 sources/settings-defaults/aws-k8s-1.24/Cargo.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/10-defaults.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/15-aws-tuf.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/20-aws-host-containers.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/25-cf-signal.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/26-aws-autoscaling.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/30-metrics.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/31-send-metrics-aws.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/40-aws-creds.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/50-kubernetes-aws.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/51-kubernetes-containerd.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/52-kubernetes-services.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/53-containerd-cri-pki.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/60-lockdown-integrity.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/70-oci-hooks.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/75-oci-defaults-containerd-cri.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/76-oci-defaults-capabilities.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml delete mode 120000 sources/settings-defaults/aws-k8s-1.24/defaults.d/90-boot.toml diff --git a/packages/settings-defaults/settings-defaults.spec b/packages/settings-defaults/settings-defaults.spec index b2e2fd6aca6..7f0987aa104 100644 --- a/packages/settings-defaults/settings-defaults.spec +++ b/packages/settings-defaults/settings-defaults.spec @@ -71,26 +71,6 @@ Conflicts: %{_cross_os}settings-defaults(any) %description aws-ecs-2-nvidia %{summary}. -%package aws-k8s-1.24 -Summary: Settings defaults for the aws-k8s 1.24 variant -Requires: %{_cross_os}variant(aws-k8s-1.24) -Provides: %{_cross_os}settings-defaults(any) -Provides: %{_cross_os}settings-defaults(aws-k8s-1.24) -Conflicts: %{_cross_os}settings-defaults(any) - -%description aws-k8s-1.24 -%{summary}. - -%package aws-k8s-1.24-nvidia -Summary: Settings defaults for the aws-k8s 1.24 nvidia variant -Requires: %{_cross_os}variant(aws-k8s-1.24-nvidia) -Provides: %{_cross_os}settings-defaults(any) -Provides: %{_cross_os}settings-defaults(aws-k8s-1.24-nvidia) -Conflicts: %{_cross_os}settings-defaults(any) - -%description aws-k8s-1.24-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) @@ -269,8 +249,6 @@ for defaults in \ aws-ecs-1-nvidia \ aws-ecs-2 \ aws-ecs-2-nvidia \ - aws-k8s-1.24 \ - aws-k8s-1.24-nvidia \ aws-k8s-1.25 \ aws-k8s-1.25-nvidia \ aws-k8s-1.26 \ @@ -307,8 +285,6 @@ for defaults in \ aws-ecs-1-nvidia \ aws-ecs-2 \ aws-ecs-2-nvidia \ - aws-k8s-1.24 \ - aws-k8s-1.24-nvidia \ aws-k8s-1.25 \ aws-k8s-1.25-nvidia \ aws-k8s-1.26 \ @@ -354,14 +330,6 @@ done %{_cross_defaultsdir}/aws-ecs-2-nvidia.toml %{_cross_tmpfilesdir}/storewolf-defaults-aws-ecs-2-nvidia.conf -%files aws-k8s-1.24 -%{_cross_defaultsdir}/aws-k8s-1.24.toml -%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.24.conf - -%files aws-k8s-1.24-nvidia -%{_cross_defaultsdir}/aws-k8s-1.24-nvidia.toml -%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.24-nvidia.conf - %files aws-k8s-1.25 %{_cross_defaultsdir}/aws-k8s-1.25.toml %{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.25.conf diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 619b96bf5da..4ca516ec584 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -2692,20 +2692,6 @@ dependencies = [ "bottlerocket-defaults-helper", ] -[[package]] -name = "settings-defaults-aws-k8s-1_24" -version = "0.1.0" -dependencies = [ - "bottlerocket-defaults-helper", -] - -[[package]] -name = "settings-defaults-aws-k8s-1_24-nvidia" -version = "0.1.0" -dependencies = [ - "bottlerocket-defaults-helper", -] - [[package]] name = "settings-defaults-aws-k8s-1_25" version = "0.1.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index f42413782a4..d6ec23e2ad5 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -21,8 +21,6 @@ members = [ "settings-defaults/aws-ecs-1-nvidia", "settings-defaults/aws-ecs-2", "settings-defaults/aws-ecs-2-nvidia", - "settings-defaults/aws-k8s-1.24", - "settings-defaults/aws-k8s-1.24-nvidia", "settings-defaults/aws-k8s-1.25", "settings-defaults/aws-k8s-1.25-nvidia", "settings-defaults/aws-k8s-1.26", diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/Cargo.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/Cargo.toml deleted file mode 100644 index c695762cae5..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "settings-defaults-aws-k8s-1_24-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 diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/10-defaults.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/10-defaults.toml deleted file mode 120000 index a202ba61a4c..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/10-defaults.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/defaults.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/15-aws-tuf.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/15-aws-tuf.toml deleted file mode 120000 index afcef6a617e..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/15-aws-tuf.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-tuf.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/20-aws-host-containers.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/20-aws-host-containers.toml deleted file mode 120000 index 4d404d663cd..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/20-aws-host-containers.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-host-containers.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/25-cf-signal.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/25-cf-signal.toml deleted file mode 120000 index a33d541652c..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/25-cf-signal.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/cf-signal.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/26-aws-autoscaling.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/26-aws-autoscaling.toml deleted file mode 120000 index b579c0182b6..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/26-aws-autoscaling.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-autoscaling.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/30-metrics.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/30-metrics.toml deleted file mode 120000 index 99f0b2b6980..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/30-metrics.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/metrics.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/31-send-metrics-aws.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/31-send-metrics-aws.toml deleted file mode 120000 index 2fefefea751..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/31-send-metrics-aws.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/send-metrics-aws.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/40-aws-creds.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/40-aws-creds.toml deleted file mode 120000 index a6a17e88f54..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/40-aws-creds.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-creds.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/50-kubernetes-aws.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/50-kubernetes-aws.toml deleted file mode 120000 index 7393a2dd3d1..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/50-kubernetes-aws.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-aws.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml deleted file mode 120000 index e68ab5eaa3c..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-containerd-nvidia.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/52-kubernetes-services.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/52-kubernetes-services.toml deleted file mode 120000 index afab5a7f15a..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/52-kubernetes-services.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-services.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/53-containerd-cri-pki.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/53-containerd-cri-pki.toml deleted file mode 120000 index 2dbf7db789b..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/53-containerd-cri-pki.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/containerd-cri-pki.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml deleted file mode 120000 index fd989ade11e..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/55-kubernetes-device-ownership-default-false.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/60-lockdown-none.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/60-lockdown-none.toml deleted file mode 120000 index cced543330e..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/60-lockdown-none.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/lockdown-none.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/70-oci-hooks.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/70-oci-hooks.toml deleted file mode 120000 index d91eec45282..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/70-oci-hooks.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/nvidia-oci-hooks-containerd-cri.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml deleted file mode 120000 index 25204d67d21..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/76-oci-defaults-capabilities.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/76-oci-defaults-capabilities.toml deleted file mode 120000 index 100c2874090..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/76-oci-defaults-capabilities.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-capabilities.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml deleted file mode 120000 index 7f06213572a..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-resource-limits.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml deleted file mode 120000 index 0b3f42928f1..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/nvidia-k8s-container-toolkit.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml deleted file mode 120000 index 741cfa58cca..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/nvidia-k8s-device-plugin.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/90-boot.toml b/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/90-boot.toml deleted file mode 120000 index 7778447459a..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24-nvidia/defaults.d/90-boot.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/boot.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/Cargo.toml b/sources/settings-defaults/aws-k8s-1.24/Cargo.toml deleted file mode 100644 index aa4bcf7efc6..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "settings-defaults-aws-k8s-1_24" -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 diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/10-defaults.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/10-defaults.toml deleted file mode 120000 index a202ba61a4c..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/10-defaults.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/defaults.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/15-aws-tuf.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/15-aws-tuf.toml deleted file mode 120000 index afcef6a617e..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/15-aws-tuf.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-tuf.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/20-aws-host-containers.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/20-aws-host-containers.toml deleted file mode 120000 index 4d404d663cd..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/20-aws-host-containers.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-host-containers.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/25-cf-signal.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/25-cf-signal.toml deleted file mode 120000 index a33d541652c..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/25-cf-signal.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/cf-signal.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/26-aws-autoscaling.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/26-aws-autoscaling.toml deleted file mode 120000 index b579c0182b6..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/26-aws-autoscaling.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-autoscaling.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/30-metrics.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/30-metrics.toml deleted file mode 120000 index 99f0b2b6980..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/30-metrics.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/metrics.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/31-send-metrics-aws.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/31-send-metrics-aws.toml deleted file mode 120000 index 2fefefea751..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/31-send-metrics-aws.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/send-metrics-aws.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/40-aws-creds.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/40-aws-creds.toml deleted file mode 120000 index a6a17e88f54..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/40-aws-creds.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/aws-creds.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/50-kubernetes-aws.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/50-kubernetes-aws.toml deleted file mode 120000 index 7393a2dd3d1..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/50-kubernetes-aws.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-aws.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/51-kubernetes-containerd.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/51-kubernetes-containerd.toml deleted file mode 120000 index 08196a5edef..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/51-kubernetes-containerd.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-containerd.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/52-kubernetes-services.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/52-kubernetes-services.toml deleted file mode 120000 index afab5a7f15a..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/52-kubernetes-services.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-services.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/53-containerd-cri-pki.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/53-containerd-cri-pki.toml deleted file mode 120000 index 2dbf7db789b..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/53-containerd-cri-pki.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/containerd-cri-pki.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml deleted file mode 120000 index fd989ade11e..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/55-kubernetes-device-ownership-default-false.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/kubernetes-device-ownership-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/60-lockdown-integrity.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/60-lockdown-integrity.toml deleted file mode 120000 index 8b4de873a39..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/60-lockdown-integrity.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/lockdown-integrity.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/70-oci-hooks.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/70-oci-hooks.toml deleted file mode 120000 index e7b73c620dd..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/70-oci-hooks.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-hooks.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/75-oci-defaults-containerd-cri.toml deleted file mode 120000 index 25204d67d21..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/75-oci-defaults-containerd-cri.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/76-oci-defaults-capabilities.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/76-oci-defaults-capabilities.toml deleted file mode 120000 index 100c2874090..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/76-oci-defaults-capabilities.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-capabilities.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml deleted file mode 120000 index 7f06213572a..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/oci-defaults-containerd-cri-resource-limits.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.24/defaults.d/90-boot.toml b/sources/settings-defaults/aws-k8s-1.24/defaults.d/90-boot.toml deleted file mode 120000 index 7778447459a..00000000000 --- a/sources/settings-defaults/aws-k8s-1.24/defaults.d/90-boot.toml +++ /dev/null @@ -1 +0,0 @@ -../../../shared-defaults/boot.toml \ No newline at end of file From bdba6584f04ba622600c2b311877ffcfb183a4f8 Mon Sep 17 00:00:00 2001 From: Kush Upadhyay Date: Mon, 27 Jan 2025 23:47:29 +0000 Subject: [PATCH 2/4] settings-plugins: aws-k8s-1.24 and aws-k8s-1.24-nvidia Signed-off-by: Kush Upadhyay --- packages/settings-plugins/settings-plugins.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/settings-plugins/settings-plugins.spec b/packages/settings-plugins/settings-plugins.spec index 7ac7622d5ad..97eb12311fa 100644 --- a/packages/settings-plugins/settings-plugins.spec +++ b/packages/settings-plugins/settings-plugins.spec @@ -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.24) 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) @@ -86,7 +85,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.24-nvidia) 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) From 5a5cf2179291a56534fd4af1ecd9b8fae3ed2c6a Mon Sep 17 00:00:00 2001 From: Kush Upadhyay Date: Mon, 27 Jan 2025 23:25:44 +0000 Subject: [PATCH 3/4] variants: drop aws-k8s-1.24 and aws-k8s-1.24-nvidia Signed-off-by: Kush Upadhyay --- Cargo.lock | 18 ---------- Cargo.toml | 2 -- Makefile.toml | 2 +- variants/README.md | 30 ++++++++--------- variants/aws-k8s-1.24-nvidia/Cargo.toml | 45 ------------------------- variants/aws-k8s-1.24/Cargo.toml | 39 --------------------- 6 files changed, 16 insertions(+), 120 deletions(-) delete mode 100644 variants/aws-k8s-1.24-nvidia/Cargo.toml delete mode 100644 variants/aws-k8s-1.24/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index 6984ac0fc40..413aa8f4bf7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,24 +56,6 @@ dependencies = [ "settings-plugins", ] -[[package]] -name = "aws-k8s-1_24" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - -[[package]] -name = "aws-k8s-1_24-nvidia" -version = "0.1.0" -dependencies = [ - "settings-defaults", - "settings-migrations", - "settings-plugins", -] - [[package]] name = "aws-k8s-1_25" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index ab923a907ed..611ebf90668 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,6 @@ members = [ "variants/aws-ecs-2-fips", "variants/aws-ecs-1-nvidia", "variants/aws-ecs-2-nvidia", - "variants/aws-k8s-1.24", - "variants/aws-k8s-1.24-nvidia", "variants/aws-k8s-1.25", "variants/aws-k8s-1.25-nvidia", "variants/aws-k8s-1.26", diff --git a/Makefile.toml b/Makefile.toml index 22b65c5c3b3..5451e9496a9 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -59,7 +59,7 @@ BUILDSYS_VERSION_BUILD = { script = ["git describe --always --dirty --exclude '* BUILDSYS_RELEASE_CONFIG_PATH = "${BUILDSYS_ROOT_DIR}/Release.toml" BUILDSYS_VERSION_IMAGE = { script = ["awk -F '[ =\"]+' '$1 == \"version\" {print $2}' ${BUILDSYS_RELEASE_CONFIG_PATH}"] } # This can be overridden with -e to build a different variant from the variants/ directory -BUILDSYS_VARIANT = { script = ['echo "${BUILDSYS_VARIANT:-aws-k8s-1.24}"'] } +BUILDSYS_VARIANT = { script = ['echo "${BUILDSYS_VARIANT:-aws-k8s-1.32}"'] } # Product name used for file and directory naming BUILDSYS_NAME = "bottlerocket" # "Pretty" name used to identify OS in os-release, bootloader, etc. diff --git a/variants/README.md b/variants/README.md index 669436e80f3..6f71af5b3af 100644 --- a/variants/README.md +++ b/variants/README.md @@ -35,21 +35,6 @@ For example, in a VMware variant, settings read from the guestinfo interface wil See [_Update Policy_ in the Security Features document](../SECURITY_FEATURES.md#update-policy) for information on when and how Bottlerocket applies security patches to variants. -### aws-k8s-1.24: Kubernetes 1.24 node - -The [aws-k8s-1.24](aws-k8s-1.24/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. -It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). - -This variant is compatible with Kubernetes 1.24, 1.25, and 1.26 clusters. - -### aws-k8s-1.24-nvidia: Kubernetes 1.24 NVIDIA node - -The [aws-k8s-1.24-nvidia](aws-k8s-1.24-nvidia/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. -It also includes the required packages to configure containers to leverage NVIDIA GPUs. -It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). - -This variant is compatible with Kubernetes 1.24, 1.25, and 1.26 clusters. - ### aws-k8s-1.25: Kubernetes 1.25 node The [aws-k8s-1.25](aws-k8s-1.25/Cargo.toml) variant includes the packages needed to run a Kubernetes node in AWS. @@ -385,6 +370,21 @@ It supported self-hosted clusters and clusters managed by [EKS](https://aws.amaz This variant was compatible with Kubernetes 1.23, 1.24, and 1.25 clusters. +### aws-k8s-1.24: Kubernetes 1.24 node + +The [aws-k8s-1.24](aws-k8s-1.24/Cargo.toml) variant included the packages needed to run a Kubernetes node in AWS. +It supported self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). + +This variant was compatible with Kubernetes 1.24, 1.25, and 1.26 clusters. + +### aws-k8s-1.24-nvidia: Kubernetes 1.24 NVIDIA node + +The [aws-k8s-1.24-nvidia](aws-k8s-1.24-nvidia/Cargo.toml) variant included the packages needed to run a Kubernetes node in AWS. +It also included the required packages to configure containers to leverage NVIDIA GPUs. +It supported self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/). + +This variant was compatible with Kubernetes 1.24, 1.25, and 1.26 clusters. + ### metal-k8s-1.23: Metal Kubernetes 1.23 node The metal-k8s-1.23 variant included the packages needed to run a Kubernetes worker node on bare metal. diff --git a/variants/aws-k8s-1.24-nvidia/Cargo.toml b/variants/aws-k8s-1.24-nvidia/Cargo.toml deleted file mode 100644 index e13c7f045cf..00000000000 --- a/variants/aws-k8s-1.24-nvidia/Cargo.toml +++ /dev/null @@ -1,45 +0,0 @@ -[package] -# This is the aws-k8s-1.24-nvidia variant. "." is not allowed in crate names, but we -# don't use this crate name anywhere. -name = "aws-k8s-1_24-nvidia" -version = "0.1.0" -edition = "2021" -publish = false -build = "../build.rs" -# Don't rebuild crate just because of changes to README. -exclude = ["README.md"] - -[package.metadata.build-variant.image-layout] -os-image-size-gib = 4 - -[package.metadata.build-variant.image-features] -grub-set-private-var = true - -[package.metadata.build-variant] -included-packages = [ - "aws-iam-authenticator", - "cni", - "cni-plugins", - "kernel-5.15", - "kubelet-1.24", - "release", - "nvidia-container-toolkit-k8s", - "nvidia-k8s-device-plugin", - "kmod-5.15-nvidia-tesla-535", -] -kernel-parameters = [ - "console=tty0", - "console=ttyS0,115200n8", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "systemd.unified_cgroup_hierarchy=0", - "quiet", -] - -[lib] -path = "../variants.rs" - -[build-dependencies] -settings-defaults = { path = "../../packages/settings-defaults" } -settings-plugins = { path = "../../packages/settings-plugins" } -settings-migrations = { path = "../../packages/settings-migrations" } diff --git a/variants/aws-k8s-1.24/Cargo.toml b/variants/aws-k8s-1.24/Cargo.toml deleted file mode 100644 index 69dddd12a61..00000000000 --- a/variants/aws-k8s-1.24/Cargo.toml +++ /dev/null @@ -1,39 +0,0 @@ -[package] -# This is the aws-k8s-1.24 variant. "." is not allowed in crate names, but we -# don't use this crate name anywhere. -name = "aws-k8s-1_24" -version = "0.1.0" -edition = "2021" -publish = false -build = "../build.rs" -# Don't rebuild crate just because of changes to README. -exclude = ["README.md"] - -[package.metadata.build-variant.image-features] -grub-set-private-var = true - -[package.metadata.build-variant] -included-packages = [ - "aws-iam-authenticator", - "cni", - "cni-plugins", - "kernel-5.15", - "kubelet-1.24", - "release", -] -kernel-parameters = [ - "console=tty0", - "console=ttyS0,115200n8", - "net.ifnames=0", - "netdog.default-interface=eth0:dhcp4,dhcp6?", - "systemd.unified_cgroup_hierarchy=0", - "quiet", -] - -[lib] -path = "../variants.rs" - -[build-dependencies] -settings-defaults = { path = "../../packages/settings-defaults" } -settings-plugins = { path = "../../packages/settings-plugins" } -settings-migrations = { path = "../../packages/settings-migrations" } From c39e84b5ed299a660bbe80cdb3f2834df26f1349 Mon Sep 17 00:00:00 2001 From: Kush Upadhyay Date: Mon, 27 Jan 2025 23:55:26 +0000 Subject: [PATCH 4/4] docs: update aws-k8s-1.24* references Signed-off-by: Kush Upadhyay --- BUILDING.md | 6 +++--- PUBLISHING-AWS.md | 6 +++--- PUBLISHING-VMWARE.md | 8 ++++---- PUBLISHING.md | 4 ++-- QUICKSTART-EKS.md | 12 ++++++------ QUICKSTART-VMWARE.md | 4 ++-- README.md | 6 ++---- TESTING.md | 6 +++--- 8 files changed, 25 insertions(+), 27 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index cb0fae64cec..1c4cb4bf739 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -203,7 +203,7 @@ The specifics of building an out-of-tree module will vary by project, but the fi ### Downloading the kmod kit kmod kits are included in the official Bottlerocket repos starting with Bottlerocket v1.0.6. -Let's say you want to download the kit for building x86_64 modules for v1.11.0 and variant aws-k8s-1.24. +Let's say you want to download the kit for building x86_64 modules for v1.31.0 and variant aws-k8s-1.32. First, you need tuftool: ```shell @@ -220,8 +220,8 @@ sha512sum -c <<<"2ff1fbf99b20dd7ff5d2c84243a8e3b51701183b1f524b7d470a6b7a9b0172f Next, set your desired parameters, and download the kmod kit: ```shell ARCH=x86_64 -VERSION=v1.11.0 -VARIANT=aws-k8s-1.24 +VERSION=v1.31.0 +VARIANT=aws-k8s-1.32 OUTDIR="${VARIANT}-${VERSION}" tuftool download "${OUTDIR}" --target-name ${VARIANT}-${ARCH}-kmod-kit-${VERSION}.tar.xz \ diff --git a/PUBLISHING-AWS.md b/PUBLISHING-AWS.md index 486ccdb98c5..9552ad01007 100644 --- a/PUBLISHING-AWS.md +++ b/PUBLISHING-AWS.md @@ -91,7 +91,7 @@ This isn't very discoverable yet, but it's useful for testing. As an example, a parameter might look like this: ``` -/your/prefix/here/aws-k8s-1.24/x86_64/1.11.0-b530f30/image_id +/your/prefix/here/aws-k8s-1.32/x86_64/1.31.0-41108b4/image_id ``` Once you're satisfied with your image and parameters, you can promote the parameters to simpler names (for example, "latest") using the [instructions below](#promoting-ssm-parameters). @@ -133,13 +133,13 @@ cargo make -e SSM_TARGET=latest promote-ssm This will copy the fully versioned parameter from earlier, something like: ``` -/your/prefix/here/aws-k8s-1.24/x86_64/1.11.0-b530f30/image_id +/your/prefix/here/aws-k8s-1.32/x86_64/1.31.0-41108b4/image_id ``` ...to a simpler parameter name: ``` -/your/prefix/here/aws-k8s-1.24/x86_64/latest/image_id +/your/prefix/here/aws-k8s-1.32/x86_64/latest/image_id ``` You can then use this parameter name to get the latest AMI ID. diff --git a/PUBLISHING-VMWARE.md b/PUBLISHING-VMWARE.md index 4cf8aa8fbcf..29165252daa 100644 --- a/PUBLISHING-VMWARE.md +++ b/PUBLISHING-VMWARE.md @@ -46,20 +46,20 @@ datacenters = ["foo", "bar"] Then you can easily upload your OVA, specifying the variant you wish to upload (currently only VMware variants). ```shell -cargo make -e BUILDSYS_VARIANT=vmware-k8s-1.24 upload-ova +cargo make -e BUILDSYS_VARIANT=vmware-k8s-1.32 upload-ova ``` If you would like to upload your OVA as a VM template, you can do this in a single step: ```shell -cargo make -e BUILDSYS_VARIANT=vmware-k8s-1.24 vmware-template +cargo make -e BUILDSYS_VARIANT=vmware-k8s-1.32 vmware-template ``` You can override the list of datacenters to upload to by specifying `VMWARE_DATACENTERS`: ```shell cargo make vmware-template \ - -e BUILDSYS_VARIANT=vmware-k8s-1.24 \ + -e BUILDSYS_VARIANT=vmware-k8s-1.32 \ -e VMWARE_DATACENTERS="foo,bar" ``` @@ -70,6 +70,6 @@ Our [import spec template](tools/pubsys/support/vmware/import_spec.template) can ```shell cargo make vmware-template \ - -e BUILDSYS_VARIANT=vmware-k8s-1.24 \ + -e BUILDSYS_VARIANT=vmware-k8s-1.32 \ -e VMWARE_IMPORT_SPEC_PATH=/path/to/my/spec.toml ``` diff --git a/PUBLISHING.md b/PUBLISHING.md index d80f2475b95..fe5d96c49e6 100644 --- a/PUBLISHING.md +++ b/PUBLISHING.md @@ -215,12 +215,12 @@ These default settings will be applied to your hosts at startup, meaning any hos The easiest way to change your repo URLs at run time is to include the settings changes in user data. This method is covered [in README](README.md#using-user-data). -For example, if you built the `aws-k8s-1.24` variant for `x86_64` and uploaded to the public S3 bucket `my-bucket`, your URLs could look like: +For example, if you built the `aws-k8s-1.32` variant for `x86_64` and uploaded to the public S3 bucket `my-bucket`, your URLs could look like: ```toml [settings.updates] targets-base-url = "https://my-bucket.s3-us-west-2.amazonaws.com/targets/" -metadata-base-url = "https://my-bucket.s3-us-west-2.amazonaws.com/aws-k8s-1.24/x86_64/" +metadata-base-url = "https://my-bucket.s3-us-west-2.amazonaws.com/aws-k8s-1.32/x86_64/" ``` ### Waves diff --git a/QUICKSTART-EKS.md b/QUICKSTART-EKS.md index 7a4aa367fc4..2e36d775d75 100644 --- a/QUICKSTART-EKS.md +++ b/QUICKSTART-EKS.md @@ -95,9 +95,9 @@ If you'd like even more control over your setup, something that eksctl can't (ye ### Finding an AMI The official AMI IDs are stored in [public SSM parameters](https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-public-parameters.html). -The parameter names look like this: `/aws/service/bottlerocket/aws-k8s-1.24/x86_64/latest/image_id` +The parameter names look like this: `/aws/service/bottlerocket/aws-k8s-1.32/x86_64/latest/image_id` -Just change the variant (`aws-k8s-1.24`) and architecture (`x86_64`) to the ones you want to use. +Just change the variant (`aws-k8s-1.32`) and architecture (`x86_64`) to the ones you want to use. Supported variants and architectures are described in the [README](README.md#variants). For the purposes of SSM parameters, the valid architecture names are `x86_64` and `arm64` (also known as `aarch64`). Also, if you know a specific Bottlerocket version you'd like to use, for example `1.11.0`, you can replace `latest` with that version. @@ -109,7 +109,7 @@ Once you have the parameter name you want to use, the easiest way to use it is t (You can also use this method for CloudFormation and other services that launch EC2 instances for you.) Just prefix the parameter name with `resolve:ssm:` and EC2 will fetch the current value for you. -For example, to use the parameter above, you would pass this as the AMI ID in your launch request: `resolve:ssm:/aws/service/bottlerocket/aws-k8s-1.24/x86_64/latest/image_id` +For example, to use the parameter above, you would pass this as the AMI ID in your launch request: `resolve:ssm:/aws/service/bottlerocket/aws-k8s-1.32/x86_64/latest/image_id` #### Manually querying SSM @@ -117,15 +117,15 @@ If you prefer to fetch the AMI ID yourself, you can use [aws-cli](https://aws.am To fetch the example parameter above, for the us-west-2 region, you could run this: ```shell -aws ssm get-parameter --region us-west-2 --name "/aws/service/bottlerocket/aws-k8s-1.24/x86_64/latest/image_id" --query Parameter.Value --output text +aws ssm get-parameter --region us-west-2 --name "/aws/service/bottlerocket/aws-k8s-1.32/x86_64/latest/image_id" --query Parameter.Value --output text ``` If you have `jq` installed and would like a bit more information, try this: ```shell aws ssm get-parameters --region us-west-2 \ - --names "/aws/service/bottlerocket/aws-k8s-1.24/x86_64/latest/image_id" \ - "/aws/service/bottlerocket/aws-k8s-1.24/x86_64/latest/image_version" \ + --names "/aws/service/bottlerocket/aws-k8s-1.32/x86_64/latest/image_id" \ + "/aws/service/bottlerocket/aws-k8s-1.32/x86_64/latest/image_version" \ --output json | jq -r '.Parameters | .[] | "\(.Name): \(.Value) (updated \(.LastModifiedDate | gmtime | strftime("%c")) UTC)"' ``` diff --git a/QUICKSTART-VMWARE.md b/QUICKSTART-VMWARE.md index 2d75ceb0941..cb22ad2fed4 100644 --- a/QUICKSTART-VMWARE.md +++ b/QUICKSTART-VMWARE.md @@ -45,8 +45,8 @@ sha512sum -c <<<"2ff1fbf99b20dd7ff5d2c84243a8e3b51701183b1f524b7d470a6b7a9b0172f Next, set your desired version and variant, and download the OVA: ```shell -VERSION="v1.6.1" -VARIANT="vmware-k8s-1.24" +VERSION="v1.31.0" +VARIANT="vmware-k8s-1.32" OVA="bottlerocket-${VARIANT}-x86_64-${VERSION}.ova" OUTDIR="${VARIANT}-${VERSION}" diff --git a/README.md b/README.md index a839a66bcf8..eeb67e8cc7e 100644 --- a/README.md +++ b/README.md @@ -57,11 +57,10 @@ We’re excited to get early feedback and to continue working on more use cases! Bottlerocket is architected such that different cloud environments and container orchestrators can be supported in the future. A build of Bottlerocket that supports different features or integration characteristics is known as a 'variant'. The artifacts of a build will include the architecture and variant name. -For example, an `x86_64` build of the `aws-k8s-1.24` variant will produce an image named `bottlerocket-aws-k8s-1.24-x86_64--.img`. +For example, an `x86_64` build of the `aws-k8s-1.32` variant will produce an image named `bottlerocket-aws-k8s-1.32-x86_64--.img`. The following variants support EKS, as described above: -* `aws-k8s-1.24` * `aws-k8s-1.25` * `aws-k8s-1.26` * `aws-k8s-1.27` @@ -70,7 +69,6 @@ The following variants support EKS, as described above: * `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` * `aws-k8s-1.27-nvidia` @@ -97,7 +95,7 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware: The following variants are no longer supported: -* All Kubernetes variants using Kubernetes 1.23 and earlier +* All Kubernetes variants using Kubernetes 1.24 and earlier * VMware variants using Kubernetes 1.27 and earlier * Bare metal variants for Kubernetes diff --git a/TESTING.md b/TESTING.md index ef5c528801f..b007c5ce284 100644 --- a/TESTING.md +++ b/TESTING.md @@ -187,18 +187,18 @@ You will need to delete the EKS cluster manually when you are done using it. ```shell cargo make \ - -e BUILDSYS_VARIANT="aws-k8s-1.24" \ + -e BUILDSYS_VARIANT="aws-k8s-1.32" \ -e BUILDSYS_ARCH="x86_64" \ build cargo make \ - -e BUILDSYS_VARIANT="aws-k8s-1.24" \ + -e BUILDSYS_VARIANT="aws-k8s-1.32" \ -e BUILDSYS_ARCH="x86_64" \ -e PUBLISH_REGIONS="us-west-2" \ ami cargo make \ - -e BUILDSYS_VARIANT="aws-k8s-1.24" \ + -e BUILDSYS_VARIANT="aws-k8s-1.32" \ -e BUILDSYS_ARCH="x86_64" \ test ```