Add aws-k8s-1.21 variant

Adds aws-k8s-1.21 variant, relinks symlinks in models

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
     continue-on-error: ${{ matrix.supported }}
     strategy:
       matrix:
-        variant: [aws-k8s-1.16, aws-k8s-1.17, aws-k8s-1.18, aws-k8s-1.19, aws-k8s-1.20, aws-ecs-1]
+        variant: [aws-k8s-1.16, aws-k8s-1.17, aws-k8s-1.18, aws-k8s-1.19, aws-k8s-1.20, aws-k8s-1.21, aws-ecs-1]
         arch: [x86_64, aarch64]
         supported: [true]
         include:

README.md

@@ -54,6 +54,7 @@ The following variants support EKS, as described above:
 - `aws-k8s-1.18`
 - `aws-k8s-1.19`
 - `aws-k8s-1.20`
+- `aws-k8s-1.21`
 
 We also have a variant designed to work with ECS, currently in preview:
 

sources/logdog/conf/logdog.aws-k8s-1.21.conf

@@ -0,0 +1 @@
+aws-k8s.conf

sources/models/README.md

@@ -45,7 +45,12 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 ### aws-k8s-1.20: Kubernetes 1.20
 
 * [Model](src/aws-k8s-1.19/mod.rs)
-* [Default settings](src/aws-k8s-1.20/defaults.d/)
+* [Default settings](src/aws-k8s-1.21/defaults.d/)
+
+### aws-k8s-1.21: Kubernetes 1.21
+
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.21/defaults.d/)
 
 ### aws-ecs-1: Amazon ECS
 

sources/models/src/aws-k8s-1.20

@@ -0,0 +1 @@
+./aws-k8s-1.21

sources/models/src/lib.rs

@@ -42,7 +42,12 @@ The `#[model]` attribute on Settings and its sub-structs reduces duplication and
 ## aws-k8s-1.20: Kubernetes 1.20
 
 * [Model](src/aws-k8s-1.19/mod.rs)
-* [Default settings](src/aws-k8s-1.20/defaults.d/)
+* [Default settings](src/aws-k8s-1.21/defaults.d/)
+
+## aws-k8s-1.21: Kubernetes 1.21
+
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.21/defaults.d/)
 
 ## aws-ecs-1: Amazon ECS
 

variants/Cargo.toml

@@ -7,6 +7,7 @@ members = [
     "aws-k8s-1.18",
     "aws-k8s-1.19",
     "aws-k8s-1.20",
+    "aws-k8s-1.21",
     "vmware-dev",
     "vmware-k8s-1.20",
 ]

variants/README.md

@@ -52,6 +52,13 @@ It supports self-hosted clusters and clusters managed by [EKS](https://aws.amazo
 
 This variant is compatible with Kubernetes 1.20, 1.21, and 1.22 clusters.
 
+### aws-k8s-1.21: Kubernetes 1.21 node
+
+The [aws-k8s-1.21](aws-k8s-1.21/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.21, 1.22, and 1.23 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)

variants/aws-k8s-1.21/Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+# This is the aws-k8s-1.21 variant.  "." is not allowed in crate names, but we
+# don't use this crate name anywhere.
+name = "aws-k8s-1_21"
+version = "0.1.0"
+edition = "2018"
+publish = false
+build = "build.rs"
+# Don't rebuild crate just because of changes to README.
+exclude = ["README.md"]
+
+[package.metadata.build-variant]
+included-packages = [
+    "aws-iam-authenticator",
+    "cni",
+    "cni-plugins",
+    "kernel-5.10",
+    "kubelet-1.21",
+    "release",
+]
+kernel-parameters = [
+    "console=tty0",
+    "console=ttyS0",
+]
+
+[lib]
+path = "lib.rs"
+
+[build-dependencies]
+aws-iam-authenticator = { path = "../../packages/aws-iam-authenticator" }
+cni = { path = "../../packages/cni" }
+cni-plugins = { path = "../../packages/cni-plugins" }
+kernel-5_10 = { path = "../../packages/kernel-5.10" }
+kubernetes-1_21 = { path = "../../packages/kubernetes-1.21" }
+release = { path = "../../packages/release" }

variants/aws-k8s-1.21/build.rs

@@ -0,0 +1,9 @@
+use std::process::{exit, Command};
+
+fn main() -> Result<(), std::io::Error> {
+    let ret = Command::new("buildsys").arg("build-variant").status()?;
+    if !ret.success() {
+        exit(1);
+    }
+    Ok(())
+}

variants/aws-k8s-1.21/lib.rs

@@ -0,0 +1 @@
+// not used