sources, variants: add metal-k8s-1.28 variant

bottlerocket-os · Aug 22, 2023 · e4b4187 · e4b4187
1 parent 4618eaa
commit e4b4187
Show file tree

Hide file tree

Showing 28 changed files with 104 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -95,6 +95,7 @@ The following variants are designed to be Kubernetes worker nodes on bare metal:
 * `metal-k8s-1.25`
 * `metal-k8s-1.26`
 * `metal-k8s-1.27`
+* `metal-k8s-1.28`
 
 The following variants are no longer supported:
 

diff --git a/sources/logdog/conf/logdog.metal-k8s-1.28.conf b/sources/logdog/conf/logdog.metal-k8s-1.28.conf
@@ -0,0 +1 @@
+k8s.conf
diff --git a/sources/models/README.md b/sources/models/README.md
@@ -149,28 +149,33 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 
 ### metal-k8s-1.23: Metal Kubernetes 1.23
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 ### metal-k8s-1.24: Metal Kubernetes 1.24
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 ### metal-k8s-1.25: Metal Kubernetes 1.25
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 ### metal-k8s-1.26: Metal Kubernetes 1.26
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 ### metal-k8s-1.27: Metal Kubernetes 1.27
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
+
+### metal-k8s-1.28: Metal Kubernetes 1.28
+
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 ## This directory
 

diff --git a/sources/models/src/lib.rs b/sources/models/src/lib.rs
@@ -146,28 +146,33 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 
 ## metal-k8s-1.23: Metal Kubernetes 1.23
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 ## metal-k8s-1.24: Metal Kubernetes 1.24
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 ## metal-k8s-1.25: Metal Kubernetes 1.25
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 ## metal-k8s-1.26: Metal Kubernetes 1.26
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 ## metal-k8s-1.27: Metal Kubernetes 1.27
 
-* [Model](src/metal-k8s-1.27/mod.rs)
-* [Default settings](src/metal-k8s-1.27/defaults.d/)
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
+
+## metal-k8s-1.28: Metal Kubernetes 1.28
+
+* [Model](src/metal-k8s-1.28/mod.rs)
+* [Default settings](src/metal-k8s-1.28/defaults.d/)
 
 # This directory
 

