Merge pull request #1492 from etungsten/purge-1.15

packages, logdog: remove k8s-1.15 related files
bottlerocket-os · Apr 15, 2021 · 64e6797 · 64e6797
2 parents 04acb06 + 80cbcbe
commit 64e6797
Show file tree

Hide file tree

Showing 22 changed files with 1 addition and 760 deletions.
diff --git a/README.md b/README.md
@@ -583,7 +583,7 @@ We currently package the following major third-party components:
 * systemd as init ([background](https://en.wikipedia.org/wiki/Systemd), [packaging](packages/systemd/))
 * wicked for networking ([background](https://github.com/openSUSE/wicked), [packaging](packages/wicked/))
 * containerd ([background](https://containerd.io/), [packaging](packages/containerd/))
-* Kubernetes ([background](https://kubernetes.io/), [packaging](packages/kubernetes-1.15/))
+* Kubernetes ([background](https://kubernetes.io/), [packaging](packages/kubernetes-1.19/))
 * aws-iam-authenticator ([background](https://github.com/kubernetes-sigs/aws-iam-authenticator), [packaging](packages/aws-iam-authenticator/))
 * Amazon ECS agent ([background](https://github.com/aws/amazon-ecs-agent), [packaging](packages/ecs-agent/))
 

diff --git a/packages/Cargo.lock b/packages/Cargo.lock
diff --git a/packages/Cargo.toml b/packages/Cargo.toml
@@ -27,7 +27,6 @@ members = [
     "iputils",
     "kernel",
     "kmod",
-    "kubernetes-1.15",
     "kubernetes-1.16",
     "kubernetes-1.17",
     "kubernetes-1.18",

diff --git a/packages/kubernetes-1.15/0001-always-set-relevant-variables-for-cross-compiling.patch b/packages/kubernetes-1.15/0001-always-set-relevant-variables-for-cross-compiling.patch
diff --git a/packages/kubernetes-1.15/0002-opt-out-of-module-mode-for-builds.patch b/packages/kubernetes-1.15/0002-opt-out-of-module-mode-for-builds.patch
diff --git a/packages/kubernetes-1.15/0003-kubelet-block-non-forwarded-packets.patch b/packages/kubernetes-1.15/0003-kubelet-block-non-forwarded-packets.patch
diff --git a/packages/kubernetes-1.15/0004-include-etc-hosts-in-eviction-calc.patch b/packages/kubernetes-1.15/0004-include-etc-hosts-in-eviction-calc.patch