From 78ea593780e9e4e951b0340b95641fe24ac57960 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Wed, 15 Nov 2023 09:45:29 -0800 Subject: [PATCH] General updates to README (#8786) Signed-off-by: Derek Nola --- README.md | 6 +++--- ROADMAP.md | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7fa2e63582..0f3793ea7d 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Additionally, K3s simplifies Kubernetes operations by maintaining functionality * Managing the TLS certificates of Kubernetes components * Managing the connection between worker and server nodes * Auto-deploying Kubernetes resources from local manifests in realtime as they are changed. -* Managing an embedded etcd cluster (work in progress) +* Managing an embedded etcd cluster Current Status -------------- @@ -103,12 +103,12 @@ Release cadence K3s maintains pace with upstream Kubernetes releases. Our goal is to release patch releases within one week, and new minors within 30 days. -Our release versioning reflects the version of upstream Kubernetes that is being released. For example, the K3s release [v1.18.6+k3s1](https://github.com/k3s-io/k3s/releases/tag/v1.18.6%2Bk3s1) maps to the `v1.18.6` Kubernetes release. We add a postfix in the form of `+k3s` to allow us to make additional releases using the same version of upstream Kubernetes while remaining [semver](https://semver.org/) compliant. For example, if we discovered a high severity bug in `v1.18.6+k3s1` and needed to release an immediate fix for it, we would release `v1.18.6+k3s2`. +Our release versioning reflects the version of upstream Kubernetes that is being released. For example, the K3s release [v1.27.4+k3s1](https://github.com/k3s-io/k3s/releases/tag/v1.27.4%2Bk3s1) maps to the `v1.27.4` Kubernetes release. We add a postfix in the form of `+k3s` to allow us to make additional releases using the same version of upstream Kubernetes while remaining [semver](https://semver.org/) compliant. For example, if we discovered a high severity bug in `v1.27.4+k3s1` and needed to release an immediate fix for it, we would release `v1.27.4+k3s2`. Documentation ------------- -Please see [the official docs site](https://rancher.com/docs/k3s/latest/en/) for complete documentation. +Please see [the official docs site](https://docs.k3s.io) for complete documentation. Quick-Start - Install Script -------------- diff --git a/ROADMAP.md b/ROADMAP.md index aee5da35d4..2b7a818229 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -4,14 +4,12 @@ This represents the larger, bigger impact features and enhancements we have plan Next --- -- CLI support for etcd backup management -- Multus CNI support -- Experimental support for migration from SQLite to etcd - Embedded registry support - Windows OS Support Later --- +- Multus CNI support - Align K3s with upstream Kubernetes by removing patches or upstreaming them - FIPS-140-2 Compliant binaries - Graduate encrypted networking support from experimental to GA