From 5d52850e1ab1cfb47da6da6da645e2e85d21154b Mon Sep 17 00:00:00 2001 From: Deshi Xiao Date: Wed, 20 Nov 2024 17:42:17 +0800 Subject: [PATCH 1/3] fix: clean kube-router lib Signed-off-by: Deshi Xiao --- go.mod | 1 - 1 file changed, 1 deletion(-) diff --git a/go.mod b/go.mod index 384dc8f0..22038d37 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.7 github.com/Mirantis/cri-dockerd => github.com/k3s-io/cri-dockerd v0.3.15-k3s1.31-3 //v1.31 github.com/cilium/ebpf => github.com/cilium/ebpf v0.12.3 - github.com/cloudnativelabs/kube-router/v2 => github.com/k3s-io/kube-router/v2 v2.2.1 github.com/containerd/containerd => github.com/k3s-io/containerd v1.7.23-k3s1 github.com/containerd/imgcrypt => github.com/containerd/imgcrypt v1.1.11 github.com/distribution/reference => github.com/distribution/reference v0.5.0 From f95457585c77242e63a0c6bbc34ea5aeaf481f12 Mon Sep 17 00:00:00 2001 From: Deshi Xiao Date: Wed, 20 Nov 2024 17:43:47 +0800 Subject: [PATCH 2/3] fix: remove flannel config for containerd plugin Signed-off-by: Deshi Xiao --- pkg/agent/templates/templates_linux.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/agent/templates/templates_linux.go b/pkg/agent/templates/templates_linux.go index 2c333145..55e1a7ee 100644 --- a/pkg/agent/templates/templates_linux.go +++ b/pkg/agent/templates/templates_linux.go @@ -63,10 +63,6 @@ enable_keychain = true {{end}} {{end}} -[plugins."io.containerd.grpc.v1.cri".cni] - bin_dir = "{{ .NodeConfig.AgentConfig.CNIBinDir }}" - conf_dir = "{{ .NodeConfig.AgentConfig.CNIConfDir }}" - {{- if or .NodeConfig.Containerd.BlockIOConfig .NodeConfig.Containerd.RDTConfig }} [plugins."io.containerd.service.v1.tasks-service"] {{ if .NodeConfig.Containerd.BlockIOConfig }}blockio_config_file = "{{ .NodeConfig.Containerd.BlockIOConfig }}"{{end}} From b8487b0dbb5951111aa69fe97cc7f709b1148a15 Mon Sep 17 00:00:00 2001 From: Deshi Xiao Date: Thu, 21 Nov 2024 14:45:07 +0800 Subject: [PATCH 3/3] enhance: refine README description Signed-off-by: Deshi Xiao --- README.md | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 79a9128d..9f0701f4 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ -logo
-K8e 🚀 - Kubernetes Enterprise Edition that is ready to use immediately. -=============================================== -[Kubernetes Easy Engine(k8e)🚀](https://getk8e.com) is a lightweight, scalable enterprise-grade Kubernetes distribution that allows users to manage, protect and obtain out-of-the-box Kubernetes clusters in a unified manner. It is suitable for enterprise environments. +K8e Logo
-[![Go Report Card](https://goreportcard.com/badge/github.com/xiaods/k8e)](https://goreportcard.com/report/github.com/xiaods/k8e) [![Hex.pm](https://img.shields.io/hexpm/l/apa)](https://github.com/xiaods/k8e/blob/master/LICENSE) +# K8e 🚀 - Instantly Ready Kubernetes Enterprise Edition -# ✅ Features -- [x] Support k8s components airgap images package -- [x] 10 year certificate, support cluster backup, upgrade -- [x] No dependency on ansible haproxy keepalived, a binary tool, 0 dependency -- [x] natively support cilium network -- [x] no kube-proxy component +[Kubernetes Easy Engine (k8e) 🚀](https://getk8e.com) is a lightweight, scalable enterprise-grade Kubernetes distribution that allows users to manage, protect, and obtain out-of-the-box Kubernetes clusters in a unified manner. It is suitable for enterprise environments. -Quick-Start - Building && Installing --------------- -https://getk8e.com/docs/install/200-quick-start/ +[![Go Report Card](https://goreportcard.com/badge/github.com/xiaods/k8e)](https://goreportcard.com/report/github.com/xiaods/k8e) +[![License](https://img.shields.io/hexpm/l/apa)](https://github.com/xiaods/k8e/blob/main/LICENSE) -Acknowledgments --------------- -- Thanks [k3s](https://github.com/k3s-io/k3s) for the great open source project. +## ✅ Key Features +- **Supports airgap images package for k8s components** +- **10-year valid certificate, supports cluster backup and upgrade** +- **No dependency on Ansible, HAProxy, or Keepalived; a binary tool with zero dependencies** +- **Natively supports Cilium network** +- **No kube-proxy component** + +## Quick Start - Building && Installing +- [Installation Guide](https://getk8e.com/docs/install/200-quick-start/) + +## Acknowledgments +- Thanks to [k3s](https://github.com/k3s-io/k3s) for the excellent open-source project. \ No newline at end of file