From 8c11d36d80bc07f6cf7bcdf604c3507439c9becd Mon Sep 17 00:00:00 2001 From: Vighnesh Maheshwari Date: Wed, 13 May 2026 14:23:48 -0700 Subject: [PATCH 1/3] twoliter: bump core-kit version to v14.3.0 Signed-off-by: Vighnesh Maheshwari --- Twoliter.lock | 6 +++--- Twoliter.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Twoliter.lock b/Twoliter.lock index d859f32b781..970e2aa2784 100644 --- a/Twoliter.lock +++ b/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=" diff --git a/Twoliter.toml b/Twoliter.toml index 3f04f46a433..bfc4f93e206 100644 --- a/Twoliter.toml +++ b/Twoliter.toml @@ -17,5 +17,5 @@ vendor = "bottlerocket" [[kit]] name = "bottlerocket-core-kit" -version = "14.2.0" +version = "14.3.0" vendor = "bottlerocket" From b7761db936b00abe8fa949813a1e2ef036e7acf3 Mon Sep 17 00:00:00 2001 From: Vighnesh Maheshwari Date: Tue, 5 May 2026 17:09:15 -0700 Subject: [PATCH 2/3] variants: add k8s 1.36 variants Signed-off-by: Vighnesh Maheshwari --- Cargo.lock | 54 ++++++++++++++ Cargo.toml | 6 ++ README.md | 3 + .../settings-defaults/settings-defaults.spec | 74 +++++++++++++++++-- .../settings-plugins/settings-plugins.spec | 6 ++ sources/Cargo.lock | 21 ++++++ sources/Cargo.toml | 3 + .../aws-k8s-1.36-nvidia/Cargo.toml | 13 ++++ .../defaults.d/10-defaults.toml | 1 + .../defaults.d/11-updates.toml | 1 + .../defaults.d/15-aws-tuf.toml | 1 + .../defaults.d/20-aws-host-containers.toml | 1 + .../21-aws-bootstrap-container.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 + ...ubernetes-aws-external-cloud-provider.toml | 1 + ...55-kubernetes-aws-credential-provider.toml | 1 + .../56-kubernetes-seccomp-default-true.toml | 1 + ...ernetes-device-ownership-default-true.toml | 1 + .../58-kubernetes-graceful-shutdown.toml | 1 + .../59-kubernetes-kubelet-env-nvidia.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 + .../82-nvidia-k8s-device-plugin-cdi.toml | 1 + .../defaults.d/90-boot.toml | 1 + .../settings-defaults/aws-k8s-1.36/Cargo.toml | 13 ++++ .../aws-k8s-1.36/defaults.d/10-defaults.toml | 1 + .../aws-k8s-1.36/defaults.d/11-updates.toml | 1 + .../aws-k8s-1.36/defaults.d/15-aws-tuf.toml | 1 + .../defaults.d/20-aws-host-containers.toml | 1 + .../21-aws-bootstrap-container.toml | 1 + .../aws-k8s-1.36/defaults.d/25-cf-signal.toml | 1 + .../defaults.d/26-aws-autoscaling.toml | 1 + .../aws-k8s-1.36/defaults.d/30-metrics.toml | 1 + .../defaults.d/31-send-metrics-aws.toml | 1 + .../aws-k8s-1.36/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 + ...ubernetes-aws-external-cloud-provider.toml | 1 + ...55-kubernetes-aws-credential-provider.toml | 1 + .../56-kubernetes-seccomp-default-true.toml | 1 + ...ernetes-device-ownership-default-true.toml | 1 + .../58-kubernetes-graceful-shutdown.toml | 1 + .../defaults.d/60-lockdown-integrity.toml | 1 + .../aws-k8s-1.36/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.36/defaults.d/90-boot.toml | 1 + .../vmware-k8s-1.36/Cargo.toml | 13 ++++ .../defaults.d/10-defaults.toml | 1 + .../defaults.d/11-updates.toml | 1 + .../defaults.d/15-public-tuf.toml | 1 + .../defaults.d/20-public-host-containers.toml | 1 + .../21-public-bootstrap-containers.toml | 1 + .../defaults.d/30-metrics.toml | 1 + .../defaults.d/31-send-metrics.toml | 1 + .../defaults.d/40-aws-creds.toml | 1 + .../defaults.d/50-kubernetes-vmware.toml | 1 + .../defaults.d/51-kubernetes-containerd.toml | 1 + .../defaults.d/52-kubernetes-services.toml | 1 + .../defaults.d/53-containerd-cri-pki.toml | 1 + .../54-kubernetes-seccomp-default-true.toml | 1 + ...ernetes-device-ownership-default-true.toml | 1 + .../defaults.d/60-lockdown-integrity.toml | 1 + .../defaults.d/70-public-ntp.toml | 1 + .../75-oci-defaults-containerd-cri.toml | 1 + .../76-oci-defaults-capabilities.toml | 1 + ...faults-containerd-cri-resource-limits.toml | 1 + .../defaults.d/80-oci-hooks.toml | 1 + .../vmware-k8s-1.36/defaults.d/90-boot.toml | 1 + variants/aws-k8s-1.36-fips/Cargo.toml | 51 +++++++++++++ variants/aws-k8s-1.36-fips/amispec.toml | 1 + variants/aws-k8s-1.36-nvidia-fips/Cargo.toml | 58 +++++++++++++++ .../aws-k8s-1.36-nvidia-fips/amispec.toml | 1 + variants/aws-k8s-1.36-nvidia/Cargo.toml | 57 ++++++++++++++ variants/aws-k8s-1.36-nvidia/amispec.toml | 1 + variants/aws-k8s-1.36/Cargo.toml | 50 +++++++++++++ variants/aws-k8s-1.36/amispec.toml | 1 + variants/vmware-k8s-1.36-fips/Cargo.toml | 58 +++++++++++++++ variants/vmware-k8s-1.36-fips/template.ovf | 1 + variants/vmware-k8s-1.36/Cargo.toml | 57 ++++++++++++++ variants/vmware-k8s-1.36/template.ovf | 1 + 97 files changed, 611 insertions(+), 7 deletions(-) create mode 100644 sources/settings-defaults/aws-k8s-1.36-nvidia/Cargo.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/10-defaults.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/11-updates.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/15-aws-tuf.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/20-aws-host-containers.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/25-cf-signal.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/26-aws-autoscaling.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/30-metrics.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/31-send-metrics-aws.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/40-aws-creds.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/50-kubernetes-aws.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/52-kubernetes-services.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/53-containerd-cri-pki.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/56-kubernetes-seccomp-default-true.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/57-kubernetes-device-ownership-default-true.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/58-kubernetes-graceful-shutdown.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/59-kubernetes-kubelet-env-nvidia.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/60-lockdown-none.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/70-oci-hooks.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/76-oci-defaults-capabilities.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/82-nvidia-k8s-device-plugin-cdi.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/90-boot.toml create mode 100644 sources/settings-defaults/aws-k8s-1.36/Cargo.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/10-defaults.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/11-updates.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/15-aws-tuf.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/20-aws-host-containers.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/21-aws-bootstrap-container.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/25-cf-signal.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/26-aws-autoscaling.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/30-metrics.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/31-send-metrics-aws.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/40-aws-creds.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/50-kubernetes-aws.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/51-kubernetes-containerd.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/52-kubernetes-services.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/53-containerd-cri-pki.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/54-kubernetes-aws-external-cloud-provider.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/55-kubernetes-aws-credential-provider.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/56-kubernetes-seccomp-default-true.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/57-kubernetes-device-ownership-default-true.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/58-kubernetes-graceful-shutdown.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/60-lockdown-integrity.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/70-oci-hooks.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/75-oci-defaults-containerd-cri.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/76-oci-defaults-capabilities.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml create mode 120000 sources/settings-defaults/aws-k8s-1.36/defaults.d/90-boot.toml create mode 100644 sources/settings-defaults/vmware-k8s-1.36/Cargo.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/10-defaults.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/11-updates.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/15-public-tuf.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/20-public-host-containers.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/21-public-bootstrap-containers.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/30-metrics.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/31-send-metrics.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/40-aws-creds.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/50-kubernetes-vmware.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/51-kubernetes-containerd.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/52-kubernetes-services.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/53-containerd-cri-pki.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/54-kubernetes-seccomp-default-true.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/55-kubernetes-device-ownership-default-true.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/60-lockdown-integrity.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/70-public-ntp.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/75-oci-defaults-containerd-cri.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/76-oci-defaults-capabilities.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/80-oci-hooks.toml create mode 120000 sources/settings-defaults/vmware-k8s-1.36/defaults.d/90-boot.toml create mode 100644 variants/aws-k8s-1.36-fips/Cargo.toml create mode 120000 variants/aws-k8s-1.36-fips/amispec.toml create mode 100644 variants/aws-k8s-1.36-nvidia-fips/Cargo.toml create mode 120000 variants/aws-k8s-1.36-nvidia-fips/amispec.toml create mode 100644 variants/aws-k8s-1.36-nvidia/Cargo.toml create mode 120000 variants/aws-k8s-1.36-nvidia/amispec.toml create mode 100644 variants/aws-k8s-1.36/Cargo.toml create mode 120000 variants/aws-k8s-1.36/amispec.toml create mode 100644 variants/vmware-k8s-1.36-fips/Cargo.toml create mode 120000 variants/vmware-k8s-1.36-fips/template.ovf create mode 100644 variants/vmware-k8s-1.36/Cargo.toml create mode 120000 variants/vmware-k8s-1.36/template.ovf diff --git a/Cargo.lock b/Cargo.lock index 3a9a97093be..68c7d3b0779 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -299,6 +299,42 @@ dependencies = [ "settings-plugins", ] +[[package]] +name = "aws-k8s-1_36" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] + +[[package]] +name = "aws-k8s-1_36-fips" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] + +[[package]] +name = "aws-k8s-1_36-nvidia" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] + +[[package]] +name = "aws-k8s-1_36-nvidia-fips" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] + [[package]] name = "metal-dev" version = "0.1.0" @@ -436,3 +472,21 @@ dependencies = [ "settings-migrations", "settings-plugins", ] + +[[package]] +name = "vmware-k8s-1_36" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] + +[[package]] +name = "vmware-k8s-1_36-fips" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] diff --git a/Cargo.toml b/Cargo.toml index aede8938c70..19e9703978a 100644 --- a/Cargo.toml +++ b/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] diff --git a/README.md b/README.md index e0d31e44f2d..4a1881e498b 100644 --- a/README.md +++ b/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: diff --git a/packages/settings-defaults/settings-defaults.spec b/packages/settings-defaults/settings-defaults.spec index f84389f35df..541d61e2118 100644 --- a/packages/settings-defaults/settings-defaults.spec +++ b/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 diff --git a/packages/settings-plugins/settings-plugins.spec b/packages/settings-plugins/settings-plugins.spec index 93c5b5b686a..b79815af80f 100644 --- a/packages/settings-plugins/settings-plugins.spec +++ b/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 diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 093cea829a6..269f07ccf5f 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -1986,6 +1986,20 @@ dependencies = [ "bottlerocket-defaults-helper", ] +[[package]] +name = "settings-defaults-aws-k8s-1_36" +version = "0.1.0" +dependencies = [ + "bottlerocket-defaults-helper", +] + +[[package]] +name = "settings-defaults-aws-k8s-1_36-nvidia" +version = "0.1.0" +dependencies = [ + "bottlerocket-defaults-helper", +] + [[package]] name = "settings-defaults-metal-dev" version = "0.1.0" @@ -2035,6 +2049,13 @@ dependencies = [ "bottlerocket-defaults-helper", ] +[[package]] +name = "settings-defaults-vmware-k8s-1_36" +version = "0.1.0" +dependencies = [ + "bottlerocket-defaults-helper", +] + [[package]] name = "settings-extension-autoscaling" version = "0.1.0" diff --git a/sources/Cargo.toml b/sources/Cargo.toml index df3bddd2fd2..71c7b8ba69f 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -28,6 +28,8 @@ 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", @@ -35,6 +37,7 @@ members = [ "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", diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/Cargo.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/Cargo.toml new file mode 100644 index 00000000000..f8556af509c --- /dev/null +++ b/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 diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/10-defaults.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/10-defaults.toml new file mode 120000 index 00000000000..a202ba61a4c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/10-defaults.toml @@ -0,0 +1 @@ +../../../shared-defaults/defaults.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/11-updates.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/11-updates.toml new file mode 120000 index 00000000000..e5db6f891dd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/11-updates.toml @@ -0,0 +1 @@ +../../../shared-defaults/updates.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/15-aws-tuf.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/15-aws-tuf.toml new file mode 120000 index 00000000000..afcef6a617e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/15-aws-tuf.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-tuf.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/20-aws-host-containers.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/20-aws-host-containers.toml new file mode 120000 index 00000000000..4d404d663cd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/20-aws-host-containers.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-host-containers.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/25-cf-signal.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/25-cf-signal.toml new file mode 120000 index 00000000000..a33d541652c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/25-cf-signal.toml @@ -0,0 +1 @@ +../../../shared-defaults/cf-signal.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/26-aws-autoscaling.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/26-aws-autoscaling.toml new file mode 120000 index 00000000000..b579c0182b6 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/26-aws-autoscaling.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-autoscaling.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/30-metrics.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/30-metrics.toml new file mode 120000 index 00000000000..99f0b2b6980 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/30-metrics.toml @@ -0,0 +1 @@ +../../../shared-defaults/metrics.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/31-send-metrics-aws.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/31-send-metrics-aws.toml new file mode 120000 index 00000000000..2fefefea751 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/31-send-metrics-aws.toml @@ -0,0 +1 @@ +../../../shared-defaults/send-metrics-aws.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/40-aws-creds.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/40-aws-creds.toml new file mode 120000 index 00000000000..a6a17e88f54 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/40-aws-creds.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-creds.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/50-kubernetes-aws.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/50-kubernetes-aws.toml new file mode 120000 index 00000000000..7393a2dd3d1 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/50-kubernetes-aws.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-aws.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml new file mode 120000 index 00000000000..e68ab5eaa3c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-containerd-nvidia.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/52-kubernetes-services.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/52-kubernetes-services.toml new file mode 120000 index 00000000000..afab5a7f15a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/52-kubernetes-services.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-services.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/53-containerd-cri-pki.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/53-containerd-cri-pki.toml new file mode 120000 index 00000000000..2dbf7db789b --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/53-containerd-cri-pki.toml @@ -0,0 +1 @@ +../../../shared-defaults/containerd-cri-pki.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml new file mode 120000 index 00000000000..cb2c4be2e8e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-aws-external-cloud-provider.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml new file mode 120000 index 00000000000..43773cc11ae --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-aws-credential-provider.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/56-kubernetes-seccomp-default-true.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/56-kubernetes-seccomp-default-true.toml new file mode 120000 index 00000000000..940e8cb44ee --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/56-kubernetes-seccomp-default-true.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-seccomp-default-true.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/57-kubernetes-device-ownership-default-true.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/57-kubernetes-device-ownership-default-true.toml new file mode 120000 index 00000000000..a86883026e5 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/57-kubernetes-device-ownership-default-true.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-true.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/58-kubernetes-graceful-shutdown.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/58-kubernetes-graceful-shutdown.toml new file mode 120000 index 00000000000..6e77be4eed8 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/58-kubernetes-graceful-shutdown.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-aws-graceful-shutdown.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/59-kubernetes-kubelet-env-nvidia.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/59-kubernetes-kubelet-env-nvidia.toml new file mode 120000 index 00000000000..c7658463f2b --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/59-kubernetes-kubelet-env-nvidia.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-kubelet-env-nvidia.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/60-lockdown-none.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/60-lockdown-none.toml new file mode 120000 index 00000000000..cced543330e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/60-lockdown-none.toml @@ -0,0 +1 @@ +../../../shared-defaults/lockdown-none.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/70-oci-hooks.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/70-oci-hooks.toml new file mode 120000 index 00000000000..e7b73c620dd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/70-oci-hooks.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-hooks.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml new file mode 120000 index 00000000000..25204d67d21 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-defaults-containerd-cri.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/76-oci-defaults-capabilities.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/76-oci-defaults-capabilities.toml new file mode 120000 index 00000000000..100c2874090 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/76-oci-defaults-capabilities.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-defaults-capabilities.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml new file mode 120000 index 00000000000..7f06213572a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-defaults-containerd-cri-resource-limits.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml new file mode 120000 index 00000000000..0b3f42928f1 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml @@ -0,0 +1 @@ +../../../shared-defaults/nvidia-k8s-container-toolkit.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml new file mode 120000 index 00000000000..741cfa58cca --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml @@ -0,0 +1 @@ +../../../shared-defaults/nvidia-k8s-device-plugin.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/82-nvidia-k8s-device-plugin-cdi.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/82-nvidia-k8s-device-plugin-cdi.toml new file mode 120000 index 00000000000..b5486e31eee --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/82-nvidia-k8s-device-plugin-cdi.toml @@ -0,0 +1 @@ +../../../shared-defaults/nvidia-k8s-device-plugin-cdi.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/90-boot.toml b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/90-boot.toml new file mode 120000 index 00000000000..7778447459a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36-nvidia/defaults.d/90-boot.toml @@ -0,0 +1 @@ +../../../shared-defaults/boot.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/Cargo.toml b/sources/settings-defaults/aws-k8s-1.36/Cargo.toml new file mode 100644 index 00000000000..234e19e15bb --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "settings-defaults-aws-k8s-1_36" +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.36/defaults.d/10-defaults.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/10-defaults.toml new file mode 120000 index 00000000000..a202ba61a4c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/10-defaults.toml @@ -0,0 +1 @@ +../../../shared-defaults/defaults.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/11-updates.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/11-updates.toml new file mode 120000 index 00000000000..e5db6f891dd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/11-updates.toml @@ -0,0 +1 @@ +../../../shared-defaults/updates.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/15-aws-tuf.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/15-aws-tuf.toml new file mode 120000 index 00000000000..afcef6a617e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/15-aws-tuf.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-tuf.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/20-aws-host-containers.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/20-aws-host-containers.toml new file mode 120000 index 00000000000..4d404d663cd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/20-aws-host-containers.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-host-containers.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/21-aws-bootstrap-container.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/21-aws-bootstrap-container.toml new file mode 120000 index 00000000000..7709ecb2ebd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/21-aws-bootstrap-container.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-bootstrap-container.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/25-cf-signal.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/25-cf-signal.toml new file mode 120000 index 00000000000..a33d541652c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/25-cf-signal.toml @@ -0,0 +1 @@ +../../../shared-defaults/cf-signal.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/26-aws-autoscaling.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/26-aws-autoscaling.toml new file mode 120000 index 00000000000..b579c0182b6 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/26-aws-autoscaling.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-autoscaling.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/30-metrics.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/30-metrics.toml new file mode 120000 index 00000000000..99f0b2b6980 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/30-metrics.toml @@ -0,0 +1 @@ +../../../shared-defaults/metrics.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/31-send-metrics-aws.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/31-send-metrics-aws.toml new file mode 120000 index 00000000000..2fefefea751 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/31-send-metrics-aws.toml @@ -0,0 +1 @@ +../../../shared-defaults/send-metrics-aws.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/40-aws-creds.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/40-aws-creds.toml new file mode 120000 index 00000000000..a6a17e88f54 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/40-aws-creds.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-creds.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/50-kubernetes-aws.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/50-kubernetes-aws.toml new file mode 120000 index 00000000000..7393a2dd3d1 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/50-kubernetes-aws.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-aws.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/51-kubernetes-containerd.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/51-kubernetes-containerd.toml new file mode 120000 index 00000000000..08196a5edef --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/51-kubernetes-containerd.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-containerd.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/52-kubernetes-services.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/52-kubernetes-services.toml new file mode 120000 index 00000000000..afab5a7f15a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/52-kubernetes-services.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-services.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/53-containerd-cri-pki.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/53-containerd-cri-pki.toml new file mode 120000 index 00000000000..2dbf7db789b --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/53-containerd-cri-pki.toml @@ -0,0 +1 @@ +../../../shared-defaults/containerd-cri-pki.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/54-kubernetes-aws-external-cloud-provider.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/54-kubernetes-aws-external-cloud-provider.toml new file mode 120000 index 00000000000..cb2c4be2e8e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/54-kubernetes-aws-external-cloud-provider.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-aws-external-cloud-provider.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/55-kubernetes-aws-credential-provider.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/55-kubernetes-aws-credential-provider.toml new file mode 120000 index 00000000000..43773cc11ae --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/55-kubernetes-aws-credential-provider.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-aws-credential-provider.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/56-kubernetes-seccomp-default-true.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/56-kubernetes-seccomp-default-true.toml new file mode 120000 index 00000000000..940e8cb44ee --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/56-kubernetes-seccomp-default-true.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-seccomp-default-true.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/57-kubernetes-device-ownership-default-true.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/57-kubernetes-device-ownership-default-true.toml new file mode 120000 index 00000000000..a86883026e5 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/57-kubernetes-device-ownership-default-true.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-true.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/58-kubernetes-graceful-shutdown.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/58-kubernetes-graceful-shutdown.toml new file mode 120000 index 00000000000..6e77be4eed8 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/58-kubernetes-graceful-shutdown.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-aws-graceful-shutdown.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/60-lockdown-integrity.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/60-lockdown-integrity.toml new file mode 120000 index 00000000000..8b4de873a39 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/60-lockdown-integrity.toml @@ -0,0 +1 @@ +../../../shared-defaults/lockdown-integrity.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/70-oci-hooks.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/70-oci-hooks.toml new file mode 120000 index 00000000000..e7b73c620dd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/70-oci-hooks.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-hooks.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/75-oci-defaults-containerd-cri.toml new file mode 120000 index 00000000000..25204d67d21 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/75-oci-defaults-containerd-cri.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-defaults-containerd-cri.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/76-oci-defaults-capabilities.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/76-oci-defaults-capabilities.toml new file mode 120000 index 00000000000..100c2874090 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/76-oci-defaults-capabilities.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-defaults-capabilities.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml new file mode 120000 index 00000000000..7f06213572a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-defaults-containerd-cri-resource-limits.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.36/defaults.d/90-boot.toml b/sources/settings-defaults/aws-k8s-1.36/defaults.d/90-boot.toml new file mode 120000 index 00000000000..7778447459a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.36/defaults.d/90-boot.toml @@ -0,0 +1 @@ +../../../shared-defaults/boot.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/Cargo.toml b/sources/settings-defaults/vmware-k8s-1.36/Cargo.toml new file mode 100644 index 00000000000..f5d9fcd01d9 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "settings-defaults-vmware-k8s-1_36" +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/vmware-k8s-1.36/defaults.d/10-defaults.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/10-defaults.toml new file mode 120000 index 00000000000..a202ba61a4c --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/10-defaults.toml @@ -0,0 +1 @@ +../../../shared-defaults/defaults.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/11-updates.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/11-updates.toml new file mode 120000 index 00000000000..e5db6f891dd --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/11-updates.toml @@ -0,0 +1 @@ +../../../shared-defaults/updates.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/15-public-tuf.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/15-public-tuf.toml new file mode 120000 index 00000000000..561a74dfd90 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/15-public-tuf.toml @@ -0,0 +1 @@ +../../../shared-defaults/public-tuf.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/20-public-host-containers.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/20-public-host-containers.toml new file mode 120000 index 00000000000..6119af1cfa3 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/20-public-host-containers.toml @@ -0,0 +1 @@ +../../../shared-defaults/public-host-containers.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/21-public-bootstrap-containers.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/21-public-bootstrap-containers.toml new file mode 120000 index 00000000000..91c980b9381 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/21-public-bootstrap-containers.toml @@ -0,0 +1 @@ +../../../shared-defaults/public-bootstrap-containers.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/30-metrics.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/30-metrics.toml new file mode 120000 index 00000000000..99f0b2b6980 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/30-metrics.toml @@ -0,0 +1 @@ +../../../shared-defaults/metrics.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/31-send-metrics.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/31-send-metrics.toml new file mode 120000 index 00000000000..d01b193f18d --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/31-send-metrics.toml @@ -0,0 +1 @@ +../../../shared-defaults/send-metrics-global.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/40-aws-creds.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/40-aws-creds.toml new file mode 120000 index 00000000000..a6a17e88f54 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/40-aws-creds.toml @@ -0,0 +1 @@ +../../../shared-defaults/aws-creds.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/50-kubernetes-vmware.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/50-kubernetes-vmware.toml new file mode 120000 index 00000000000..f67755f3b0a --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/50-kubernetes-vmware.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-vmware.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/51-kubernetes-containerd.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/51-kubernetes-containerd.toml new file mode 120000 index 00000000000..08196a5edef --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/51-kubernetes-containerd.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-containerd.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/52-kubernetes-services.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/52-kubernetes-services.toml new file mode 120000 index 00000000000..afab5a7f15a --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/52-kubernetes-services.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-services.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/53-containerd-cri-pki.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/53-containerd-cri-pki.toml new file mode 120000 index 00000000000..2dbf7db789b --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/53-containerd-cri-pki.toml @@ -0,0 +1 @@ +../../../shared-defaults/containerd-cri-pki.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/54-kubernetes-seccomp-default-true.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/54-kubernetes-seccomp-default-true.toml new file mode 120000 index 00000000000..940e8cb44ee --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/54-kubernetes-seccomp-default-true.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-seccomp-default-true.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/55-kubernetes-device-ownership-default-true.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/55-kubernetes-device-ownership-default-true.toml new file mode 120000 index 00000000000..a86883026e5 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/55-kubernetes-device-ownership-default-true.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-device-ownership-default-true.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/60-lockdown-integrity.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/60-lockdown-integrity.toml new file mode 120000 index 00000000000..8b4de873a39 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/60-lockdown-integrity.toml @@ -0,0 +1 @@ +../../../shared-defaults/lockdown-integrity.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/70-public-ntp.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/70-public-ntp.toml new file mode 120000 index 00000000000..eb5f4bcd0a7 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/70-public-ntp.toml @@ -0,0 +1 @@ +../../../shared-defaults/public-ntp.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/75-oci-defaults-containerd-cri.toml new file mode 120000 index 00000000000..25204d67d21 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/75-oci-defaults-containerd-cri.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-defaults-containerd-cri.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/76-oci-defaults-capabilities.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/76-oci-defaults-capabilities.toml new file mode 120000 index 00000000000..100c2874090 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/76-oci-defaults-capabilities.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-defaults-capabilities.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml new file mode 120000 index 00000000000..7f06213572a --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-defaults-containerd-cri-resource-limits.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/80-oci-hooks.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/80-oci-hooks.toml new file mode 120000 index 00000000000..e7b73c620dd --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/80-oci-hooks.toml @@ -0,0 +1 @@ +../../../shared-defaults/oci-hooks.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.36/defaults.d/90-boot.toml b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/90-boot.toml new file mode 120000 index 00000000000..7778447459a --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.36/defaults.d/90-boot.toml @@ -0,0 +1 @@ +../../../shared-defaults/boot.toml \ No newline at end of file diff --git a/variants/aws-k8s-1.36-fips/Cargo.toml b/variants/aws-k8s-1.36-fips/Cargo.toml new file mode 100644 index 00000000000..6849670fcda --- /dev/null +++ b/variants/aws-k8s-1.36-fips/Cargo.toml @@ -0,0 +1,51 @@ +[package] +# This is the aws-k8s-1.36-fips variant. "." is not allowed in crate names, but we +# don't use this crate name anywhere. +name = "aws-k8s-1_36-fips" +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 +uefi-secure-boot = true +xfs-data-partition = true +erofs-root-partition = true +systemd-networkd = true +fips = true +external-kmod-development = false + +[package.metadata.build-variant] +included-packages = [ +# core + "release-swap", + "kernel-6.12", + "containerd-2.2", + "systemd-257", + "nftables", + "whippet", +# k8s + "cni", + "cni-plugins", + "kubelet-1.36", + "aws-iam-authenticator", + "soci-snapshotter", +] +kernel-parameters = [ + "console=tty0", + "console=ttyS0,115200n8", + "net.ifnames=0", + "netdog.default-interface=eth0:dhcp4,dhcp6?", + "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.36-fips/amispec.toml b/variants/aws-k8s-1.36-fips/amispec.toml new file mode 120000 index 00000000000..64c26967c8f --- /dev/null +++ b/variants/aws-k8s-1.36-fips/amispec.toml @@ -0,0 +1 @@ +../shared/amispec-split.toml \ No newline at end of file diff --git a/variants/aws-k8s-1.36-nvidia-fips/Cargo.toml b/variants/aws-k8s-1.36-nvidia-fips/Cargo.toml new file mode 100644 index 00000000000..4a8e8405ab5 --- /dev/null +++ b/variants/aws-k8s-1.36-nvidia-fips/Cargo.toml @@ -0,0 +1,58 @@ +[package] +# This is the aws-k8s-1.36-nvidia-fips variant. "." is not allowed in crate names, but we +# don't use this crate name anywhere. +name = "aws-k8s-1_36-nvidia-fips" +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 +uefi-secure-boot = true +xfs-data-partition = true +erofs-root-partition = true +systemd-networkd = true +external-kmod-development = false +fips = true + +[package.metadata.build-variant] +included-packages = [ + # core + "release-swap", + "kernel-6.12", + "containerd-2.2", + "systemd-257", + "nftables", + "whippet", + # k8s + "cni", + "cni-plugins", + "kubelet-1.36", + "aws-iam-authenticator", + "soci-snapshotter", + # nvidia + "nvidia-container-toolkit-k8s", + "nvidia-k8s-device-plugin", + "kmod-6.12-nvidia-r580-tesla", +] +kernel-parameters = [ + "console=tty0", + "console=ttyS0,115200n8", + "net.ifnames=0", + "netdog.default-interface=eth0:dhcp4,dhcp6?", + "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.36-nvidia-fips/amispec.toml b/variants/aws-k8s-1.36-nvidia-fips/amispec.toml new file mode 120000 index 00000000000..64c26967c8f --- /dev/null +++ b/variants/aws-k8s-1.36-nvidia-fips/amispec.toml @@ -0,0 +1 @@ +../shared/amispec-split.toml \ No newline at end of file diff --git a/variants/aws-k8s-1.36-nvidia/Cargo.toml b/variants/aws-k8s-1.36-nvidia/Cargo.toml new file mode 100644 index 00000000000..5c1474f7465 --- /dev/null +++ b/variants/aws-k8s-1.36-nvidia/Cargo.toml @@ -0,0 +1,57 @@ +[package] +# This is the aws-k8s-1.36-nvidia variant. "." is not allowed in crate names, but we +# don't use this crate name anywhere. +name = "aws-k8s-1_36-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 +uefi-secure-boot = true +xfs-data-partition = true +erofs-root-partition = true +systemd-networkd = true +external-kmod-development = false + +[package.metadata.build-variant] +included-packages = [ + # core + "release-swap", + "kernel-6.18", + "containerd-2.2", + "systemd-257", + "nftables", + "whippet", + # k8s + "cni", + "cni-plugins", + "kubelet-1.36", + "aws-iam-authenticator", + "soci-snapshotter", + # nvidia + "nvidia-container-toolkit-k8s", + "nvidia-k8s-device-plugin", + "kmod-6.18-nvidia-r580-tesla", +] +kernel-parameters = [ + "console=tty0", + "console=ttyS0,115200n8", + "net.ifnames=0", + "netdog.default-interface=eth0:dhcp4,dhcp6?", + "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.36-nvidia/amispec.toml b/variants/aws-k8s-1.36-nvidia/amispec.toml new file mode 120000 index 00000000000..64c26967c8f --- /dev/null +++ b/variants/aws-k8s-1.36-nvidia/amispec.toml @@ -0,0 +1 @@ +../shared/amispec-split.toml \ No newline at end of file diff --git a/variants/aws-k8s-1.36/Cargo.toml b/variants/aws-k8s-1.36/Cargo.toml new file mode 100644 index 00000000000..b65ca88a5bf --- /dev/null +++ b/variants/aws-k8s-1.36/Cargo.toml @@ -0,0 +1,50 @@ +[package] +# This is the aws-k8s-1.36 variant. "." is not allowed in crate names, but we +# don't use this crate name anywhere. +name = "aws-k8s-1_36" +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 +uefi-secure-boot = true +xfs-data-partition = true +erofs-root-partition = true +systemd-networkd = true +external-kmod-development = false + +[package.metadata.build-variant] +included-packages = [ +# core + "release-swap", + "kernel-6.18", + "containerd-2.2", + "systemd-257", + "nftables", + "whippet", +# k8s + "cni", + "cni-plugins", + "kubelet-1.36", + "aws-iam-authenticator", + "soci-snapshotter", +] +kernel-parameters = [ + "console=tty0", + "console=ttyS0,115200n8", + "net.ifnames=0", + "netdog.default-interface=eth0:dhcp4,dhcp6?", + "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.36/amispec.toml b/variants/aws-k8s-1.36/amispec.toml new file mode 120000 index 00000000000..64c26967c8f --- /dev/null +++ b/variants/aws-k8s-1.36/amispec.toml @@ -0,0 +1 @@ +../shared/amispec-split.toml \ No newline at end of file diff --git a/variants/vmware-k8s-1.36-fips/Cargo.toml b/variants/vmware-k8s-1.36-fips/Cargo.toml new file mode 100644 index 00000000000..bfd58ff3bf2 --- /dev/null +++ b/variants/vmware-k8s-1.36-fips/Cargo.toml @@ -0,0 +1,58 @@ +[package] +# This is the vmware-k8s-1.36 variant. "." is not allowed in crate names, but +# we don't use this crate name anywhere. +name = "vmware-k8s-1_36-fips" +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] +partition-plan = "unified" + +[package.metadata.build-variant.image-features] +grub-set-private-var = true +uefi-secure-boot = true +xfs-data-partition = true +erofs-root-partition = true +systemd-networkd = true +fips = true +external-kmod-development = false + +[package.metadata.build-variant] +image-format = "vmdk" +supported-arches = ["x86_64"] +kernel-parameters = [ + "console=tty1", + # Only reserve if there are at least 2GB + "crashkernel=2G-:256M", + "net.ifnames=0", + "netdog.default-interface=eth0:dhcp4,dhcp6?", + "quiet", +] +included-packages = [ + # core + "release-swap", + "kernel-6.12", + "containerd-2.2", + "systemd-257", + "nftables", + "whippet", + # k8s + "cni", + "cni-plugins", + "kubelet-1.36", + "soci-snapshotter", + # vmware + "open-vm-tools", +] + +[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/vmware-k8s-1.36-fips/template.ovf b/variants/vmware-k8s-1.36-fips/template.ovf new file mode 120000 index 00000000000..db70bac6f1b --- /dev/null +++ b/variants/vmware-k8s-1.36-fips/template.ovf @@ -0,0 +1 @@ +../shared/template-unified-secboot.ovf \ No newline at end of file diff --git a/variants/vmware-k8s-1.36/Cargo.toml b/variants/vmware-k8s-1.36/Cargo.toml new file mode 100644 index 00000000000..561acdd00ef --- /dev/null +++ b/variants/vmware-k8s-1.36/Cargo.toml @@ -0,0 +1,57 @@ +[package] +# This is the vmware-k8s-1.36 variant. "." is not allowed in crate names, but +# we don't use this crate name anywhere. +name = "vmware-k8s-1_36" +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] +partition-plan = "unified" + +[package.metadata.build-variant.image-features] +grub-set-private-var = true +uefi-secure-boot = true +xfs-data-partition = true +erofs-root-partition = true +systemd-networkd = true +external-kmod-development = false + +[package.metadata.build-variant] +image-format = "vmdk" +supported-arches = ["x86_64"] +kernel-parameters = [ + "console=tty1", + # Only reserve if there are at least 2GB + "crashkernel=2G-:256M", + "net.ifnames=0", + "netdog.default-interface=eth0:dhcp4,dhcp6?", + "quiet", +] +included-packages = [ + # core + "release-swap", + "kernel-6.18", + "containerd-2.2", + "systemd-257", + "nftables", + "whippet", + # k8s + "cni", + "cni-plugins", + "kubelet-1.36", + "soci-snapshotter", + # vmware + "open-vm-tools", +] + +[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/vmware-k8s-1.36/template.ovf b/variants/vmware-k8s-1.36/template.ovf new file mode 120000 index 00000000000..db70bac6f1b --- /dev/null +++ b/variants/vmware-k8s-1.36/template.ovf @@ -0,0 +1 @@ +../shared/template-unified-secboot.ovf \ No newline at end of file From d73417f855fc04b6b75ae592c4bcae38b19ff0de Mon Sep 17 00:00:00 2001 From: Vighnesh Maheshwari Date: Tue, 5 May 2026 17:10:25 -0700 Subject: [PATCH 3/3] release: bump version to 1.61.0 Signed-off-by: Vighnesh Maheshwari --- Release.toml | 3 ++- Twoliter.toml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Release.toml b/Release.toml index 2f1597dfe8c..227bc1feef5 100644 --- a/Release.toml +++ b/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)" = [] diff --git a/Twoliter.toml b/Twoliter.toml index bfc4f93e206..08c79c79c0d 100644 --- a/Twoliter.toml +++ b/Twoliter.toml @@ -1,5 +1,5 @@ schema-version = 2 -release-version = "1.60.0" +release-version = "1.61.0" project-vendor = "Bottlerocket" [vendor.bottlerocket]