From 40bad4bff651c49962ba87a4b540b658a3b21daf Mon Sep 17 00:00:00 2001 From: DeepFlow-pengbin <84362246+1473371932@users.noreply.github.com> Date: Mon, 23 Dec 2024 10:20:24 +0800 Subject: [PATCH] update lts version (#682) * Update 02-all-in-one.md Updating some of the operations when deploying deepflow with docker compose * update lts version * Update 04-multi-k8s.md * update lts version * update lts version * update lts version * Update 08-serverless-pod.md * Update 02-release-timeline.md * update lts version --- docs/zh/02-ce-install/02-all-in-one.md | 23 +++++++++++-------- docs/zh/02-ce-install/03-single-k8s.md | 4 ++-- docs/zh/02-ce-install/04-multi-k8s.md | 4 ++-- docs/zh/02-ce-install/08-serverless-pod.md | 2 +- .../10-release-notes/02-release-timeline.md | 15 ++++++++---- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/docs/zh/02-ce-install/02-all-in-one.md b/docs/zh/02-ce-install/02-all-in-one.md index 80f17fc8..9f94a983 100644 --- a/docs/zh/02-ce-install/02-all-in-one.md +++ b/docs/zh/02-ce-install/02-all-in-one.md @@ -64,7 +64,7 @@ cat << EOF > values-custom.yaml global: allInOneLocalStorage: true EOF -helm install deepflow -n deepflow deepflow/deepflow --version 6.5.012 --create-namespace -f values-custom.yaml +helm install deepflow -n deepflow deepflow/deepflow --version 6.6.018 --create-namespace -f values-custom.yaml ``` @tab Use Aliyun @@ -78,7 +78,7 @@ global: image: repository: registry.cn-beijing.aliyuncs.com/deepflow-ce EOF -helm install deepflow -n deepflow deepflow/deepflow --version 6.5.012 --create-namespace -f values-custom.yaml +helm install deepflow -n deepflow deepflow/deepflow --version 6.6.018 --create-namespace -f values-custom.yaml ``` ::: @@ -134,19 +134,24 @@ chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose ## 部署 All-in-One DeepFlow -设置环境变量 DOCKER_HOST_IP 为本机物理网卡 IP +下载 DeepFlow docker-compose 包 ```bash -unset DOCKER_HOST_IP -DOCKER_HOST_IP="10.1.2.3" # FIXME: Deploy the environment machine IP +wget https://deepflow-ce.oss-cn-beijing.aliyuncs.com/pkg/docker-compose/latest/linux/deepflow-docker-compose.tar +tar -zxf deepflow-docker-compose.tar ``` -下载并安装 All-in-One DeepFlow +配置`.env`变量 + +```bash +vim ./deepflow-docker-compose/.env +DEEPFLOW_VERSION=v6.6 # FIXME: DeepFlow Version +NODE_IP_FOR_DEEPFLOW=192.168.101.116 # FIXME: Node IP +``` + +安装 DeepFlow ```bash -wget https://deepflow-ce.oss-cn-beijing.aliyuncs.com/pkg/docker-compose/latest/linux/deepflow-docker-compose.tar -tar -zxf deepflow-docker-compose.tar -sed -i "s|FIX_ME_ALLINONE_HOST_IP|$DOCKER_HOST_IP|g" deepflow-docker-compose/docker-compose.yaml docker compose -f deepflow-docker-compose/docker-compose.yaml up -d ``` diff --git a/docs/zh/02-ce-install/03-single-k8s.md b/docs/zh/02-ce-install/03-single-k8s.md index f51358ab..1ee1cce8 100644 --- a/docs/zh/02-ce-install/03-single-k8s.md +++ b/docs/zh/02-ce-install/03-single-k8s.md @@ -66,7 +66,7 @@ kubectl patch storageclass openebs-hostpath -p '{"metadata": {"annotations":{"s ```bash helm repo add deepflow https://deepflowio.github.io/deepflow helm repo update deepflow # use `helm repo update` when helm < 3.7.0 -helm install deepflow -n deepflow deepflow/deepflow --version 6.5.012 --create-namespace +helm install deepflow -n deepflow deepflow/deepflow --version 6.6.018 --create-namespace ``` @tab Use Aliyun @@ -79,7 +79,7 @@ global: image: repository: registry.cn-beijing.aliyuncs.com/deepflow-ce EOF -helm install deepflow -n deepflow deepflow/deepflow --version 6.5.012 --create-namespace -f values-custom.yaml +helm install deepflow -n deepflow deepflow/deepflow --version 6.6.018 --create-namespace -f values-custom.yaml ``` ::: diff --git a/docs/zh/02-ce-install/04-multi-k8s.md b/docs/zh/02-ce-install/04-multi-k8s.md index d3e7d865..4331ddee 100644 --- a/docs/zh/02-ce-install/04-multi-k8s.md +++ b/docs/zh/02-ce-install/04-multi-k8s.md @@ -76,7 +76,7 @@ EOF helm repo add deepflow https://deepflowio.github.io/deepflow helm repo update deepflow # use `helm repo update` when helm < 3.7.0 -helm install deepflow-agent -n deepflow deepflow/deepflow-agent --version 6.5.012 --create-namespace -f values-custom.yaml +helm install deepflow-agent -n deepflow deepflow/deepflow-agent --version 6.6.018 --create-namespace -f values-custom.yaml ``` @tab Use Aliyun @@ -94,7 +94,7 @@ EOF helm repo add deepflow https://deepflow-ce.oss-cn-beijing.aliyuncs.com/chart/stable helm repo update deepflow # use `helm repo update` when helm < 3.7.0 -helm install deepflow-agent -n deepflow deepflow/deepflow-agent --version 6.5.012 --create-namespace -f values-custom.yaml +helm install deepflow-agent -n deepflow deepflow/deepflow-agent --version 6.6.018 --create-namespace -f values-custom.yaml ``` ::: diff --git a/docs/zh/02-ce-install/08-serverless-pod.md b/docs/zh/02-ce-install/08-serverless-pod.md index f7a381cb..7a776999 100644 --- a/docs/zh/02-ce-install/08-serverless-pod.md +++ b/docs/zh/02-ce-install/08-serverless-pod.md @@ -38,7 +38,7 @@ daemonsetWatchDisabled: true clusterNAME: $clusterNAME # FIXME: domain name EOF -helm install deepflow-agent -n deepflow deepflow/deepflow-agent --version 6.6.012 --create-namespace -f values-custom.yaml +helm install deepflow-agent -n deepflow deepflow/deepflow-agent --version 6.6.018 --create-namespace -f values-custom.yaml ``` 上述命令将会部署两组 deepflow-agent： diff --git a/docs/zh/10-release-notes/02-release-timeline.md b/docs/zh/10-release-notes/02-release-timeline.md index 948e446d..6c56c575 100644 --- a/docs/zh/10-release-notes/02-release-timeline.md +++ b/docs/zh/10-release-notes/02-release-timeline.md @@ -10,7 +10,8 @@ permalink: /release-notes/release-timeline | | 7.0.2 | | 2025-01-23 | | | | 7.0.1 | | 2025-01-09 | | | | 7.0.0 | | 2024-12-26 | | -| v6.6 | 6.6.9 | Y | 2024-12-12 | 2025-12-12 | +| v6.6 | | Y | 2024-12-12 | 2025-12-12 | +| | 6.6.9 | | 2024-12-12 | | | | 6.6.8 | | 2024-11-14 | | | | 6.6.7 | | 2024-10-31 | | | | 6.6.6 | | 2024-10-11 | | @@ -20,7 +21,8 @@ permalink: /release-notes/release-timeline | | 6.6.2 | | 2024-08-01 | | | | 6.6.1 | | 2024-07-18 | | | | 6.6.0 | | 2024-07-04 | | -| v6.5 | 6.5.9 | Y | 2024-06-20 | 2025-06-20 | +| v6.5 | | Y | 2024-06-20 | 2025-06-20 | +| | 6.5.9 | | 2024-06-20 | | | | 6.5.8 | | 2024-06-06 | | | | 6.5.7 | | 2024-05-23 | | | | 6.5.6 | | 2024-05-10 | | @@ -30,7 +32,8 @@ permalink: /release-notes/release-timeline | | 6.5.2 | | 2024-03-12 | | | | 6.5.1 | | 2024-02-27 | | | | 6.5.0 | | 2024-02-06 | | -| v6.4 | 6.4.9 | Y | 2024-01-18 | 2025-01-25 | +| v6.4 | | Y | 2024-01-18 | 2025-01-25 | +| | 6.4.9 | | 2024-01-18 | | | | 6.4.8 | | 2024-01-11 | | | | 6.4.7 | | 2024-01-04 | | | | 6.4.6 | | 2023-12-28 | | @@ -40,7 +43,8 @@ permalink: /release-notes/release-timeline | | 6.4.2 | | 2023-11-09 | | | | 6.4.1 | | 2023-10-26 | | | | 6.4.0 | | 2023-10-12 | | -| v6.3 | 6.3.9 | Y | 2023-09-14 | 2024-09-21 | +| v6.3 | | Y | 2023-09-14 | 2024-09-21 | +| | 6.3.9 | | 2023-09-14 | | | | 6.3.8 | | 2023-09-07 | | | | 6.3.7 | | 2023-08-31 | | | | 6.3.6 | | 2023-08-24 | | @@ -50,7 +54,8 @@ permalink: /release-notes/release-timeline | | 6.3.2 | | 2023-06-29 | | | | 6.3.1 | | 2023-06-15 | | | | 6.3.0 | | 2023-06-01 | | -| v6.2 | 6.2.6.5 | Y | 2023-05-17 | 2024-05-24 | +| v6.2 | | Y | 2023-05-17 | 2024-05-24 | +| | 6.2.6.5 | | 2023-05-17 | | | | 6.2.6.4 | | 2023-05-10 | | | | 6.2.6.3 | | 2023-04-27 | | | | 6.2.6.2 | | 2023-04-20 | |