From 52329fee5a5da09881c749188218deb9635abc12 Mon Sep 17 00:00:00 2001 From: yeasy Date: Sat, 25 Apr 2026 15:00:47 +0000 Subject: [PATCH] Update etcd to v3.5.29 --- 15_etcd/15.2_install.md | 10 +++++----- 15_etcd/15.3_cluster.md | 6 +++--- 17_ecosystem/17.2_coreos_install.md | 12 ++++++------ 19_observability/19.1_prometheus.md | 2 +- 19_observability/19.3_performance_optimization.md | 3 +-- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/15_etcd/15.2_install.md b/15_etcd/15.2_install.md index 0850e21..0f02133 100644 --- a/15_etcd/15.2_install.md +++ b/15_etcd/15.2_install.md @@ -13,12 +13,12 @@ 例如，使用 `curl` 工具下载压缩包，并解压。 ```bash -$ curl -L https://github.com/etcd-io/etcd/releases/download/v3.5.21/etcd-v3.5.21-linux-amd64.tar.gz -o etcd-v3.5.21-linux-amd64.tar.gz +$ curl -L https://github.com/etcd-io/etcd/releases/download/v3.5.29/etcd-v3.5.29-linux-amd64.tar.gz -o etcd-v3.5.29-linux-amd64.tar.gz ## 国内用户可选择就近的网络加速方式（以可用镜像站为准） -$ tar xzvf etcd-v3.5.21-linux-amd64.tar.gz -$ cd etcd-v3.5.21-linux-amd64 +$ tar xzvf etcd-v3.5.29-linux-amd64.tar.gz +$ cd etcd-v3.5.29-linux-amd64 ``` 解压后，可以看到文件包括 @@ -65,8 +65,8 @@ $ docker run \ -p 2379:2379 \ -p 2380:2380 \ --mount type=bind,source=/tmp/etcd-data.tmp,destination=/etcd-data \ ---name etcd-gcr-v3.5.21 \ -quay.io/coreos/etcd:v3.5.21 \ +--name etcd-gcr-v3.5.29 \ +quay.io/coreos/etcd:v3.5.29 \ /usr/local/bin/etcd \ --name s1 \ --data-dir /etcd-data \ diff --git a/15_etcd/15.3_cluster.md b/15_etcd/15.3_cluster.md index 82acea4..f9ac232 100644 --- a/15_etcd/15.3_cluster.md +++ b/15_etcd/15.3_cluster.md @@ -8,7 +8,7 @@ services: node1: - image: quay.io/coreos/etcd:v3.5.21 + image: quay.io/coreos/etcd:v3.5.29 volumes: - node1-data:/etcd-data expose: @@ -40,7 +40,7 @@ services: - docker-etcd node2: - image: quay.io/coreos/etcd:v3.5.21 + image: quay.io/coreos/etcd:v3.5.29 volumes: - node2-data:/etcd-data networks: @@ -72,7 +72,7 @@ services: - docker-etcd node3: - image: quay.io/coreos/etcd:v3.5.21 + image: quay.io/coreos/etcd:v3.5.29 volumes: - node3-data:/etcd-data networks: diff --git a/17_ecosystem/17.2_coreos_install.md b/17_ecosystem/17.2_coreos_install.md index a770ebb..1fac31d 100644 --- a/17_ecosystem/17.2_coreos_install.md +++ b/17_ecosystem/17.2_coreos_install.md @@ -4,15 +4,15 @@ 在[下载页面](https://getfedora.org/coreos/download/) `Bare Metal & Virtualized` 标签页下载 ISO。 -### 17.2.2 编写 Butane 配置 +### 17.2.2 编写 FCC -> **注意**：Fedora CoreOS 配置工具已从 `fcct` (Fedora CoreOS Config Transpiler) 更名为 **Butane**。新版本使用 `.bu` 扩展名和更新的 spec 版本。 +FCC 是 Fedora CoreOS Configuration (Fedora CoreOS 配置) 的简称。 ```yaml -## example.bu +## example.fcc variant: fcos -version: 1.6.0 +version: 1.0.0 passwd: users: - name: core @@ -21,10 +21,10 @@ passwd: ``` 将 `ssh-rsa AAAA...` 替换为自己的 SSH 公钥 (位于 `~/.ssh/id_rsa.pub`)。 -### 17.2.3 转换 Butane 配置为 Ignition +### 17.2.3 转换 FCC 为 Ignition ```bash -$ docker run -i --rm quay.io/coreos/butane:release --pretty --strict < example.bu > example.ign +$ docker run -i --rm quay.io/coreos/fcct:v0.5.0 --pretty --strict < example.fcc > example.ign ``` ### 17.2.4 挂载 ISO 启动虚拟机并安装 diff --git a/19_observability/19.1_prometheus.md b/19_observability/19.1_prometheus.md index 0b5a135..6b2c81c 100644 --- a/19_observability/19.1_prometheus.md +++ b/19_observability/19.1_prometheus.md @@ -82,7 +82,7 @@ services: - prometheus node-exporter: - image: prom/node-exporter:v1.11.1 + image: prom/node-exporter:v1.8.2 ports: - "9100:9100" networks: diff --git a/19_observability/19.3_performance_optimization.md b/19_observability/19.3_performance_optimization.md index c6de396..43877c5 100644 --- a/19_observability/19.3_performance_optimization.md +++ b/19_observability/19.3_performance_optimization.md @@ -122,7 +122,6 @@ networks: driver: bridge ``` 启动后访问 `http://localhost:8080` 查看： - - 容器性能统计 - 系统资源使用情况 - 历史性能数据 @@ -177,7 +176,7 @@ services: - monitoring node-exporter: - image: prom/node-exporter:v1.11.1 + image: prom/node-exporter:v1.8.2 container_name: node-exporter ports: - "9100:9100"