From c8c4de4997fed7148ceaa5186156b86d8291d1ec Mon Sep 17 00:00:00 2001 From: lukeqiu Date: Sat, 18 Jun 2022 18:04:00 +0800 Subject: [PATCH 1/2] improve docs --- ...heduling-pods-based-on-actual-node-load.md | 22 +----------------- ...uling-pods-based-on-actual-node-load.zh.md | 23 +------------------ mkdocs.yml | 4 +++- 3 files changed, 5 insertions(+), 44 deletions(-) diff --git a/docs/tutorials/scheduling-pods-based-on-actual-node-load.md b/docs/tutorials/scheduling-pods-based-on-actual-node-load.md index 5aec6de5e..ce99748de 100644 --- a/docs/tutorials/scheduling-pods-based-on-actual-node-load.md +++ b/docs/tutorials/scheduling-pods-based-on-actual-node-load.md @@ -12,7 +12,7 @@ Make sure your kubernetes cluster has Prometheus installed. If not, please refer ### Configure Prometheus Rules -1. Configure the rules of Prometheus to get expected aggregated data: +Configure the rules of Prometheus to get expected aggregated data: ```yaml apiVersion: monitoring.coreos.com/v1 @@ -57,26 +57,6 @@ spec: The sampling interval of Prometheus must be less than 30 seconds, otherwise the above rules(such as cpu_usage_active) may not take effect. -2\. Update the configuration of Prometheus service discovery to ensure that `node_exporters/telegraf` are using node name as instance name: - -```yaml hl_lines="9-11" - - job_name: kubernetes-node-exporter - tls_config: - ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - insecure_skip_verify: true - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token - scheme: https - kubernetes_sd_configs: - ... - # Host name - - source_labels: [__meta_kubernetes_node_name] - target_label: instance - ... -``` - -!!! note "Note" - This step can be skipped if the node name itself is the host IP. - ### Install Crane-scheduler There are two options: diff --git a/docs/tutorials/scheduling-pods-based-on-actual-node-load.zh.md b/docs/tutorials/scheduling-pods-based-on-actual-node-load.zh.md index 9747f4720..31e90bda2 100644 --- a/docs/tutorials/scheduling-pods-based-on-actual-node-load.zh.md +++ b/docs/tutorials/scheduling-pods-based-on-actual-node-load.zh.md @@ -12,7 +12,7 @@ Crane-scheduler 是一组基于[scheduler framework](https://kubernetes.io/docs/ ### 配置 Prometheus 规则 -1. 配置 Prometheus 的规则以获取预期的聚合数据： +配置 Prometheus 的规则以获取预期的聚合数据： ```yaml apiVersion: monitoring.coreos.com/v1 @@ -57,27 +57,6 @@ spec: Prometheus 的采样间隔必须小于30秒，不然可能会导致规则无法正常生效。如：`cpu_usage_active`。 -2\. 更新 Prometheus 服务发现的配置，确保`node_exporters/telegraf`正在使用节点名称作为实例名称： - -```yaml hl_lines="9-11" - - job_name: kubernetes-node-exporter - tls_config: - ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - insecure_skip_verify: true - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token - scheme: https - kubernetes_sd_configs: - ... - # Host name - - source_labels: [__meta_kubernetes_node_name] - target_label: instance - ... -``` - -!!! note "Note" - - 如果节点名称是本机IP，则可以跳过此步骤。 - ### 安装 Crane-scheduler 有两种选择： diff --git a/mkdocs.yml b/mkdocs.yml index de6dc3e62..53a3c9b38 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -51,6 +51,7 @@ plugins: Mirror Repo: 镜像仓库 Code Standard: 代码标准 Roadmap: 路线图 + Load-aware Scheduling: 负载感知调度 markdown_extensions: - codehilite - admonition @@ -86,7 +87,8 @@ nav: - Replicas Recommendation: tutorials/replicas-recommendation.md - Qos Ensurance: tutorials/using-qos-ensurance.md - Time Series Prediction: tutorials/using-time-series-prediction.md - - Load-aware Scheduling: tutorials/scheduling-pods-based-on-actual-node-load.md + - Crane-scheduler: + - Load-aware Scheduling: tutorials/scheduling-pods-based-on-actual-node-load.md - Proposals: - Advanced CpuSet Manager: proposals/20220228-advanced-cpuset-manger.md - Contributing: CONTRIBUTING.md From 2489bf6ee77cbf710c2e5444485578aabdf342ab Mon Sep 17 00:00:00 2001 From: lukeqiu Date: Mon, 20 Jun 2022 10:44:18 +0800 Subject: [PATCH 2/2] add dynamic-scheduler-plugin doc to the website directory --- mkdocs.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 53a3c9b38..1cad8f7c6 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -51,6 +51,7 @@ plugins: Mirror Repo: 镜像仓库 Code Standard: 代码标准 Roadmap: 路线图 + Overview: 概述 Load-aware Scheduling: 负载感知调度 markdown_extensions: - codehilite @@ -88,7 +89,8 @@ nav: - Qos Ensurance: tutorials/using-qos-ensurance.md - Time Series Prediction: tutorials/using-time-series-prediction.md - Crane-scheduler: - - Load-aware Scheduling: tutorials/scheduling-pods-based-on-actual-node-load.md + - Overview: tutorials/scheduling-pods-based-on-actual-node-load.md + - Load-aware Scheduling: tutorials/dynamic-scheduler-plugin.md - Proposals: - Advanced CpuSet Manager: proposals/20220228-advanced-cpuset-manger.md - Contributing: CONTRIBUTING.md