diff --git a/sources/models/src/metal-k8s-1.27 b/sources/models/src/metal-k8s-1.27
@@ -0,0 +1 @@
+metal-k8s-1.28
diff --git a/...etal-k8s-1.27/defaults.d/10-defaults.toml → ...etal-k8s-1.28/defaults.d/10-defaults.toml b/...etal-k8s-1.27/defaults.d/10-defaults.toml → ...etal-k8s-1.28/defaults.d/10-defaults.toml
diff --git a/...al-k8s-1.27/defaults.d/15-public-tuf.toml → ...al-k8s-1.28/defaults.d/15-public-tuf.toml b/...al-k8s-1.27/defaults.d/15-public-tuf.toml → ...al-k8s-1.28/defaults.d/15-public-tuf.toml
diff --git a/...defaults.d/20-public-host-containers.toml → ...defaults.d/20-public-host-containers.toml b/...defaults.d/20-public-host-containers.toml → ...defaults.d/20-public-host-containers.toml
diff --git a/...metal-k8s-1.27/defaults.d/30-metrics.toml → ...metal-k8s-1.28/defaults.d/30-metrics.toml b/...metal-k8s-1.27/defaults.d/30-metrics.toml → ...metal-k8s-1.28/defaults.d/30-metrics.toml
diff --git a/...-k8s-1.27/defaults.d/31-send-metrics.toml → ...-k8s-1.28/defaults.d/31-send-metrics.toml b/...-k8s-1.27/defaults.d/31-send-metrics.toml → ...-k8s-1.28/defaults.d/31-send-metrics.toml
diff --git a/...tal-k8s-1.27/defaults.d/40-aws-creds.toml → ...tal-k8s-1.28/defaults.d/40-aws-creds.toml b/...tal-k8s-1.27/defaults.d/40-aws-creds.toml → ...tal-k8s-1.28/defaults.d/40-aws-creds.toml
diff --git a/...-1.27/defaults.d/50-kubernetes-metal.toml → ...-1.28/defaults.d/50-kubernetes-metal.toml b/...-1.27/defaults.d/50-kubernetes-metal.toml → ...-1.28/defaults.d/50-kubernetes-metal.toml
diff --git a/.../defaults.d/51-kubernetes-containerd.toml → .../defaults.d/51-kubernetes-containerd.toml b/.../defaults.d/51-kubernetes-containerd.toml → .../defaults.d/51-kubernetes-containerd.toml
diff --git a/...27/defaults.d/52-kubernetes-services.toml → ...28/defaults.d/52-kubernetes-services.toml b/...27/defaults.d/52-kubernetes-services.toml → ...28/defaults.d/52-kubernetes-services.toml
diff --git a/....27/defaults.d/53-containerd-cri-pki.toml → ....28/defaults.d/53-containerd-cri-pki.toml b/....27/defaults.d/53-containerd-cri-pki.toml → ....28/defaults.d/53-containerd-cri-pki.toml
diff --git a/.../54-kubernetes-seccomp-default-false.toml → .../54-kubernetes-seccomp-default-false.toml b/.../54-kubernetes-seccomp-default-false.toml → .../54-kubernetes-seccomp-default-false.toml
diff --git a/....27/defaults.d/60-lockdown-integrity.toml → ....28/defaults.d/60-lockdown-integrity.toml b/....27/defaults.d/60-lockdown-integrity.toml → ....28/defaults.d/60-lockdown-integrity.toml
diff --git a/...al-k8s-1.27/defaults.d/70-public-ntp.toml → ...al-k8s-1.28/defaults.d/70-public-ntp.toml b/...al-k8s-1.27/defaults.d/70-public-ntp.toml → ...al-k8s-1.28/defaults.d/70-public-ntp.toml
diff --git a/...tal-k8s-1.27/defaults.d/80-oci-hooks.toml → ...tal-k8s-1.28/defaults.d/80-oci-hooks.toml b/...tal-k8s-1.27/defaults.d/80-oci-hooks.toml → ...tal-k8s-1.28/defaults.d/80-oci-hooks.toml
diff --git a/...lts.d/85-oci-defaults-containerd-cri.toml → ...lts.d/85-oci-defaults-containerd-cri.toml b/...lts.d/85-oci-defaults-containerd-cri.toml → ...lts.d/85-oci-defaults-containerd-cri.toml
diff --git a/...aults.d/86-oci-defaults-capabilities.toml → ...aults.d/86-oci-defaults-capabilities.toml b/...aults.d/86-oci-defaults-capabilities.toml → ...aults.d/86-oci-defaults-capabilities.toml
diff --git a/...aults-containerd-cri-resource-limits.toml → ...aults-containerd-cri-resource-limits.toml b/...aults-containerd-cri-resource-limits.toml → ...aults-containerd-cri-resource-limits.toml
diff --git a/...rc/metal-k8s-1.27/defaults.d/90-boot.toml → ...rc/metal-k8s-1.28/defaults.d/90-boot.toml b/...rc/metal-k8s-1.27/defaults.d/90-boot.toml → ...rc/metal-k8s-1.28/defaults.d/90-boot.toml
diff --git a/sources/models/src/metal-k8s-1.27/mod.rs → sources/models/src/metal-k8s-1.28/mod.rs b/sources/models/src/metal-k8s-1.27/mod.rs → sources/models/src/metal-k8s-1.28/mod.rs
diff --git a/variants/Cargo.lock b/variants/Cargo.lock
diff --git a/variants/Cargo.toml b/variants/Cargo.toml
@@ -23,6 +23,7 @@ members = [
     "metal-k8s-1.25",
     "metal-k8s-1.26",
     "metal-k8s-1.27",
+    "metal-k8s-1.28",
     "vmware-dev",
     "vmware-k8s-1.23",
     "vmware-k8s-1.24",

diff --git a/variants/README.md b/variants/README.md
@@ -232,6 +232,13 @@ It supports self-hosted clusters.
 
 This variant is compatible with Kubernetes 1.27, 1.28, and 1.29 clusters.
 
+### metal-k8s-1.28: Metal Kubernetes 1.28 node
+
+The [metal-k8s-1.28](metal-k8s-1.28/Cargo.toml) variant includes the packages needed to run a Kubernetes node on bare metal.
+It supports self-hosted clusters.
+
+This variant is compatible with Kubernetes 1.28, 1.29, and 1.30 clusters.
+
 ### Deprecated variants
 
 #### aws-k8s-1.15: Kubernetes 1.15 node

diff --git a/variants/metal-k8s-1.28/Cargo.toml b/variants/metal-k8s-1.28/Cargo.toml
@@ -0,0 +1,51 @@
+[package]
+# This is the metal-k8s-1.28 variant. "." is not allowed in crate names, but
+# we don't use this crate name anywhere.
+name = "metal-k8s-1_28"
+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
+partition-plan = "unified"
+
+[package.metadata.build-variant.image-features]
+grub-set-private-var = true
+unified-cgroup-hierarchy = true
+uefi-secure-boot = true
+xfs-data-partition = true
+
+[package.metadata.build-variant]
+image-format = "raw"
+supported-arches = ["x86_64"]
+kernel-parameters = [
+    # Only reserve if there are at least 2GB
+    "crashkernel=2G-:256M"
+]
+included-packages = [
+    # core
+    "release",
+    "kernel-6.1",
+    # k8s
+    "aws-iam-authenticator",
+    "cni",
+    "cni-plugins",
+    "kubelet-1.28",
+]
+
+[lib]
+path = "../variants.rs"
+
+[build-dependencies]
+# core
+release = { path = "../../packages/release" }
+kernel-6_1 = { path = "../../packages/kernel-6.1" }
+# k8s
+aws-iam-authenticator = { path = "../../packages/aws-iam-authenticator" }
+cni = { path = "../../packages/cni" }
+cni-plugins = { path = "../../packages/cni-plugins" }
+kubernetes-1_28 = { path = "../../packages/kubernetes-1.28" }