diff --git a/Cargo.lock b/Cargo.lock index db59812d22a..6984ac0fc40 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -236,6 +236,33 @@ dependencies = [ "settings-plugins", ] +[[package]] +name = "aws-k8s-1_32" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] + +[[package]] +name = "aws-k8s-1_32-fips" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] + +[[package]] +name = "aws-k8s-1_32-nvidia" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] + [[package]] name = "metal-dev" version = "0.1.0" @@ -337,3 +364,21 @@ dependencies = [ "settings-migrations", "settings-plugins", ] + +[[package]] +name = "vmware-k8s-1_32" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] + +[[package]] +name = "vmware-k8s-1_32-fips" +version = "0.1.0" +dependencies = [ + "settings-defaults", + "settings-migrations", + "settings-plugins", +] diff --git a/Cargo.toml b/Cargo.toml index 85c4f1e6863..ab923a907ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,11 +25,14 @@ members = [ "variants/aws-k8s-1.30-fips", "variants/aws-k8s-1.31", "variants/aws-k8s-1.31-fips", + "variants/aws-k8s-1.32", + "variants/aws-k8s-1.32-fips", "variants/aws-k8s-1.27-nvidia", "variants/aws-k8s-1.28-nvidia", "variants/aws-k8s-1.29-nvidia", "variants/aws-k8s-1.30-nvidia", "variants/aws-k8s-1.31-nvidia", + "variants/aws-k8s-1.32-nvidia", "variants/metal-dev", "variants/vmware-dev", "variants/vmware-k8s-1.28", @@ -40,6 +43,8 @@ members = [ "variants/vmware-k8s-1.30-fips", "variants/vmware-k8s-1.31", "variants/vmware-k8s-1.31-fips", + "variants/vmware-k8s-1.32", + "variants/vmware-k8s-1.32-fips", ] [profile.dev] diff --git a/README.md b/README.md index 02a5516e462..a839a66bcf8 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ The following variants support EKS, as described above: * `aws-k8s-1.29` * `aws-k8s-1.30` * `aws-k8s-1.31` +* `aws-k8s-1.32` * `aws-k8s-1.24-nvidia` * `aws-k8s-1.25-nvidia` * `aws-k8s-1.26-nvidia` @@ -77,6 +78,7 @@ The following variants support EKS, as described above: * `aws-k8s-1.29-nvidia` * `aws-k8s-1.30-nvidia` * `aws-k8s-1.31-nvidia` +* `aws-k8s-1.32-nvidia` The following variants support ECS: @@ -91,6 +93,7 @@ We also have variants that are designed to be Kubernetes worker nodes in VMware: * `vmware-k8s-1.29` * `vmware-k8s-1.30` * `vmware-k8s-1.31` +* `vmware-k8s-1.32` The following variants are no longer supported: @@ -387,7 +390,7 @@ See the ["Capabilities Settings" section in the `settings.oci-defaults.*` refere ##### OCI Defaults: Resource Limits See the ["Resource Limits Settings" section in the `settings.oci-defaults.*` reference](https://bottlerocket.dev/en/os/latest/#/api/settings/oci-defaults/). - + #### Container image registry settings See the [`settings.container-registry.*` reference](https://bottlerocket.dev/en/os/latest/#/api/settings/container-registry/). @@ -407,7 +410,7 @@ See the [`settings.network.*` reference](https://bottlerocket.dev/en/os/latest/# ##### Proxy settings See the ["Proxy Settings" section in the `settings.networks.*` reference](https://bottlerocket.dev/en/os/latest/#/api/settings/network/). - + #### Metrics settings See the [`settings.metrics.*` reference](https://bottlerocket.dev/en/os/latest/#/api/settings/metrics/). diff --git a/packages/settings-defaults/settings-defaults.spec b/packages/settings-defaults/settings-defaults.spec index 32d792151fe..999ece8c47e 100644 --- a/packages/settings-defaults/settings-defaults.spec +++ b/packages/settings-defaults/settings-defaults.spec @@ -131,7 +131,7 @@ Conflicts: %{_cross_os}settings-defaults(any) %description aws-k8s-1.26-nvidia %{summary}. -%package aws-k8s-1.31 +%package aws-k8s-1.32 Summary: Settings defaults for the aws-k8s 1.27 through 1.30 variants Requires: (%{shrink: %{_cross_os}variant(aws-k8s-1.27) or @@ -142,7 +142,9 @@ Requires: (%{shrink: %{_cross_os}variant(aws-k8s-1.30) or %{_cross_os}variant(aws-k8s-1.30-fips) or %{_cross_os}variant(aws-k8s-1.31) or - %{_cross_os}variant(aws-k8s-1.31-fips) + %{_cross_os}variant(aws-k8s-1.31-fips) or + %{_cross_os}variant(aws-k8s-1.32) or + %{_cross_os}variant(aws-k8s-1.32-fips) %{nil}}) Provides: %{_cross_os}settings-defaults(any) Provides: %{_cross_os}settings-defaults(aws-k8s-1.27) @@ -154,19 +156,22 @@ Provides: %{_cross_os}settings-defaults(aws-k8s-1.30) Provides: %{_cross_os}settings-defaults(aws-k8s-1.30-fips) Provides: %{_cross_os}settings-defaults(aws-k8s-1.31) Provides: %{_cross_os}settings-defaults(aws-k8s-1.31-fips) +Provides: %{_cross_os}settings-defaults(aws-k8s-1.32) +Provides: %{_cross_os}settings-defaults(aws-k8s-1.32-fips) Conflicts: %{_cross_os}settings-defaults(any) -%description aws-k8s-1.31 +%description aws-k8s-1.32 %{summary}. -%package aws-k8s-1.31-nvidia +%package aws-k8s-1.32-nvidia Summary: Settings defaults for the aws-k8s 1.27 through 1.30 nvidia variants Requires: (%{shrink: %{_cross_os}variant(aws-k8s-1.27-nvidia) or %{_cross_os}variant(aws-k8s-1.28-nvidia) or %{_cross_os}variant(aws-k8s-1.29-nvidia) or %{_cross_os}variant(aws-k8s-1.30-nvidia) or - %{_cross_os}variant(aws-k8s-1.31-nvidia) + %{_cross_os}variant(aws-k8s-1.31-nvidia) or + %{_cross_os}variant(aws-k8s-1.32-nvidia) %{nil}}) Provides: %{_cross_os}settings-defaults(any) Provides: %{_cross_os}settings-defaults(aws-k8s-1.27-nvidia) @@ -174,9 +179,10 @@ Provides: %{_cross_os}settings-defaults(aws-k8s-1.28-nvidia) Provides: %{_cross_os}settings-defaults(aws-k8s-1.29-nvidia) Provides: %{_cross_os}settings-defaults(aws-k8s-1.30-nvidia) Provides: %{_cross_os}settings-defaults(aws-k8s-1.31-nvidia) +Provides: %{_cross_os}settings-defaults(aws-k8s-1.32-nvidia) Conflicts: %{_cross_os}settings-defaults(any) -%description aws-k8s-1.31-nvidia +%description aws-k8s-1.32-nvidia %{summary}. %package metal-dev @@ -199,7 +205,7 @@ Conflicts: %{_cross_os}settings-defaults(any) %description vmware-dev %{summary}. -%package vmware-k8s-1.31 +%package vmware-k8s-1.32 Summary: Settings defaults for the vmware-k8s 1.27 through 1.30 variants Requires: (%{shrink: %{_cross_os}variant(vmware-k8s-1.27) or @@ -210,7 +216,9 @@ Requires: (%{shrink: %{_cross_os}variant(vmware-k8s-1.30) or %{_cross_os}variant(vmware-k8s-1.30-fips) or %{_cross_os}variant(vmware-k8s-1.31) or - %{_cross_os}variant(vmware-k8s-1.31-fips) + %{_cross_os}variant(vmware-k8s-1.31-fips) or + %{_cross_os}variant(vmware-k8s-1.32) or + %{_cross_os}variant(vmware-k8s-1.32-fips) %{nil}}) Provides: %{_cross_os}settings-defaults(any) Provides: %{_cross_os}settings-defaults(vmware-k8s-1.27) @@ -222,9 +230,11 @@ Provides: %{_cross_os}settings-defaults(vmware-k8s-1.30) Provides: %{_cross_os}settings-defaults(vmware-k8s-1.30-fips) Provides: %{_cross_os}settings-defaults(vmware-k8s-1.31) Provides: %{_cross_os}settings-defaults(vmware-k8s-1.31-fips) +Provides: %{_cross_os}settings-defaults(vmware-k8s-1.32) +Provides: %{_cross_os}settings-defaults(vmware-k8s-1.32-fips) Conflicts: %{_cross_os}settings-defaults(any) -%description vmware-k8s-1.31 +%description vmware-k8s-1.32 %{summary}. %prep @@ -245,11 +255,11 @@ for defaults in \ aws-k8s-1.25-nvidia \ aws-k8s-1.26 \ aws-k8s-1.26-nvidia \ - aws-k8s-1.31 \ - aws-k8s-1.31-nvidia \ + aws-k8s-1.32 \ + aws-k8s-1.32-nvidia \ metal-dev \ vmware-dev \ - vmware-k8s-1.31 \ + vmware-k8s-1.32 \ ; do projects+=( "-p" "settings-defaults-$(echo "${defaults}" | sed -e 's,\.,_,g')" ) @@ -281,11 +291,11 @@ for defaults in \ aws-k8s-1.25-nvidia \ aws-k8s-1.26 \ aws-k8s-1.26-nvidia \ - aws-k8s-1.31 \ - aws-k8s-1.31-nvidia \ + aws-k8s-1.32 \ + aws-k8s-1.32-nvidia \ metal-dev \ vmware-dev \ - vmware-k8s-1.31 \ + vmware-k8s-1.32 \ ; do crate="$(echo "${defaults}" | sed -e 's,\.,_,g')" @@ -344,13 +354,13 @@ done %{_cross_defaultsdir}/aws-k8s-1.26-nvidia.toml %{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.26-nvidia.conf -%files aws-k8s-1.31 -%{_cross_defaultsdir}/aws-k8s-1.31.toml -%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.31.conf +%files aws-k8s-1.32 +%{_cross_defaultsdir}/aws-k8s-1.32.toml +%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.32.conf -%files aws-k8s-1.31-nvidia -%{_cross_defaultsdir}/aws-k8s-1.31-nvidia.toml -%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.31-nvidia.conf +%files aws-k8s-1.32-nvidia +%{_cross_defaultsdir}/aws-k8s-1.32-nvidia.toml +%{_cross_tmpfilesdir}/storewolf-defaults-aws-k8s-1.32-nvidia.conf %files metal-dev %{_cross_defaultsdir}/metal-dev.toml @@ -360,6 +370,6 @@ done %{_cross_defaultsdir}/vmware-dev.toml %{_cross_tmpfilesdir}/storewolf-defaults-vmware-dev.conf -%files vmware-k8s-1.31 -%{_cross_defaultsdir}/vmware-k8s-1.31.toml -%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.31.conf +%files vmware-k8s-1.32 +%{_cross_defaultsdir}/vmware-k8s-1.32.toml +%{_cross_tmpfilesdir}/storewolf-defaults-vmware-k8s-1.32.conf diff --git a/packages/settings-plugins/settings-plugins.spec b/packages/settings-plugins/settings-plugins.spec index 0da4e76237d..7ac7622d5ad 100644 --- a/packages/settings-plugins/settings-plugins.spec +++ b/packages/settings-plugins/settings-plugins.spec @@ -73,6 +73,8 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.30) Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-fips) Provides: %{_cross_os}settings-plugin(aws-k8s-1.31) Provides: %{_cross_os}settings-plugin(aws-k8s-1.31-fips) +Provides: %{_cross_os}settings-plugin(aws-k8s-1.32) +Provides: %{_cross_os}settings-plugin(aws-k8s-1.32-fips) Conflicts: %{_cross_os}settings-plugin(any) Conflicts: %{_cross_os}variant-flavor(nvidia) @@ -92,6 +94,7 @@ Provides: %{_cross_os}settings-plugin(aws-k8s-1.28-nvidia) Provides: %{_cross_os}settings-plugin(aws-k8s-1.29-nvidia) Provides: %{_cross_os}settings-plugin(aws-k8s-1.30-nvidia) Provides: %{_cross_os}settings-plugin(aws-k8s-1.31-nvidia) +Provides: %{_cross_os}settings-plugin(aws-k8s-1.32-nvidia) Conflicts: %{_cross_os}settings-plugin(any) %description aws-k8s-nvidia @@ -130,6 +133,8 @@ Provides: %{_cross_os}settings-plugin(vmware-k8s-1.30) Provides: %{_cross_os}settings-plugin(vmware-k8s-1.30-fips) Provides: %{_cross_os}settings-plugin(vmware-k8s-1.31) Provides: %{_cross_os}settings-plugin(vmware-k8s-1.31-fips) +Provides: %{_cross_os}settings-plugin(vmware-k8s-1.32) +Provides: %{_cross_os}settings-plugin(vmware-k8s-1.32-fips) Conflicts: %{_cross_os}settings-plugin(any) %description vmware-k8s diff --git a/sources/Cargo.lock b/sources/Cargo.lock index 826b31e5429..4ec39f8c515 100644 --- a/sources/Cargo.lock +++ b/sources/Cargo.lock @@ -2665,14 +2665,14 @@ dependencies = [ ] [[package]] -name = "settings-defaults-aws-k8s-1_31" +name = "settings-defaults-aws-k8s-1_32" version = "0.1.0" dependencies = [ "bottlerocket-defaults-helper", ] [[package]] -name = "settings-defaults-aws-k8s-1_31-nvidia" +name = "settings-defaults-aws-k8s-1_32-nvidia" version = "0.1.0" dependencies = [ "bottlerocket-defaults-helper", @@ -2700,7 +2700,7 @@ dependencies = [ ] [[package]] -name = "settings-defaults-vmware-k8s-1_31" +name = "settings-defaults-vmware-k8s-1_32" version = "0.1.0" dependencies = [ "bottlerocket-defaults-helper", diff --git a/sources/Cargo.toml b/sources/Cargo.toml index d59c84dfe04..250ae4a3485 100644 --- a/sources/Cargo.toml +++ b/sources/Cargo.toml @@ -27,12 +27,12 @@ members = [ "settings-defaults/aws-k8s-1.25-nvidia", "settings-defaults/aws-k8s-1.26", "settings-defaults/aws-k8s-1.26-nvidia", - "settings-defaults/aws-k8s-1.31", - "settings-defaults/aws-k8s-1.31-nvidia", + "settings-defaults/aws-k8s-1.32", + "settings-defaults/aws-k8s-1.32-nvidia", "settings-defaults/metal-dev", "settings-defaults/metal-k8s-1.30", "settings-defaults/vmware-dev", - "settings-defaults/vmware-k8s-1.31", + "settings-defaults/vmware-k8s-1.32", # (all previous migrations archived; add new ones after this line) "settings-migrations/v1.21.0/pluto-remove-generators-v0-1-0", diff --git a/sources/settings-defaults/aws-k8s-1.32-nvidia/Cargo.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/Cargo.toml new file mode 100644 index 00000000000..18a9e45daf4 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-nvidia/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "settings-defaults-aws-k8s-1_32-nvidia" +version = "0.1.0" +edition = "2021" +license = "Apache-2.0 OR MIT" +publish = false +build = "../build-defaults.rs" + +[lib] +path = "../defaults-toml.rs" + +[build-dependencies] +bottlerocket-defaults-helper.workspace = true diff --git a/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/10-defaults.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/10-defaults.toml new file mode 120000 index 00000000000..a202ba61a4c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/15-aws-tuf.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/15-aws-tuf.toml new file mode 120000 index 00000000000..afcef6a617e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/20-aws-host-containers.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/20-aws-host-containers.toml new file mode 120000 index 00000000000..4d404d663cd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/25-cf-signal.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/25-cf-signal.toml new file mode 120000 index 00000000000..a33d541652c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/26-aws-autoscaling.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/26-aws-autoscaling.toml new file mode 120000 index 00000000000..b579c0182b6 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/30-metrics.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/30-metrics.toml new file mode 120000 index 00000000000..99f0b2b6980 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/31-send-metrics-aws.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/31-send-metrics-aws.toml new file mode 120000 index 00000000000..2fefefea751 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/40-aws-creds.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/40-aws-creds.toml new file mode 120000 index 00000000000..a6a17e88f54 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/50-kubernetes-aws.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/50-kubernetes-aws.toml new file mode 120000 index 00000000000..7393a2dd3d1 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/51-kubernetes-containerd-nvidia.toml new file mode 120000 index 00000000000..e68ab5eaa3c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/52-kubernetes-services.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/52-kubernetes-services.toml new file mode 120000 index 00000000000..afab5a7f15a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/53-containerd-cri-pki.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/53-containerd-cri-pki.toml new file mode 120000 index 00000000000..2dbf7db789b --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/54-kubernetes-aws-external-cloud-provider.toml b/sources/settings-defaults/aws-k8s-1.32-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.32-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.32-nvidia/defaults.d/55-kubernetes-aws-credential-provider.toml b/sources/settings-defaults/aws-k8s-1.32-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.32-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.32-nvidia/defaults.d/56-kubernetes-seccomp-default-false.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/56-kubernetes-seccomp-default-false.toml new file mode 120000 index 00000000000..b1132e00282 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/56-kubernetes-seccomp-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-seccomp-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/60-lockdown-none.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/60-lockdown-none.toml new file mode 120000 index 00000000000..cced543330e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/70-oci-hooks.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/70-oci-hooks.toml new file mode 120000 index 00000000000..d91eec45282 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/70-oci-hooks.toml @@ -0,0 +1 @@ +../../../shared-defaults/nvidia-oci-hooks-containerd-cri.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/settings-defaults/aws-k8s-1.32-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.32-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.32-nvidia/defaults.d/76-oci-defaults-capabilities.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/76-oci-defaults-capabilities.toml new file mode 120000 index 00000000000..100c2874090 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32-nvidia/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/settings-defaults/aws-k8s-1.32-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.32-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.32-nvidia/defaults.d/80-nvidia-k8s-container-toolkit.toml b/sources/settings-defaults/aws-k8s-1.32-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.32-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.32-nvidia/defaults.d/81-nvidia-k8s-device-plugin.toml b/sources/settings-defaults/aws-k8s-1.32-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.32-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.32-nvidia/defaults.d/90-boot.toml b/sources/settings-defaults/aws-k8s-1.32-nvidia/defaults.d/90-boot.toml new file mode 120000 index 00000000000..7778447459a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32-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.32/Cargo.toml b/sources/settings-defaults/aws-k8s-1.32/Cargo.toml new file mode 100644 index 00000000000..bb68781a288 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "settings-defaults-aws-k8s-1_32" +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.32/defaults.d/10-defaults.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/10-defaults.toml new file mode 120000 index 00000000000..a202ba61a4c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/15-aws-tuf.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/15-aws-tuf.toml new file mode 120000 index 00000000000..afcef6a617e --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/20-aws-host-containers.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/20-aws-host-containers.toml new file mode 120000 index 00000000000..4d404d663cd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/25-cf-signal.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/25-cf-signal.toml new file mode 120000 index 00000000000..a33d541652c --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/26-aws-autoscaling.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/26-aws-autoscaling.toml new file mode 120000 index 00000000000..b579c0182b6 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/30-metrics.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/30-metrics.toml new file mode 120000 index 00000000000..99f0b2b6980 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/31-send-metrics-aws.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/31-send-metrics-aws.toml new file mode 120000 index 00000000000..2fefefea751 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/40-aws-creds.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/40-aws-creds.toml new file mode 120000 index 00000000000..a6a17e88f54 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/50-kubernetes-aws.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/50-kubernetes-aws.toml new file mode 120000 index 00000000000..7393a2dd3d1 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/51-kubernetes-containerd.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/51-kubernetes-containerd.toml new file mode 120000 index 00000000000..08196a5edef --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/52-kubernetes-services.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/52-kubernetes-services.toml new file mode 120000 index 00000000000..afab5a7f15a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/53-containerd-cri-pki.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/53-containerd-cri-pki.toml new file mode 120000 index 00000000000..2dbf7db789b --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/54-kubernetes-aws-external-cloud-provider.toml b/sources/settings-defaults/aws-k8s-1.32/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.32/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.32/defaults.d/55-kubernetes-aws-credential-provider.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/55-kubernetes-aws-credential-provider.toml new file mode 120000 index 00000000000..43773cc11ae --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/56-kubernetes-seccomp-default-false.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/56-kubernetes-seccomp-default-false.toml new file mode 120000 index 00000000000..b1132e00282 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/defaults.d/56-kubernetes-seccomp-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-seccomp-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/aws-k8s-1.32/defaults.d/60-lockdown-integrity.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/60-lockdown-integrity.toml new file mode 120000 index 00000000000..8b4de873a39 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/70-oci-hooks.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/70-oci-hooks.toml new file mode 120000 index 00000000000..e7b73c620dd --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/75-oci-defaults-containerd-cri.toml new file mode 120000 index 00000000000..25204d67d21 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/76-oci-defaults-capabilities.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/76-oci-defaults-capabilities.toml new file mode 120000 index 00000000000..100c2874090 --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/settings-defaults/aws-k8s-1.32/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.32/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.32/defaults.d/90-boot.toml b/sources/settings-defaults/aws-k8s-1.32/defaults.d/90-boot.toml new file mode 120000 index 00000000000..7778447459a --- /dev/null +++ b/sources/settings-defaults/aws-k8s-1.32/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.32/Cargo.toml b/sources/settings-defaults/vmware-k8s-1.32/Cargo.toml new file mode 100644 index 00000000000..ceeb236cc96 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "settings-defaults-vmware-k8s-1_32" +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.32/defaults.d/10-defaults.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/10-defaults.toml new file mode 120000 index 00000000000..a202ba61a4c --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/15-public-tuf.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/15-public-tuf.toml new file mode 120000 index 00000000000..561a74dfd90 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/20-public-host-containers.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/20-public-host-containers.toml new file mode 120000 index 00000000000..6119af1cfa3 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/30-metrics.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/30-metrics.toml new file mode 120000 index 00000000000..99f0b2b6980 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/31-send-metrics.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/31-send-metrics.toml new file mode 120000 index 00000000000..d01b193f18d --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/40-aws-creds.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/40-aws-creds.toml new file mode 120000 index 00000000000..a6a17e88f54 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/50-kubernetes-vmware.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/50-kubernetes-vmware.toml new file mode 120000 index 00000000000..f67755f3b0a --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/51-kubernetes-containerd.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/51-kubernetes-containerd.toml new file mode 120000 index 00000000000..08196a5edef --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/52-kubernetes-services.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/52-kubernetes-services.toml new file mode 120000 index 00000000000..afab5a7f15a --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/53-containerd-cri-pki.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/53-containerd-cri-pki.toml new file mode 120000 index 00000000000..2dbf7db789b --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/54-kubernetes-seccomp-default-false.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/54-kubernetes-seccomp-default-false.toml new file mode 120000 index 00000000000..b1132e00282 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/54-kubernetes-seccomp-default-false.toml @@ -0,0 +1 @@ +../../../shared-defaults/kubernetes-seccomp-default-false.toml \ No newline at end of file diff --git a/sources/settings-defaults/vmware-k8s-1.32/defaults.d/60-lockdown-integrity.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/60-lockdown-integrity.toml new file mode 120000 index 00000000000..8b4de873a39 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/70-public-ntp.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/70-public-ntp.toml new file mode 120000 index 00000000000..eb5f4bcd0a7 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/75-oci-defaults-containerd-cri.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/75-oci-defaults-containerd-cri.toml new file mode 120000 index 00000000000..25204d67d21 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/76-oci-defaults-capabilities.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/76-oci-defaults-capabilities.toml new file mode 120000 index 00000000000..100c2874090 --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/77-oci-defaults-containerd-cri-resource-limits.toml b/sources/settings-defaults/vmware-k8s-1.32/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.32/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.32/defaults.d/80-oci-hooks.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/80-oci-hooks.toml new file mode 120000 index 00000000000..e7b73c620dd --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/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.32/defaults.d/90-boot.toml b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/90-boot.toml new file mode 120000 index 00000000000..7778447459a --- /dev/null +++ b/sources/settings-defaults/vmware-k8s-1.32/defaults.d/90-boot.toml @@ -0,0 +1 @@ +../../../shared-defaults/boot.toml \ No newline at end of file diff --git a/variants/README.md b/variants/README.md index ac5687aa365..669436e80f3 100644 --- a/variants/README.md +++ b/variants/README.md @@ -155,6 +155,21 @@ It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazo This variant is compatible with Kubernetes 1.31, 1.32, 1.33, and 1.34 clusters. +### aws-k8s-1.32: Kubernetes 1.32 node + +The [aws-k8s-1.32](aws-k8s-1.32/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.32, 1.33, 1.34 and 1.35 clusters. + +### aws-k8s-1.32-nvidia: Kubernetes 1.32 NVIDIA node + +The [aws-k8s-1.32-nvidia](aws-k8s-1.32-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.32, 1.33, 1.34 and 1.35 clusters. + ### aws-ecs-1: Amazon ECS container instance The [aws-ecs-1](aws-ecs-1/Cargo.toml) variant includes the packages needed to run an [Amazon ECS](https://ecs.aws) @@ -216,6 +231,13 @@ It supports self-hosted clusters. This variant is compatible with Kubernetes 1.31, 1.32, 1.33, and 1.34 clusters. +## vmware-k8s-1.32: VMware Kubernetes 1.32 node + +The [vmware-k8s-1.32](vmware-k8s-1.32/Cargo.toml) variant includes the packages needed to run a Kubernetes worker node as a VMware guest. +It supports self-hosted clusters. + +This variant is compatible with Kubernetes 1.32, 1.33, 1.34, and 1.35 clusters. + ### metal-dev: Metal development build The [metal-dev](metal-dev/Cargo.toml) variant has useful packages for local development of the OS and is intended to run bare metal. diff --git a/variants/aws-k8s-1.32-fips/Cargo.toml b/variants/aws-k8s-1.32-fips/Cargo.toml new file mode 100644 index 00000000000..aa65db09174 --- /dev/null +++ b/variants/aws-k8s-1.32-fips/Cargo.toml @@ -0,0 +1,44 @@ +[package] +# This is the aws-k8s-1.32-fips variant. "." is not allowed in crate names, but we +# don't use this crate name anywhere. +name = "aws-k8s-1_32-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 +systemd-networkd = true +fips = true + +[package.metadata.build-variant] +included-packages = [ +# core + "release", + "kernel-6.1", +# k8s + "cni", + "cni-plugins", + "kubelet-1.32", + "aws-iam-authenticator", +] +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.32-nvidia/Cargo.toml b/variants/aws-k8s-1.32-nvidia/Cargo.toml new file mode 100644 index 00000000000..1115043cd4d --- /dev/null +++ b/variants/aws-k8s-1.32-nvidia/Cargo.toml @@ -0,0 +1,50 @@ +[package] +# This is the aws-k8s-1.32-nvidia variant. "." is not allowed in crate names, but we +# don't use this crate name anywhere. +name = "aws-k8s-1_32-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 +systemd-networkd = true + +[package.metadata.build-variant] +included-packages = [ + # core + "release", + "kernel-6.1", + # k8s + "cni", + "cni-plugins", + "kubelet-1.32", + "aws-iam-authenticator", + # nvidia + "nvidia-container-toolkit-k8s", + "nvidia-k8s-device-plugin", + "kmod-6.1-nvidia-tesla-535", +] +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.32/Cargo.toml b/variants/aws-k8s-1.32/Cargo.toml new file mode 100644 index 00000000000..69dacc86905 --- /dev/null +++ b/variants/aws-k8s-1.32/Cargo.toml @@ -0,0 +1,43 @@ +[package] +# This is the aws-k8s-1.32 variant. "." is not allowed in crate names, but we +# don't use this crate name anywhere. +name = "aws-k8s-1_32" +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 +systemd-networkd = true + +[package.metadata.build-variant] +included-packages = [ +# core + "release", + "kernel-6.1", +# k8s + "cni", + "cni-plugins", + "kubelet-1.32", + "aws-iam-authenticator", +] +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/vmware-k8s-1.32-fips/Cargo.toml b/variants/vmware-k8s-1.32-fips/Cargo.toml new file mode 100644 index 00000000000..b11739ae9b3 --- /dev/null +++ b/variants/vmware-k8s-1.32-fips/Cargo.toml @@ -0,0 +1,51 @@ +[package] +# This is the vmware-k8s-1.32-fips variant. "." is not allowed in crate names, but +# we don't use this crate name anywhere. +name = "vmware-k8s-1_32-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 +systemd-networkd = true +fips = true + +[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", + "kernel-6.1", + # k8s + "cni", + "cni-plugins", + "kubelet-1.32", + # 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.32-fips/template.ovf b/variants/vmware-k8s-1.32-fips/template.ovf new file mode 120000 index 00000000000..db70bac6f1b --- /dev/null +++ b/variants/vmware-k8s-1.32-fips/template.ovf @@ -0,0 +1 @@ +../shared/template-unified-secboot.ovf \ No newline at end of file diff --git a/variants/vmware-k8s-1.32/Cargo.toml b/variants/vmware-k8s-1.32/Cargo.toml new file mode 100644 index 00000000000..1db0075221b --- /dev/null +++ b/variants/vmware-k8s-1.32/Cargo.toml @@ -0,0 +1,50 @@ +[package] +# This is the vmware-k8s-1.32 variant. "." is not allowed in crate names, but +# we don't use this crate name anywhere. +name = "vmware-k8s-1_32" +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 +systemd-networkd = true + +[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", + "kernel-6.1", + # k8s + "cni", + "cni-plugins", + "kubelet-1.32", + # 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.32/template.ovf b/variants/vmware-k8s-1.32/template.ovf new file mode 120000 index 00000000000..db70bac6f1b --- /dev/null +++ b/variants/vmware-k8s-1.32/template.ovf @@ -0,0 +1 @@ +../shared/template-unified-secboot.ovf \ No newline at end of file