Merge pull request #1487 from etungsten/bye-1.15

models: remove aws-k8s-1.15 files/references, redo symlinks, add aws-k8s-1.19 defaults
bottlerocket-os · Apr 15, 2021 · 403a5b9 · 403a5b9
2 parents 328b50a + 26dff9e
commit 403a5b9
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 73 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     continue-on-error: ${{ matrix.supported }}
     strategy:
       matrix:
-        variant: [aws-k8s-1.15, aws-k8s-1.16, aws-k8s-1.17, aws-k8s-1.18, aws-k8s-1.19, aws-ecs-1]
+        variant: [aws-k8s-1.16, aws-k8s-1.17, aws-k8s-1.18, aws-k8s-1.19, aws-ecs-1]
         arch: [x86_64, aarch64]
         supported: [true]
         include:

diff --git a/sources/models/README.md b/sources/models/README.md
@@ -22,30 +22,25 @@ Entries are sorted by filename, and later entries take precedence.
 
 The `#[model]` attribute on Settings and its sub-structs reduces duplication and adds some required metadata; see [its docs](model-derive/) for details.
 
-### aws-k8s-1.15: Kubernetes 1.15 (deprecated)
-
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
-
 ### aws-k8s-1.16: Kubernetes 1.16
 
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.19/defaults.d/)
 
 ### aws-k8s-1.17: Kubernetes 1.17
 
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.19/defaults.d/)
 
 ### aws-k8s-1.18: Kubernetes 1.18
 
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.19/defaults.d/)
 
 ### aws-k8s-1.19: Kubernetes 1.19
 
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.19/defaults.d/)
 
 ### aws-ecs-1: Amazon ECS
 

diff --git a/sources/models/src/aws-k8s-1.16 b/sources/models/src/aws-k8s-1.16
@@ -1 +1 @@
-aws-k8s-1.15
+./aws-k8s-1.17
diff --git a/sources/models/src/aws-k8s-1.17 b/sources/models/src/aws-k8s-1.17
@@ -1 +1 @@
-aws-k8s-1.16
+./aws-k8s-1.18
diff --git a/sources/models/src/aws-k8s-1.18 b/sources/models/src/aws-k8s-1.18
@@ -1 +1 @@
-aws-k8s-1.17
+./aws-k8s-1.19
diff --git a/sources/models/src/aws-k8s-1.19 b/sources/models/src/aws-k8s-1.19
diff --git a/.../aws-k8s-1.15/defaults.d/10-defaults.toml → .../aws-k8s-1.19/defaults.d/10-defaults.toml b/.../aws-k8s-1.15/defaults.d/10-defaults.toml → .../aws-k8s-1.19/defaults.d/10-defaults.toml
diff --git a/...15/defaults.d/20-aws-host-containers.toml → ...19/defaults.d/20-aws-host-containers.toml b/...15/defaults.d/20-aws-host-containers.toml → ...19/defaults.d/20-aws-host-containers.toml
diff --git a/...c/aws-k8s-1.15/defaults.d/30-metrics.toml → ...c/aws-k8s-1.19/defaults.d/30-metrics.toml b/...c/aws-k8s-1.15/defaults.d/30-metrics.toml → ...c/aws-k8s-1.19/defaults.d/30-metrics.toml
diff --git a/...c/aws-k8s-1.15/defaults.d/50-aws-k8s.toml → ...c/aws-k8s-1.19/defaults.d/50-aws-k8s.toml b/...c/aws-k8s-1.15/defaults.d/50-aws-k8s.toml → ...c/aws-k8s-1.19/defaults.d/50-aws-k8s.toml
diff --git a/sources/models/src/aws-k8s-1.15/mod.rs → sources/models/src/aws-k8s-1.19/mod.rs b/sources/models/src/aws-k8s-1.15/mod.rs → sources/models/src/aws-k8s-1.19/mod.rs
diff --git a/sources/models/src/lib.rs b/sources/models/src/lib.rs
@@ -19,30 +19,25 @@ Entries are sorted by filename, and later entries take precedence.
 
 The `#[model]` attribute on Settings and its sub-structs reduces duplication and adds some required metadata; see [its docs](model-derive/) for details.
 
-## aws-k8s-1.15: Kubernetes 1.15 (deprecated)
-
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
-
 ## aws-k8s-1.16: Kubernetes 1.16
 
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.19/defaults.d/)
 
 ## aws-k8s-1.17: Kubernetes 1.17
 
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.19/defaults.d/)
 
 ## aws-k8s-1.18: Kubernetes 1.18
 
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.19/defaults.d/)
 
 ## aws-k8s-1.19: Kubernetes 1.19
 
-* [Model](src/aws-k8s-1.15/mod.rs)
-* [Default settings](src/aws-k8s-1.15/defaults.d/)
+* [Model](src/aws-k8s-1.19/mod.rs)
+* [Default settings](src/aws-k8s-1.19/defaults.d/)
 
 ## aws-ecs-1: Amazon ECS
 

diff --git a/variants/README.md b/variants/README.md
@@ -73,10 +73,11 @@ User data will be read from a mounted CD-ROM, either from a file named "user-dat
 
 #### aws-k8s-1.15: Kubernetes 1.15 node
 
-The [aws-k8s-1.15](aws-k8s-1.15/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/).
+The aws-k8s-1.15 variant included the packages needed to run a Kubernetes node in AWS.
+It supported self-hosted clusters and clusters managed by [EKS](https://aws.amazon.com/eks/).
 
-This variant is compatible with Kubernetes 1.15, 1.16, and 1.17 clusters.
+This variant was compatible with Kubernetes 1.15, 1.16, and 1.17 clusters.
+It reached end-of-life on May 3, 2021.
 
 Upstream support for Kubernetes 1.15 has ended and this variant will no longer be supported in Bottlerocket releases.
 

diff --git a/variants/aws-k8s-1.15/Cargo.lock b/variants/aws-k8s-1.15/Cargo.lock
diff --git a/variants/aws-k8s-1.15/Cargo.toml b/variants/aws-k8s-1.15/Cargo.toml
diff --git a/variants/aws-k8s-1.15/build.rs b/variants/aws-k8s-1.15/build.rs
diff --git a/variants/aws-k8s-1.15/lib.rs b/variants/aws-k8s-1.15/lib.rs