diff --git a/.vuepress/comp/KuboardDemo.vue b/.vuepress/comp/KuboardDemo.vue
new file mode 100644
index 0000000..69a26f9
--- /dev/null
+++ b/.vuepress/comp/KuboardDemo.vue
@@ -0,0 +1,57 @@
+
+ hi: kuboard
+
+
+
+ hi: kuboard
+
+
+
+
+
+
+ {{label}}
+
+
+
+ 在线演示
+
+ 在线演示环境中,您具备 只读 权限,只能体验 Kuboard 的一部分功能。
+
+
+
+
+
+
+
+
+
diff --git a/.vuepress/comp/index.js b/.vuepress/comp/index.js
index 281558c..bd40757 100644
--- a/.vuepress/comp/index.js
+++ b/.vuepress/comp/index.js
@@ -3,6 +3,7 @@ let components = [
{ name: 'Course', component: () => import(`./Course.vue`) },
{ name: 'CurrentVersion', component: () => import(`./CurrentVersion.vue`) },
{ name: 'CurrentVersionV3', component: () => import(`./CurrentVersionV3.vue`) },
+ { name: 'KuboardDemo', component: () => import(`./KuboardDemo.vue`) },
]
export default function (Vue) {
diff --git a/.vuepress/config-sidebar.js b/.vuepress/config-sidebar.js
index edb9ddf..135198c 100644
--- a/.vuepress/config-sidebar.js
+++ b/.vuepress/config-sidebar.js
@@ -370,6 +370,38 @@ let sidebar = {
title: 'Kubernetes 高级',
collapsable: true,
children: [
+ {
+ title: '认证及授权',
+ collapsable: true,
+ children: [
+ {
+ title: '用户认证',
+ collapsable: true,
+ children: [
+ 'k8s-advanced/sec/authenticate/',
+ 'k8s-advanced/sec/sa-admin',
+ // 'k8s-advanced/sec/authenticate/install',
+ // 'k8s-advanced/sec/authenticate/ldap',
+ ]
+ }, {
+ title: '用户授权',
+ collapsable: true,
+ children: [
+ 'k8s-advanced/sec/kuboard',
+ 'k8s-advanced/sec/rbac/user-namespace.html',
+ 'k8s-advanced/sec/rbac/list-namespace.html',
+ 'k8s-advanced/sec/rbac/logs.html',
+ 'k8s-advanced/sec/rbac/api',
+ 'k8s-advanced/sec/rbac/default',
+ 'k8s-advanced/sec/rbac/escalation',
+ 'k8s-advanced/sec/rbac/cmd',
+ 'k8s-advanced/sec/rbac/sa',
+ 'k8s-advanced/sec/rbac/permissive',
+ 'k8s-advanced/sec/rbac/example',
+ ]
+ },
+ ]
+ },
{
title: '问题诊断',
collapsable: true,
@@ -444,38 +476,6 @@ let sidebar = {
'k8s-advanced/hpa/walkthrough',
]
},
- {
- title: '安全',
- collapsable: true,
- children: [
- {
- title: '用户认证',
- collapsable: true,
- children: [
- 'k8s-advanced/sec/authenticate/',
- 'k8s-advanced/sec/sa-admin',
- 'k8s-advanced/sec/authenticate/install',
- 'k8s-advanced/sec/authenticate/ldap',
- ]
- }, {
- title: '用户授权',
- collapsable: true,
- children: [
- 'k8s-advanced/sec/kuboard',
- 'k8s-advanced/sec/rbac/user-namespace.html',
- 'k8s-advanced/sec/rbac/list-namespace.html',
- 'k8s-advanced/sec/rbac/logs.html',
- 'k8s-advanced/sec/rbac/api',
- 'k8s-advanced/sec/rbac/default',
- 'k8s-advanced/sec/rbac/escalation',
- 'k8s-advanced/sec/rbac/cmd',
- 'k8s-advanced/sec/rbac/sa',
- 'k8s-advanced/sec/rbac/permissive',
- 'k8s-advanced/sec/rbac/example',
- ]
- },
- ]
- },
{
title: '监控',
collapsable: true,
diff --git a/.vuepress/config.js b/.vuepress/config.js
index 300d558..33c2507 100644
--- a/.vuepress/config.js
+++ b/.vuepress/config.js
@@ -56,20 +56,6 @@ module.exports = {
// selector: 'div[class*="language-"] pre'
selector: 'div[class*="language-"] pre'
},
- // '@vuepress/pwa': {
- // serviceWorker: true,
- // // popupComponent: 'KbSWUpdatePopup',
- // updatePopup: {
- // '/': {
- // message: "Kuboard已更新",
- // buttonText: "点击刷新"
- // }
- // }
- // },
- // '@vuepress/pwa': {
- // serviceWorker: true,
- // updatePopup: true
- // },
'@vssue/vuepress-plugin-vssue': {
// set `platform` rather than `api`
platform: 'github-v4',
@@ -132,7 +118,7 @@ module.exports = {
// { text: '简介', link: '/overview/' },
{ text: '安装', link: '/install/v3/install.html' },
{ text: '教程', link: '/learning/' },
- { text: '使用', link: '/guide/' },
+ // { text: '使用', link: '/guide/' },
{ text: '支持', link: '/support/' },
{ text: '论坛', link: 'https://forum.kuboard.cn/'},
// { text: '培训', link: 'https://kubetrain.cn/?from=kuboard', target: '_blank' },
@@ -147,13 +133,13 @@ module.exports = {
},
lastUpdated: '更新时间',
// 假定是 GitHub. 同时也可以是一个完整的 GitLab URL
- repo: 'eip-work/kuboard-press',
+ // repo: 'eip-work/kuboard-press',
// 自定义仓库链接文字。默认从 `themeConfig.repo` 中自动推断为
// "GitHub"/"GitLab"/"Bitbucket" 其中之一,或是 "Source"。
- repoLabel: '文档仓库',
+ // repoLabel: '文档仓库',
// 假如你的文档仓库和项目本身不在一个仓库:
- docsRepo: 'eip-work/kuboard-press',
+ // docsRepo: 'eip-work/kuboard-press',
// 假如文档不是放在仓库的根目录下:
docsDir: '',
// 假如文档放在一个特定的分支下:
diff --git a/.vuepress/public/landing.html b/.vuepress/public/landing.html
index b495332..777be7a 100755
--- a/.vuepress/public/landing.html
+++ b/.vuepress/public/landing.html
@@ -200,16 +200,32 @@
快速在 Kubernetes 上落地微服务
Kubernetes: 安装、教程、管理面板、微服务实战
+
+
+ 在线演示环境中,您具备 只读 权限,只能体验 Kuboard 的一部分功能。
+
+
+
diff --git a/.vuepress/theme/components/Navbar.vue b/.vuepress/theme/components/Navbar.vue
index fef2cec..3c6c26c 100644
--- a/.vuepress/theme/components/Navbar.vue
+++ b/.vuepress/theme/components/Navbar.vue
@@ -54,6 +54,7 @@
/>
+
diff --git a/.vuepress/theme/components/Sidebar.vue b/.vuepress/theme/components/Sidebar.vue
index fd21d82..76e79a0 100644
--- a/.vuepress/theme/components/Sidebar.vue
+++ b/.vuepress/theme/components/Sidebar.vue
@@ -14,42 +14,30 @@
-
-
-
-
- 在线体验
-
+
@@ -145,7 +133,7 @@ export default {
}
.side-nav-item {
margin-bottom: -2px;
- margin-left: 3px;
+ margin-left: 10px;
display: inline-block;
line-height: 1.4rem;
white-space: nowrap;
diff --git a/install/v3/install-built-in.md b/install/v3/install-built-in.md
index 3cd4c1b..510d134 100644
--- a/install/v3/install-built-in.md
+++ b/install/v3/install-built-in.md
@@ -29,6 +29,7 @@ meta:
* 用于安装 Kuboard v3.0 的机器已经安装了 docker,并且版本不低于 docker 19.03
* 您已经有自己的 Kubernetes 集群,并且版本不低于 Kubernetes v1.13
+点击此处可以查看
## 安装
安装 Kuboard v3.0 版本的指令如下:
diff --git a/install/v3/install.md b/install/v3/install.md
index 870fe98..ee61104 100644
--- a/install/v3/install.md
+++ b/install/v3/install.md
@@ -16,6 +16,8 @@ Kuboard v3.0 支持 Kubernetes 多集群管理。如果您从 Kuboard v1.0.x 或
* 您可以同时使用 Kuboard v3.0.x 和 Kuboard v2.0.x;
* Kuboard v3.0.x 支持 amd64 (x86) 架构和 arm68 (armv8) 架构的 CPU;
+点击此处可以查看
+
## 兼容性
diff --git a/learning/k8s-advanced/logs/loki-addon.assets/image-20200729210144022.png b/learning/k8s-advanced/logs/loki-addon.assets/image-20200729210144022.png
deleted file mode 100644
index dcc7a6c..0000000
Binary files a/learning/k8s-advanced/logs/loki-addon.assets/image-20200729210144022.png and /dev/null differ
diff --git a/learning/k8s-advanced/logs/loki-addon.assets/image-20210404202048279.png b/learning/k8s-advanced/logs/loki-addon.assets/image-20210404202048279.png
new file mode 100644
index 0000000..2eba984
Binary files /dev/null and b/learning/k8s-advanced/logs/loki-addon.assets/image-20210404202048279.png differ
diff --git a/learning/k8s-advanced/logs/loki-addon.md b/learning/k8s-advanced/logs/loki-addon.md
index 891ee71..2c5ac01 100644
--- a/learning/k8s-advanced/logs/loki-addon.md
+++ b/learning/k8s-advanced/logs/loki-addon.md
@@ -15,8 +15,7 @@ Kuboard 通过套件能力,提供了一种基于 loki + grafana + promtail 的
具体请进入您已经安装好的 Kuboard 界面,按照如下步骤可以找到日志聚合套件:
-1. 点击右上角的圆形按钮,进入 ***设置*** 菜单
-2. 点击左侧的 ***Kuboard*** --> ***套件*** 菜单
+1. 点击左侧的 ***集群导入*** --> ***套件*** 菜单
3. 点击 ***套件仓库*** Tab 页
4. 点击 ***日志聚合套件*** 的 ***查看*** 按钮,如下图所示:
@@ -24,4 +23,4 @@ Kuboard 通过套件能力,提供了一种基于 loki + grafana + promtail 的
进入 ***日志聚合套件*** 的详情页后,按照提示可以顺利完成套件的安装(支持在线安装、离线安装),并可以快速了解如何使用。
:::
-
+
\ No newline at end of file
diff --git a/learning/k8s-intermediate/config/assign-pod-node.assets/image-20190908141039251.png b/learning/k8s-intermediate/config/assign-pod-node.assets/image-20190908141039251.png
deleted file mode 100644
index d80db24..0000000
Binary files a/learning/k8s-intermediate/config/assign-pod-node.assets/image-20190908141039251.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/assign-pod-node.assets/image-20190908152121423.png b/learning/k8s-intermediate/config/assign-pod-node.assets/image-20190908152121423.png
deleted file mode 100644
index 04a28f7..0000000
Binary files a/learning/k8s-intermediate/config/assign-pod-node.assets/image-20190908152121423.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/assign-pod-node.assets/image-20190908152640876.png b/learning/k8s-intermediate/config/assign-pod-node.assets/image-20190908152640876.png
deleted file mode 100644
index a7b8c20..0000000
Binary files a/learning/k8s-intermediate/config/assign-pod-node.assets/image-20190908152640876.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/assign-pod-node.assets/image-20210404213023202.png b/learning/k8s-intermediate/config/assign-pod-node.assets/image-20210404213023202.png
new file mode 100644
index 0000000..eea0afe
Binary files /dev/null and b/learning/k8s-intermediate/config/assign-pod-node.assets/image-20210404213023202.png differ
diff --git a/learning/k8s-intermediate/config/assign-pod-node.assets/image-20210404213139950.png b/learning/k8s-intermediate/config/assign-pod-node.assets/image-20210404213139950.png
new file mode 100644
index 0000000..c140b25
Binary files /dev/null and b/learning/k8s-intermediate/config/assign-pod-node.assets/image-20210404213139950.png differ
diff --git a/learning/k8s-intermediate/config/assign-pod-node.assets/image-20210404214602430.png b/learning/k8s-intermediate/config/assign-pod-node.assets/image-20210404214602430.png
new file mode 100644
index 0000000..baf4674
Binary files /dev/null and b/learning/k8s-intermediate/config/assign-pod-node.assets/image-20210404214602430.png differ
diff --git a/learning/k8s-intermediate/config/assign-pod-node.md b/learning/k8s-intermediate/config/assign-pod-node.md
index 3e8fe12..b18b9af 100644
--- a/learning/k8s-intermediate/config/assign-pod-node.md
+++ b/learning/k8s-intermediate/config/assign-pod-node.md
@@ -41,7 +41,7 @@ nodeName 是四种方法中最简单的一个,但是因为它的局限性,
您在 Kuboard 工作负载编辑器中,可以通过 ***指定节点*** --> ***选择节点*** 按钮,选择对应 nodeName 的取值。如下图所示:
-
+
## 节点选择器 nodeSelector
@@ -57,7 +57,7 @@ nodeSelector 是 PodSpec 中的一个字段。指定了一组名值对。节点
增加标签 disk:ssd,并保存,如下图所示:
- 
+ 
### 为工作负载选择节点
@@ -65,13 +65,13 @@ nodeSelector 是 PodSpec 中的一个字段。指定了一组名值对。节点
* 点击您要编辑的工作负载,进入工作负载查看页
-* 点击 ***编辑*** 按钮,进入工作负载编辑页
+* 点击 ***编辑*** 按钮,进入工作负载编辑页,并切换到 ***高级设置*** 标签
-* 点击 **节点选择** --> **匹配节点** --> **选择标签** 按钮
+* 点击 **节点选择** --> **根据标签选择节点** --> **选择标签** 按钮
- 选择 disk:ssd 标签,此时可以看到匹配的节点有刚才您添加标签的节点。点击 ***确定*** 按钮
+ 选择 `disk:ssd` 标签,此时可以看到匹配的节点有刚才您添加标签的节点。点击 ***确定*** 按钮
- 
+ 
* 点击 ***保存*** 按钮
diff --git a/learning/k8s-intermediate/config/computing-resource.assets/image-20190908193257183.png b/learning/k8s-intermediate/config/computing-resource.assets/image-20190908193257183.png
deleted file mode 100644
index bee9c85..0000000
Binary files a/learning/k8s-intermediate/config/computing-resource.assets/image-20190908193257183.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/computing-resource.assets/image-20210404214836049.png b/learning/k8s-intermediate/config/computing-resource.assets/image-20210404214836049.png
new file mode 100644
index 0000000..466b75a
Binary files /dev/null and b/learning/k8s-intermediate/config/computing-resource.assets/image-20210404214836049.png differ
diff --git a/learning/k8s-intermediate/config/computing-resource.md b/learning/k8s-intermediate/config/computing-resource.md
index b5c837e..7fe82f8 100644
--- a/learning/k8s-intermediate/config/computing-resource.md
+++ b/learning/k8s-intermediate/config/computing-resource.md
@@ -48,7 +48,7 @@ Kubernetes 中,可以为容器指定计算资源的请求数量 request 和限
在 Kuboard 的工作负载编辑器中编辑容器资源请求及限制的界面如下图所示:
-
+
## 带有资源请求的容器组是如何调度的
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829060842558.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829060842558.png
deleted file mode 100644
index 3c20d3f..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829060842558.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829110253001.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829110253001.png
deleted file mode 100644
index 60e8b2e..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829110253001.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829110932787.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829110932787.png
deleted file mode 100644
index 9b4fa6f..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829110932787.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829112358038.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829112358038.png
deleted file mode 100644
index 08d08d6..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829112358038.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829112451057.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829112451057.png
deleted file mode 100644
index 6e547e0..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829112451057.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829112834708.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829112834708.png
deleted file mode 100644
index 649a4ca..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829112834708.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829135425998.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829135425998.png
deleted file mode 100644
index f3a7275..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829135425998.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829135734710.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829135734710.png
deleted file mode 100644
index f87d46b..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829135734710.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829141424670.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829141424670.png
deleted file mode 100644
index a254ef9..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829141424670.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829143229693.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829143229693.png
deleted file mode 100644
index 3a0afa6..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829143229693.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829144149253.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829144149253.png
deleted file mode 100644
index 4345a0f..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829144149253.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829151744331.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829151744331.png
deleted file mode 100644
index 3a72749..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829151744331.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20190829151912714.png b/learning/k8s-intermediate/config/config-map.assets/image-20190829151912714.png
deleted file mode 100644
index c6cab02..0000000
Binary files a/learning/k8s-intermediate/config/config-map.assets/image-20190829151912714.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210404224432468.png b/learning/k8s-intermediate/config/config-map.assets/image-20210404224432468.png
new file mode 100644
index 0000000..2b9c1fd
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210404224432468.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210404224625206.png b/learning/k8s-intermediate/config/config-map.assets/image-20210404224625206.png
new file mode 100644
index 0000000..0bad7c2
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210404224625206.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210404225341906.png b/learning/k8s-intermediate/config/config-map.assets/image-20210404225341906.png
new file mode 100644
index 0000000..f473334
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210404225341906.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210404230245842.png b/learning/k8s-intermediate/config/config-map.assets/image-20210404230245842.png
new file mode 100644
index 0000000..e4d320b
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210404230245842.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210404230928074.png b/learning/k8s-intermediate/config/config-map.assets/image-20210404230928074.png
new file mode 100644
index 0000000..8962959
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210404230928074.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210404231254710.png b/learning/k8s-intermediate/config/config-map.assets/image-20210404231254710.png
new file mode 100644
index 0000000..cd72e67
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210404231254710.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210404232651733.png b/learning/k8s-intermediate/config/config-map.assets/image-20210404232651733.png
new file mode 100644
index 0000000..139c103
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210404232651733.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210404232853214.png b/learning/k8s-intermediate/config/config-map.assets/image-20210404232853214.png
new file mode 100644
index 0000000..8b34151
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210404232853214.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210404233115209.png b/learning/k8s-intermediate/config/config-map.assets/image-20210404233115209.png
new file mode 100644
index 0000000..6ec7b58
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210404233115209.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210405084812474.png b/learning/k8s-intermediate/config/config-map.assets/image-20210405084812474.png
new file mode 100644
index 0000000..dd68eb7
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210405084812474.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210405084916819.png b/learning/k8s-intermediate/config/config-map.assets/image-20210405084916819.png
new file mode 100644
index 0000000..3bb5657
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210405084916819.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210405085257759.png b/learning/k8s-intermediate/config/config-map.assets/image-20210405085257759.png
new file mode 100644
index 0000000..aafc11a
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210405085257759.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210405085500623.png b/learning/k8s-intermediate/config/config-map.assets/image-20210405085500623.png
new file mode 100644
index 0000000..e4d4ac4
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210405085500623.png differ
diff --git a/learning/k8s-intermediate/config/config-map.assets/image-20210405092911957.png b/learning/k8s-intermediate/config/config-map.assets/image-20210405092911957.png
new file mode 100644
index 0000000..e18c91f
Binary files /dev/null and b/learning/k8s-intermediate/config/config-map.assets/image-20210405092911957.png differ
diff --git a/learning/k8s-intermediate/config/config-map.md b/learning/k8s-intermediate/config/config-map.md
index c92a426..ebffef7 100644
--- a/learning/k8s-intermediate/config/config-map.md
+++ b/learning/k8s-intermediate/config/config-map.md
@@ -28,17 +28,15 @@ Kubernetes ConfigMap 可以将配置信息和容器镜像解耦,以使得容
Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请自行参考文档 [Configure a Pod to Use a ConfigMap](https://kubernetes.io/docs/tasks/configure-pod-container/configure-pod-configmap)
:::
-* 打开 Kuboard 界面,并点击进入您想要创建 ConfigMap 的 **名称空间**
+* 打开 Kuboard 界面,并点击进入您想要创建 ConfigMap 的 **名称空间**,切换到 ***配置中心*** / ***配置字典*** 菜单,如下图所示:
- 如下图所示:
+ 
- 
-
-* 点击 **配置** --> **创建** 按钮
+* 点击 **配置** --> **创建 ConfigMap** 按钮
并填写表单,如下图所示:
- 
+ 
* 点击 **保存**
@@ -50,24 +48,31 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
填写表单如下:
- | 字段名称 | 填写内容 | 备注 |
- | -------- | -------------- | ------------------------------------------------------------ |
- | 服务类型 | Deployment | |
- | 服务分层 | 中间件 | |
- | 服务名称 | busybox | |
- | 服务描述 | busybox | |
- | 副本数量 | 1 | |
- | 容器名称 | busybox | |
- | 镜像 | busybox:1.29 | |
- | 抓取策略 | Always | |
- | Command | sleep
3600 | sleep 和 3600 是两个元素 |
- | 环境变量 | ENV_KEY_1 | 选择 ConfigMap
ConfigMap 填写 ***my-nginx-config***
Key 填写 ***KEY_1*** |
+ | 字段名称 | 填写内容 | 备注 |
+ | -------- | -------------- | ------------------------ |
+ | 服务类型 | Deployment | |
+ | 服务分层 | 中间件 | |
+ | 服务名称 | busybox | |
+ | 副本数量 | 1 | |
+ | 容器名称 | busybox | |
+ | 镜像 | busybox:1.29 | |
+ | 抓取策略 | Always | |
+ | Command | sleep
3600 | sleep 和 3600 是两个元素 |
+
+ * 勾选 ***环境变量***
+
+ * 点击 ***名值对*** 可以添加一个环境变量
+ * 填写表单:
+ * 环境名: `ENV_KEY_1`
+ * 值类型:`ConfigMap`
+ * ConfigMap名:`my-config`
+ * ConfigMap Key:`KEY_1`
如下图所示:
- 
+ 
- 
+
* 点击 **保存**
@@ -75,7 +80,7 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
* 点击 **完成**
-* 在 ***cloud-busybox*** 的工作负载查看界面,进入容器 ***busybox*** 的终端
+* 在 ***busybox*** 的工作负载查看界面,进入容器 ***busybox*** 的终端
切换到 /bin/sh 终端
@@ -85,9 +90,11 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
执行命令:`export`
- 可查看到 ENV_KEY_1='value-1' 已经注入到该容器的环境变量中,如下图所示:
+ 可查看到 ENV_KEY_1=`value-1` 已经注入到该容器的环境变量中,如下图所示:
- 
+ 
+
+
## ConfigMap --> 容器的环境变量(ConfigMap的所有名值对)
@@ -106,11 +113,11 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
| 镜像 | busybox:1.29 | |
| 抓取策略 | Always | |
| Command | sleep
3600 | sleep 和 3600 是两个元素 |
- | 环境变量 | ***my-nginx-config*** | 通过 ***+ 配置*** 按钮添加 |
+ | 环境变量 | ***my-config*** | 通过 ***+ 配 置*** 按钮添加 |
如下图所示:
- 
+ 
* 点击 **保存**
@@ -119,7 +126,7 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
* 点击 **完成**
-* 在 ***cloud-busybox*** 的工作负载查看界面,进入容器 ***busybox*** 的终端
+* 在 ***busybox*** 的工作负载查看界面,进入容器 ***busybox*** 的终端
切换到 /bin/sh 终端
@@ -139,7 +146,7 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
可查看到 `KEY_1` `KEY_2` `KEY_3` 已经注入到该容器的环境变量中,如下图所示:
- 
+ 
## ConfigMap --> Command 参数
@@ -157,11 +164,11 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
| 容器名称 | busybox | |
| 镜像 | busybox:1.29 | |
| 抓取策略 | Always | |
- | Command | /bin/sh
-c
echo ${ENV_KEY_1} ${ENV_KEY_3} ; sleep ${ENV_KEY_3} | |
+ | Command | /bin/sh -c 'echo ${ENV_KEY_1} ${ENV_KEY_3} ; sleep ${ENV_KEY_3}' | |
| 环境变量 | ENV_KEY_1 / ENV_KEY_3 | 选择 ConfigMap
ConfigMap 填写 ***my-nginx-config***
Key 填写 ***KEY_1***
同样的方法添加 ENV_KEY_3 |
如下图所示:
- 
+ 
* 点击 **保存**
@@ -170,7 +177,7 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
* 点击 **完成**
-* 在 ***cloud-busybox*** 的工作负载查看界面,进入容器 ***busybox*** 的日志界面,可查看到该命令输出的结果为
+* 在 ***busybox*** 的工作负载查看界面,进入容器 ***busybox*** 的日志界面,可查看到该命令输出的结果为
``` sh
value-1 3600
@@ -178,7 +185,9 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
如下图所示
- 
+ 
+
+
## ConfigMap --> 数据卷
@@ -188,7 +197,7 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
| 字段名称 | 填写内容 | 备注 |
| ------------ | ------------------ | ---------------------------------------------------- |
- | 名称 | my-nginx-config | |
+ | 名称 | my-config | |
| KEY_1 | value-1 | |
| KEY_2 | value-2 | |
| KEY_3 | 3600 | |
@@ -213,33 +222,57 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
- 
+ 
* 创建 nginx Deployment 如下图所示:
- 填写表单:
+ * 填写 ***基本信息***
- | 字段名称 | 填写内容 | 备注 |
- | ---------------------- | -------------------------------- | ------------------------------------------------------------ |
- | 服务类型 | Deployment | |
- | 服务分层 | 展现层 | |
- | 服务名称 | nginx | |
- | 服务描述 | Nginx部署 | |
- | 副本数量 | 1 | |
- | 数据卷: | ---------- | ------------ |
- | 数据卷名称 | default-conf | |
- | 数据卷类型 | configMap | |
- | ConfigMap | my-nginx-config | |
- | KeyToPath | default_conf --> default.conf | 将数据卷内的 default_conf 的内容映射到路径 default.conf |
- | 容器: | ---------- | ------------ |
- | 容器名称 | nginx | |
- | 镜像 | nginx:1.7.9 | |
- | 抓取策略 | Always | |
- | 挂载点:容器内路径 | /etc/nginx/conf.d/default.conf | 容器内路径 |
- | 挂载点:数据卷 | default-conf | 选择上面已经定义的数据卷 |
- | 挂载点:数据卷内子路径 | default.conf | 将数据卷内的 default.conf 映射到容器的 /etc/nginx/conf.d/default.conf |
+ 
+
+ 填写表单:
+
+ | 字段名称 | 填写内容 | 备注 |
+ | ---------------------- | -------------------------------- | ------------------------------------------------------------ |
+ | 服务类型 | Deployment | |
+ | 服务分层 | 展现层 | |
+ | 服务名称 | nginx | |
+ | 服务描述 | Nginx部署 | |
+ | 副本数量 | 1 | |
+
+ * 填写 ***容器信息***
+
+ 如下图所示:
+
+ 
+
+ 填写表单:
+
+ | 字段名称 | 填写内容 | 备注 |
+ | ---------------------- | -------------------------------- | ------------------------------------------------------------ |
+ | 容器名称 | nginx | |
+ | 镜像 | nginx:1.7.9 | |
+ | 抓取策略 | Always | |
+
+ * 填写 ***存储挂载***
+
+ 如下图所示:
+
+ 
+
+ 填写表单:
+
+ | 字段名称 | 填写内容 | 备注 |
+ | ----------------------------------- | ------------------------------ | ---------------------- |
+ | 数据卷名称 | 任意 | 可以使用默认生成的名称 |
+ | 数据卷类型 | 配置字典 | |
+ | ConfigMap | my-config | |
+ | KeyToPath : Key | default_conf | |
+ | KeyToPath : 子路径 | default.conf | |
+ | 挂载到容器 nginx | 只读 | |
+ | 挂载到容器 nginx : 挂载到容器内路径 | /etc/nginx/conf.d/default.conf | |
+ | 挂载到容器 nginx : 子路径 | default.conf | |
- 
* 点击 **保存**
@@ -247,7 +280,7 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
* 点击 **完成**
-* 进入 ***终端*** 界面
+* 进入 ***sh*** 终端界面
执行命令
@@ -260,7 +293,9 @@ Kubernetes 描述了多种 ConfigMap 的创建方法,本文不再复述,请
cat /default.conf
```
- 
+ 
+
+
::: tip
diff --git a/learning/k8s-intermediate/config/sec-ctx/con-kuboard.assets/image-20210404222940340.png b/learning/k8s-intermediate/config/sec-ctx/con-kuboard.assets/image-20210404222940340.png
new file mode 100644
index 0000000..ab27384
Binary files /dev/null and b/learning/k8s-intermediate/config/sec-ctx/con-kuboard.assets/image-20210404222940340.png differ
diff --git a/learning/k8s-intermediate/config/sec-ctx/con-kuboard.md b/learning/k8s-intermediate/config/sec-ctx/con-kuboard.md
index 1e78efc..76a06d3 100644
--- a/learning/k8s-intermediate/config/sec-ctx/con-kuboard.md
+++ b/learning/k8s-intermediate/config/sec-ctx/con-kuboard.md
@@ -11,15 +11,9 @@ meta:
-通过 Kuboard,可以直接设定 Deployment、StatefulSet、DaemonSet 等中容器的 securityContext 的内容。在 Kuboard 工作负载编辑器界面中点击 `容器` --> `安全设定` --> **编辑** 按钮,
+通过 Kuboard,可以直接设定 Deployment、StatefulSet、DaemonSet 等中容器的 securityContext 的内容。在 Kuboard 工作负载编辑器界面中切换到 ***容器信息*** 标签页,并勾选 ***容器安全上下文*** ,可查看到容器的 Security Context 设置界面,如下图所示:
-
-
-
-
-可查看到容器的 Security Context 设置界面,如下图所示:
-
-
+
diff --git a/learning/k8s-intermediate/config/sec-ctx/pod-kuboard.assets/image-20210404222653750.png b/learning/k8s-intermediate/config/sec-ctx/pod-kuboard.assets/image-20210404222653750.png
new file mode 100644
index 0000000..556d9fd
Binary files /dev/null and b/learning/k8s-intermediate/config/sec-ctx/pod-kuboard.assets/image-20210404222653750.png differ
diff --git a/learning/k8s-intermediate/config/sec-ctx/pod-kuboard.md b/learning/k8s-intermediate/config/sec-ctx/pod-kuboard.md
index b6559a0..86d19ff 100644
--- a/learning/k8s-intermediate/config/sec-ctx/pod-kuboard.md
+++ b/learning/k8s-intermediate/config/sec-ctx/pod-kuboard.md
@@ -11,15 +11,9 @@ meta:
-通过 Kuboard,可以直接设定 Deployment、StatefulSet、DaemonSet 等中 Pod 模板的 securityContext 的内容。在 Kuboard 工作负载编辑器界面中点击 **容器组的更多设定** 按钮,
+通过 Kuboard,可以直接设定 Deployment、StatefulSet、DaemonSet 等中 Pod 模板的 securityContext 的内容。在 Kuboard 工作负载编辑器界面中切换到 ***高级设置*** 标签页,并勾选 ***容器组安全上下文*** ,可查看到 Pod 的 Security Context 设置界面,如下图所示:
-
-
-
-
-可查看到 Pod 的 Security Context 设置界面,如下图所示:
-
-
+
diff --git a/learning/k8s-intermediate/config/secrets/create-kuboard.assets/image-20210404222214169.png b/learning/k8s-intermediate/config/secrets/create-kuboard.assets/image-20210404222214169.png
new file mode 100644
index 0000000..80ed846
Binary files /dev/null and b/learning/k8s-intermediate/config/secrets/create-kuboard.assets/image-20210404222214169.png differ
diff --git a/learning/k8s-intermediate/config/secrets/create-kuboard.assets/image-20210404222346834.png b/learning/k8s-intermediate/config/secrets/create-kuboard.assets/image-20210404222346834.png
new file mode 100644
index 0000000..3fb4fc4
Binary files /dev/null and b/learning/k8s-intermediate/config/secrets/create-kuboard.assets/image-20210404222346834.png differ
diff --git a/learning/k8s-intermediate/config/secrets/create-kuboard.md b/learning/k8s-intermediate/config/secrets/create-kuboard.md
index 0ae000e..8cd554e 100644
--- a/learning/k8s-intermediate/config/secrets/create-kuboard.md
+++ b/learning/k8s-intermediate/config/secrets/create-kuboard.md
@@ -13,24 +13,19 @@ meta:
本文简要描述如何在 Kuboard 中创建 Kubernetes Secret。
-Kubernetes Secret 必须从属于某一个名称空间,进入 Kuboard 名称空间界面,Secret 列表在名称空间的左上角。如下图所示:
+* Kubernetes Secret 必须从属于某一个名称空间,进入 Kuboard 名称空间界面,在菜单中导航到 ***配置中心*** / ***密 文***,如下图所示:
-* 点击图中 Secrets 的文字,可刷新该列表
-* 点击放大按钮,可放大列表窗口
+ 
+* 点击 **创建 Secret** 按钮,可显示 Secret 的创建界面,如下图所示:
- 
-
-
-* 点击 **创建** 按钮,可显示 Secret 的创建界面,如下图所示:
-
- 
+ 
* 可以创建的 Secret 类型有:
* docker 仓库密码
* Opaque (可自定义 key / value)
* TLS (可存放 HTTPS 证书等)
* 可以显示的 Secret 类型有:
- * Service Account Token
- * Bootstrap Token - 通常由系统创建
+ * Service Account Token (通常由系统创建)
+ * Bootstrap Token (通常由系统创建)
diff --git a/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20191002145325899.png b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20191002145325899.png
deleted file mode 100644
index fc3c549..0000000
Binary files a/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20191002145325899.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20191002145717667.png b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20191002145717667.png
deleted file mode 100644
index 72e71a7..0000000
Binary files a/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20191002145717667.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20210404221520087.png b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20210404221520087.png
new file mode 100644
index 0000000..de4f3f0
Binary files /dev/null and b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20210404221520087.png differ
diff --git a/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20210404221803476.png b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20210404221803476.png
new file mode 100644
index 0000000..063edec
Binary files /dev/null and b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20210404221803476.png differ
diff --git a/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20210404221914897.png b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20210404221914897.png
new file mode 100644
index 0000000..16f376c
Binary files /dev/null and b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.assets/image-20210404221914897.png differ
diff --git a/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.md b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.md
index 2f2c61c..6e3bc32 100644
--- a/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.md
+++ b/learning/k8s-intermediate/config/secrets/use-case-ingress-tls.md
@@ -21,15 +21,13 @@ meta:
## 创建Secret
-* 在 Kuboard 界面中进入名称空间页,点击 **Secrets 创建** 按钮
-
- 填写表单,如下图所示:
+* 在 Kuboard 界面中进入 ***配置中心*** / ***密 文*** ,点击 ***创建 Secret*** 按钮,填写表单,如下图所示:
* 选择类型为 TLS
* 将 .key 文件中的内容填入 tls.key 字段
* 将 .pem 文件中的内容填入 tls.crt 字段
-
- 
+
+ 
* 点击 **保存** 按钮
@@ -37,11 +35,14 @@ meta:
* 在 Kuboard 界面中,点击要激活 HTTPS 的工作负载,进入编辑页面,如下图所示:
- 在 **互联网入口 Ingress** 区域,勾选 HTTPS,并选择刚才创建好的 Secret
+ 在 **应用路由** 区域,勾选 HTTPS,并选择刚才创建好的 Secret
- 
+ 
+
+ 
* 点击 **保存** 按钮
+
* 在浏览器打开对应的域名,验证 HTTPS 是否生效
::: tip
diff --git a/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.assets/image-20191130215407308.png b/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.assets/image-20191130215407308.png
deleted file mode 100644
index c66ea87..0000000
Binary files a/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.assets/image-20191130215407308.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.assets/image-20191130215717584.png b/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.assets/image-20191130215717584.png
deleted file mode 100644
index 0d50ce3..0000000
Binary files a/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.assets/image-20191130215717584.png and /dev/null differ
diff --git a/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.assets/image-20210404211633381.png b/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.assets/image-20210404211633381.png
new file mode 100644
index 0000000..c497474
Binary files /dev/null and b/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.assets/image-20210404211633381.png differ
diff --git a/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.md b/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.md
index 61a9163..466bd1f 100644
--- a/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.md
+++ b/learning/k8s-intermediate/config/taints-toleration/kuboard-toleration.md
@@ -12,15 +12,11 @@ meta:
-> Kuboard v-1.0.5-beta.3 中增加了容忍的功能
+> 下面的截图基于 `Kuboard v3.1.1.0`
-在 Kubobard 工作负载编辑界面中点击 ***容器组的更多设定*** 按钮(下图左下角),
+在 Kubobard 工作负载编辑界面中切换到 ***高级设置*** 标签页,可为工作负载设置容忍,如下图所示:
-
-
-可为工作负载设置容忍,如下图所示:
-
-
+
diff --git a/learning/k8s-intermediate/persistent/nfs.assets/image-20191003183534076.png b/learning/k8s-intermediate/persistent/nfs.assets/image-20191003183534076.png
deleted file mode 100644
index 31d2330..0000000
Binary files a/learning/k8s-intermediate/persistent/nfs.assets/image-20191003183534076.png and /dev/null differ
diff --git a/learning/k8s-intermediate/persistent/nfs.assets/image-20210404194644944.png b/learning/k8s-intermediate/persistent/nfs.assets/image-20210404194644944.png
new file mode 100644
index 0000000..f8bd4d7
Binary files /dev/null and b/learning/k8s-intermediate/persistent/nfs.assets/image-20210404194644944.png differ
diff --git a/learning/k8s-intermediate/persistent/nfs.md b/learning/k8s-intermediate/persistent/nfs.md
index 22c0b16..1b90116 100644
--- a/learning/k8s-intermediate/persistent/nfs.md
+++ b/learning/k8s-intermediate/persistent/nfs.md
@@ -103,7 +103,7 @@ Kubernetes 对 Pod 进行调度时,以当时集群中各节点的可用资源
| NFS Server | 172.17.216.82 | 请使用您自己的NFS服务的IP地址 |
| NFS Path | /root/nfs_root | 请使用您自己的NFS服务所共享的路径 |
- 
+ 
* 在场景中使用存储类
diff --git a/learning/k8s-intermediate/persistent/pv.assets/image-20200913194907655.png b/learning/k8s-intermediate/persistent/pv.assets/image-20200913194907655.png
deleted file mode 100644
index 036a47e..0000000
Binary files a/learning/k8s-intermediate/persistent/pv.assets/image-20200913194907655.png and /dev/null differ
diff --git a/learning/k8s-intermediate/persistent/pv.assets/image-20200913195026464.png b/learning/k8s-intermediate/persistent/pv.assets/image-20200913195026464.png
deleted file mode 100644
index ea2a041..0000000
Binary files a/learning/k8s-intermediate/persistent/pv.assets/image-20200913195026464.png and /dev/null differ
diff --git a/learning/k8s-intermediate/persistent/pv.assets/image-20200913195201062.png b/learning/k8s-intermediate/persistent/pv.assets/image-20200913195201062.png
deleted file mode 100644
index 7bad7cd..0000000
Binary files a/learning/k8s-intermediate/persistent/pv.assets/image-20200913195201062.png and /dev/null differ
diff --git a/learning/k8s-intermediate/persistent/pv.assets/image-20210404180415333.png b/learning/k8s-intermediate/persistent/pv.assets/image-20210404180415333.png
new file mode 100644
index 0000000..259db76
Binary files /dev/null and b/learning/k8s-intermediate/persistent/pv.assets/image-20210404180415333.png differ
diff --git a/learning/k8s-intermediate/persistent/pv.assets/image-20210404180516539.png b/learning/k8s-intermediate/persistent/pv.assets/image-20210404180516539.png
new file mode 100644
index 0000000..2653b2b
Binary files /dev/null and b/learning/k8s-intermediate/persistent/pv.assets/image-20210404180516539.png differ
diff --git a/learning/k8s-intermediate/persistent/pv.assets/image-20210404180628506.png b/learning/k8s-intermediate/persistent/pv.assets/image-20210404180628506.png
new file mode 100644
index 0000000..fced142
Binary files /dev/null and b/learning/k8s-intermediate/persistent/pv.assets/image-20210404180628506.png differ
diff --git a/learning/k8s-intermediate/persistent/pv.md b/learning/k8s-intermediate/persistent/pv.md
index 591bbc2..e092cad 100644
--- a/learning/k8s-intermediate/persistent/pv.md
+++ b/learning/k8s-intermediate/persistent/pv.md
@@ -167,7 +167,7 @@ Kubernetes 支持 20 种存储卷类型(可参考 [Types of Persistent Volumes
在 Kuboard 中查看 PersistentVolume 的界面如下图所示:
-
+
PersistentVolume 字段描述如下表所示:
@@ -187,7 +187,7 @@ PersistentVolume 字段描述如下表所示:
在 Kuboard 中查看存储卷声明的界面如下图所示:
-
+
| 字段名称 | 可选项/备注 |
| --------------------- | ------------------------------------------------------------ |
@@ -202,4 +202,4 @@ PersistentVolume 字段描述如下表所示:
在您完成存储卷声明的定义后,您可以在 Kuboard 工作复杂编辑器的 ***数据卷 Volume*** 区域引用该存储卷声明,如下图所示:
-
+
\ No newline at end of file
diff --git a/learning/k8s-intermediate/persistent/storage-class.assets/image-20200913194251730.png b/learning/k8s-intermediate/persistent/storage-class.assets/image-20200913194251730.png
deleted file mode 100644
index 6bd4b96..0000000
Binary files a/learning/k8s-intermediate/persistent/storage-class.assets/image-20200913194251730.png and /dev/null differ
diff --git a/learning/k8s-intermediate/persistent/storage-class.assets/image-20210404180855976.png b/learning/k8s-intermediate/persistent/storage-class.assets/image-20210404180855976.png
new file mode 100644
index 0000000..21ff1b8
Binary files /dev/null and b/learning/k8s-intermediate/persistent/storage-class.assets/image-20210404180855976.png differ
diff --git a/learning/k8s-intermediate/persistent/storage-class.md b/learning/k8s-intermediate/persistent/storage-class.md
index d3c44d9..27b4550 100644
--- a/learning/k8s-intermediate/persistent/storage-class.md
+++ b/learning/k8s-intermediate/persistent/storage-class.md
@@ -47,7 +47,7 @@ Kuboard 支持的存储类的种类如下:
在 Kuboard 中查看存储类,如下图所示:
-
+
diff --git a/learning/k8s-intermediate/persistent/volume-mount-point.assets/image-20200101173914313.png b/learning/k8s-intermediate/persistent/volume-mount-point.assets/image-20200101173914313.png
deleted file mode 100644
index 439d03b..0000000
Binary files a/learning/k8s-intermediate/persistent/volume-mount-point.assets/image-20200101173914313.png and /dev/null differ
diff --git a/learning/k8s-intermediate/persistent/volume-mount-point.assets/image-20210404194435754.png b/learning/k8s-intermediate/persistent/volume-mount-point.assets/image-20210404194435754.png
new file mode 100644
index 0000000..c8dde21
Binary files /dev/null and b/learning/k8s-intermediate/persistent/volume-mount-point.assets/image-20210404194435754.png differ
diff --git a/learning/k8s-intermediate/persistent/volume-mount-point.md b/learning/k8s-intermediate/persistent/volume-mount-point.md
index c09273c..2e38bd0 100644
--- a/learning/k8s-intermediate/persistent/volume-mount-point.md
+++ b/learning/k8s-intermediate/persistent/volume-mount-point.md
@@ -60,9 +60,9 @@ spec:
同一个 volumeMounts 中 `subPath` 字段和 `subPathExpr` 字段不能同时使用。
-> 在Kuboard界面中,如果工作负载编辑器中挂载点的 subPath/subPathExpr 字段中包含 `$`,则 Kuboard 认为该字段为 subPathExpr,否则被认为是 subPath。例如,下图中的 $(podName) 将被认为是 subPathExpr :
Kuboard v1.0.6-beta.1
+> 在Kuboard界面中,如果工作负载编辑器中挂载点的 subPath/subPathExpr 字段中包含 `$`,则 Kuboard 认为该字段为 subPathExpr,否则被认为是 subPath。例如,下图中的 $(podName) 将被认为是 subPathExpr :
Kuboard v3.1.1.0
>
-> 
+> 
如下面的例子,该 Pod 使用 `subPathExpr` 在 hostPath 数据卷 `/var/log/pods` 中创建了一个目录 `pod1`(该参数来自于Pod的名字)。此时,宿主机目录 `/var/log/pods/pod1` 挂载到了容器的 `/logs` 路径:
diff --git a/learning/k8s-intermediate/persistent/volume.assets/image-20190904194501941.png b/learning/k8s-intermediate/persistent/volume.assets/image-20190904194501941.png
deleted file mode 100644
index 44dcf6c..0000000
Binary files a/learning/k8s-intermediate/persistent/volume.assets/image-20190904194501941.png and /dev/null differ
diff --git a/learning/k8s-intermediate/persistent/volume.assets/image-20210404180050704.png b/learning/k8s-intermediate/persistent/volume.assets/image-20210404180050704.png
new file mode 100644
index 0000000..0f0c0ee
Binary files /dev/null and b/learning/k8s-intermediate/persistent/volume.assets/image-20210404180050704.png differ
diff --git a/learning/k8s-intermediate/persistent/volume.md b/learning/k8s-intermediate/persistent/volume.md
index 714fc1a..9c14583 100644
--- a/learning/k8s-intermediate/persistent/volume.md
+++ b/learning/k8s-intermediate/persistent/volume.md
@@ -60,7 +60,9 @@ Docker 里同样也存在一个 volume(数据卷)的概念,但是 docker
:::
-
+
+
+
## 数据卷的类型
diff --git a/learning/k8s-intermediate/private-registry.assets/image-20190923164105388.png b/learning/k8s-intermediate/private-registry.assets/image-20190923164105388.png
deleted file mode 100644
index f488de4..0000000
Binary files a/learning/k8s-intermediate/private-registry.assets/image-20190923164105388.png and /dev/null differ
diff --git a/learning/k8s-intermediate/private-registry.assets/image-20190923164229519.png b/learning/k8s-intermediate/private-registry.assets/image-20190923164229519.png
deleted file mode 100644
index efb91d9..0000000
Binary files a/learning/k8s-intermediate/private-registry.assets/image-20190923164229519.png and /dev/null differ
diff --git a/learning/k8s-intermediate/private-registry.assets/image-20210404220002414.png b/learning/k8s-intermediate/private-registry.assets/image-20210404220002414.png
new file mode 100644
index 0000000..145b553
Binary files /dev/null and b/learning/k8s-intermediate/private-registry.assets/image-20210404220002414.png differ
diff --git a/learning/k8s-intermediate/private-registry.assets/image-20210404220248314.png b/learning/k8s-intermediate/private-registry.assets/image-20210404220248314.png
new file mode 100644
index 0000000..a3fe67c
Binary files /dev/null and b/learning/k8s-intermediate/private-registry.assets/image-20210404220248314.png differ
diff --git a/learning/k8s-intermediate/private-registry.assets/image-20210404220355442.png b/learning/k8s-intermediate/private-registry.assets/image-20210404220355442.png
new file mode 100644
index 0000000..aba8d34
Binary files /dev/null and b/learning/k8s-intermediate/private-registry.assets/image-20210404220355442.png differ
diff --git a/learning/k8s-intermediate/private-registry.assets/image-20210404220517307.png b/learning/k8s-intermediate/private-registry.assets/image-20210404220517307.png
new file mode 100644
index 0000000..d4ebe48
Binary files /dev/null and b/learning/k8s-intermediate/private-registry.assets/image-20210404220517307.png differ
diff --git a/learning/k8s-intermediate/private-registry.assets/image-20210404220855655.png b/learning/k8s-intermediate/private-registry.assets/image-20210404220855655.png
new file mode 100644
index 0000000..ba18834
Binary files /dev/null and b/learning/k8s-intermediate/private-registry.assets/image-20210404220855655.png differ
diff --git a/learning/k8s-intermediate/private-registry.md b/learning/k8s-intermediate/private-registry.md
index 7e1418c..0b3bc14 100644
--- a/learning/k8s-intermediate/private-registry.md
+++ b/learning/k8s-intermediate/private-registry.md
@@ -49,59 +49,49 @@ docker pull my-registry.example.com:5000/example/web-example:v1.0.1
:::
-## 配置 Secrets
-
-* 打开 Kuboard 界面
-
-* 进入您要工作的 **名称空间** 界面
-
-* 点击 ***Secrets*** --> ***创建*** 按钮
-
- 填写表单:
-
- | 字段名称 | 填写内容 | 备注 |
- | --------------- | ---------------------------- | ---------------------------- |
- | 名称 | my-registry-secret | 可以使用便于您自己记忆的名字 |
- | 类型 | docker仓库密码 | |
- | docker server | my-registry.example.com:5000 | |
- | docker username | myusername | |
- | docker password | mypassword | |
-
- 如下图所示
-
- 
-
-
-* 点击 **保存** 按钮
-
## 创建工作负载
* 此处省略创建工作负载的详细描述,请参考 [部署 busybox](/guide/example/busybox.html)
-* 如果要使用私有 registry 中的 docker 镜像,请正确填写如下两个字段:
+* 在 ***容器信息*** 标签页,为容器选择镜像仓库类型为 `docker private`,如下图所示:
- * **Docker仓库的用户名密码**:请选择刚才创建的 `my-registry-secret`
+ 
- * **镜像**:请填写 `my-registry.example.com:5000/example/web-example:v1.0.1`
+* 点击图中的创建镜像仓库密码,如下图所示:
- 该字段由如下几个部分组成:
+ 
-
my-registry.example.com:
5000/
example/
web-example:
v1.0.1
-
- * 蓝色部分:registry 地址
- * 绿色部分:registry 端口
- * 紫色部分:repository 名字
- * 红色部分:image 名字
- * 棕色部分:image 标签
+ 填写表单:
-
+ | 字段名称 | 填写内容 | 备注 |
+ | --------------- | ---------------------------- | ---------------------------- |
+ | 名称 | my-registry-secret | 可以使用便于您自己记忆的名字 |
+ | 类型 | docker仓库密码 | |
+ | docker server | my-registry.example.com:5000 | |
+ | docker username | myusername | |
+ | docker password | mypassword | |
+
+
+
+* 在上图中点击保存后,选择刚创建的 ***Secret*** ,如下图所示:
+
+ 
+
+* 填写镜像的 ***路径*** 以及 ***标签***,如下图所示:
+
+ 
+
+
::: tip
* 工作负载只能引用同名称空间下的 Secrets
-* 如果你想使用 hub.docker.com 上的私有 repository,您在填写 ***镜像*** 这个字段时,只要省略 ***registry 地址*** 和 ***registry 端口*** 这两部分即可
+
+* 可以在 ***配置中心*** / ***密 文*** 菜单中管理已经创建的 ***Secret*** 列表,如下图所示:
+
+ 
:::
diff --git a/learning/k8s-intermediate/service/ingress.assets/image-20190910225225179.png b/learning/k8s-intermediate/service/ingress.assets/image-20190910225225179.png
deleted file mode 100644
index 0f29dba..0000000
Binary files a/learning/k8s-intermediate/service/ingress.assets/image-20190910225225179.png and /dev/null differ
diff --git a/learning/k8s-intermediate/service/ingress.assets/image-20210404192614291.png b/learning/k8s-intermediate/service/ingress.assets/image-20210404192614291.png
new file mode 100644
index 0000000..055264c
Binary files /dev/null and b/learning/k8s-intermediate/service/ingress.assets/image-20210404192614291.png differ
diff --git a/learning/k8s-intermediate/service/ingress.assets/image-20210404193105147.png b/learning/k8s-intermediate/service/ingress.assets/image-20210404193105147.png
new file mode 100644
index 0000000..6a1bfb0
Binary files /dev/null and b/learning/k8s-intermediate/service/ingress.assets/image-20210404193105147.png differ
diff --git a/learning/k8s-intermediate/service/ingress.assets/image-20210404193435776.png b/learning/k8s-intermediate/service/ingress.assets/image-20210404193435776.png
new file mode 100644
index 0000000..53e0e49
Binary files /dev/null and b/learning/k8s-intermediate/service/ingress.assets/image-20210404193435776.png differ
diff --git a/learning/k8s-intermediate/service/ingress.md b/learning/k8s-intermediate/service/ingress.md
index 698e451..ab0f4f2 100644
--- a/learning/k8s-intermediate/service/ingress.md
+++ b/learning/k8s-intermediate/service/ingress.md
@@ -134,7 +134,7 @@ spec:
-
+
**创建文件 nginx-deployment.yaml**
``` sh
@@ -239,9 +239,11 @@ curl a.demo.kuboard.cn
```
-
+
-* 在 default 名称空间 点击 ***创建工作负载***
+* 在 default 名称空间 点击左侧菜单栏中的 ***创建工作负载***,如下图所示:
+
+ 
填写表单如下:
@@ -252,18 +254,34 @@ curl a.demo.kuboard.cn
| 服务名称 | web-nginx | |
| 服务描述 | nginx部署 | |
| 副本数量 | 1 | 可以填写其他正整数 |
- | 工作容器 | 容器名称:nginx
镜像:nginx:1.7.9
抓取策略:Always | |
- | 访问方式 | NodePort(VPC内访问)
协议: TCP,服务端口: 80,节点端口: 32601,容器端口: 80 | 访问方式对应 Kubernetes Service对象,
工作负载编辑器为其使用与 Deployment 相同的名字 web-nginx |
- | 互联网入口 | 域名: a.demo.kuboard.cn
映射URL: /
服务端口:80 | 互联网入口对应 Kubernetes Ingress对象,
工作负载编辑器为其使用与 Deployment 相同的名字 web-nginx |
+
+* 切换到 ***容器信息*** Tab 页,如下图所示:
+
+ 
+
+ 填写表单如下:
+
+ | 字段名称 | 填写内容 | 备注 |
+ | -------- | ----------- | ---- |
+ | 容器名称 | nginx | |
+ | 镜像 | nginx:1.7.9 | |
+ | 抓取策略 | Always | |
+
+* 切换到 ***服务/应用路由*** Tab 页,如下图所示:
+
+ 
+
+ 填写表单如下:
+
+ | 字段名称 | 填写内容 | 备注 |
+ | -------- | ------------------------------------------------------------ | ------------------------------------------------------------ |
+ | 服务 | NodePort(VPC内访问)
协议: TCP,port: 80,nodePort: 32601,targetPort: 80 | 服务对应 Kubernetes Service对象,
工作负载编辑器为其使用与 Deployment 相同的名字 web-nginx |
+ | 应用路由 | 域名: a.demo.kuboard.cn
映射URL: /
服务端口:80 | 应用路由对应 Kubernetes Ingress对象,
工作负载编辑器为其使用与 Deployment 相同的名字 web-nginx |
-* **如下图所示:**
-
-
-
::: tip
-Kuboard 工作负载编辑器将 kubernetes 中三个主要对象 Deployment/Service/Ingress 放在同一个编辑器界面中处理。
+Kuboard 工作负载编辑器假设 kubernetes 中三个主要对象 Deployment/Service/Ingress 名称相同,并放在同一个编辑器界面中处理。
:::
* 点击 **保存**
diff --git a/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20191013204426338.png b/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20191013204426338.png
deleted file mode 100644
index f0c0815..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20191013204426338.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20210404191658446.png b/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20210404191658446.png
new file mode 100644
index 0000000..61662f1
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20210404191658446.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20210404191758533.png b/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20210404191758533.png
new file mode 100644
index 0000000..ec101c9
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20210404191758533.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20210404192020345.png b/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20210404192020345.png
new file mode 100644
index 0000000..c729e9b
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/canary.assets/image-20210404192020345.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/canary.md b/learning/k8s-intermediate/workload/wl-deployment/canary.md
index 6bbfe0a..5727bd3 100644
--- a/learning/k8s-intermediate/workload/wl-deployment/canary.md
+++ b/learning/k8s-intermediate/workload/wl-deployment/canary.md
@@ -98,14 +98,22 @@ meta:
-在 Kuboard 执行金丝雀发布的过程,与使用 kubectl 的过程相同,此处特别说明的一点是,当使用 Kuboard 创建 `web-nginx-canary` Deployment时,如何解决其Pod 的标签被 `web-nginx` 的Service包含的问题:
+在 Kuboard 执行金丝雀发布的过程,与使用 kubectl 的过程相同,此处特别说明的一点是,当使用 Kuboard 创建 `web-nginx-canary` Deployment时,可以在原工作负载上点击 ***复制*** 按钮,如下图所示:
+
+
+
+在弹出对话框的 ***名称*** 字段中填写 `web-nginx-canary`,如下图所示:
+
+
+
+如何解决其Pod 的标签被 `web-nginx` 的Service包含的问题:
* 当填写部署的名称 `web-nginx-canary` 之后,将默认创建两个标签,且不可修改:`k8s.eip.work/layer:web` 和 `k8s.eip.work/name:web-nginx-canary`
* 此时,手工创建标签 `k8s.eip.work/name:web-nginx`,可以覆盖原默认创建的标签
* 完成创建后,`web-nginx-canary` 的 Pod 也包含标签 `k8s.eip.work/layer:web` 和 `k8s.eip.work/name:web-nginx`,可以被 `web-nginx` 的Service选中
* 通过 Kuboard 创建 `web-nginx-canary` 部署时,无需配置 Service 和 Ingress
-
+
diff --git a/learning/k8s-intermediate/workload/wl-deployment/cleanup.assets/image-20210404191001116.png b/learning/k8s-intermediate/workload/wl-deployment/cleanup.assets/image-20210404191001116.png
new file mode 100644
index 0000000..4906cc4
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/cleanup.assets/image-20210404191001116.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/cleanup.assets/image-20210404191039298.png b/learning/k8s-intermediate/workload/wl-deployment/cleanup.assets/image-20210404191039298.png
new file mode 100644
index 0000000..ecd93a2
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/cleanup.assets/image-20210404191039298.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/cleanup.md b/learning/k8s-intermediate/workload/wl-deployment/cleanup.md
index e6835f8..f1d95fd 100644
--- a/learning/k8s-intermediate/workload/wl-deployment/cleanup.md
+++ b/learning/k8s-intermediate/workload/wl-deployment/cleanup.md
@@ -21,7 +21,9 @@ meta:
Kuboard 中,可以通过如下界面调整 `.spec.revisionHistoryLimit` 字段,如下所示:
-
+
+
+
diff --git a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315103300026.png b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315103300026.png
deleted file mode 100644
index bf7d763..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315103300026.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315103827631.png b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315103827631.png
deleted file mode 100644
index f744f35..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315103827631.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315105410219.png b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315105410219.png
deleted file mode 100644
index abedd32..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315105410219.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315110103544.png b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315110103544.png
deleted file mode 100644
index b7bc33c..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20200315110103544.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20210404181251603.png b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20210404181251603.png
new file mode 100644
index 0000000..c65669c
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20210404181251603.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20210404181616368.png b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20210404181616368.png
new file mode 100644
index 0000000..3ddd0b4
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20210404181616368.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20210404181829648.png b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20210404181829648.png
new file mode 100644
index 0000000..9ff5be0
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/create.assets/image-20210404181829648.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/create.md b/learning/k8s-intermediate/workload/wl-deployment/create.md
index be0e52a..5dc5708 100644
--- a/learning/k8s-intermediate/workload/wl-deployment/create.md
+++ b/learning/k8s-intermediate/workload/wl-deployment/create.md
@@ -139,13 +139,11 @@ pod-template-hash 标签是 Deployment 创建 ReplicaSet 时添加到 ReplicaSet
-1. 进入 Kuboard 名称空间页面,并点击页头上的 ***创建工作负载*** 按钮;
+1. 进入 Kuboard 名称空间页面,点击左侧菜单中的 ***创建工作负载*** 按钮;
- 截图如下所示:
+ 
- 
-
-2. 在工作负载创建页面填写表单如下:
+ 并填写如下表单:
| 区域 | 字段名称 | 填写内容 | 字段说明 |
| ----------------- | -------- | ------------ | ------------------------------------------------------------ |
@@ -153,27 +151,28 @@ pod-template-hash 标签是 Deployment 创建 ReplicaSet 时添加到 ReplicaSet
| | 服务分层 | 展现层 | Kuboard 特性的字段,用于表示该工作复杂显示在名称空间的哪一个分层 |
| | 服务名称 | web-nginx | |
| | 副本数量 | 3 | |
- | 容器组-->工作容器 | 容器名称 | nginx | |
- | | 镜像 | nginx:1.7.9 | |
- | | Ports | TCP : 80 | 容器组暴露的端口 |
- 截图如下图所示:
+
- 
+2. 切换到 ***容器信息*** Tab 页,如下图所示:
+
+ 
+
+ 并填写如下表单:
+
+ | 区域 | 字段名称 | 填写内容 | 字段说明 |
+ | ----------------------- | -------- | ------------ | ---------------- |
+ | 容器信息-->添加工作容器 | 容器名称 | nginx | |
+ | | 镜像 | nginx:1.7.9 | |
+ | | Ports | TCP : 80 | 容器组暴露的端口 |
3. 点击保存后,可以看到 Deployment 的更新界面,如下图所示:
-
+
Kuboard 在界面中显示了 ReplicaSets、Pods 的动态变化过程。
- > 显示 ReplicaSets 的特性要求 Kuboard 版本不低于 v1.0.8
-
-
-
- 
-
- 
+ 
4. 对于每一个 Pod,Kuboard 提供了如下几个功能可以便捷的与容器内应用进行交互:
diff --git a/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20200315161430483.png b/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20200315161430483.png
deleted file mode 100644
index b1bdb99..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20200315161430483.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20200315161646155.png b/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20200315161646155.png
deleted file mode 100644
index 6223ed4..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20200315161646155.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20200315162152085.png b/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20200315162152085.png
deleted file mode 100644
index 0c69fdd..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20200315162152085.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20210404185743940.png b/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20210404185743940.png
new file mode 100644
index 0000000..3ccdafc
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20210404185743940.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20210404185840034.png b/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20210404185840034.png
new file mode 100644
index 0000000..33777cf
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20210404185840034.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20210404190223597.png b/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20210404190223597.png
new file mode 100644
index 0000000..c643803
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/pause.assets/image-20210404190223597.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/pause.md b/learning/k8s-intermediate/workload/wl-deployment/pause.md
index f7908bf..d57351a 100644
--- a/learning/k8s-intermediate/workload/wl-deployment/pause.md
+++ b/learning/k8s-intermediate/workload/wl-deployment/pause.md
@@ -111,19 +111,19 @@ meta:
-* 在 Deployment 详情页中点击 ***处理状态*** 的开关,可以暂停 Deployment 处理,修改后如下图所示:
+* 在 Deployment 详情页中点击 ***暂停更新*** 的开关,可以暂停 Deployment 处理,修改后如下图所示:
- 
+ 
* 点击 ***调整镜像标签*** 按钮,设置新版本为 `1.15.8`,如下图所示:
保存后,可以看到 Deployment 中已经将容器镜像版本修改为 `nginx:1.15.8`,然而,Deployment 控制器此时并未执行滚动更新的过程,因为 Deployment 的处理已经被暂停。
- 
+ 
-* 点击 ***处理状态*** 的开关,将其设定为 `已继续`,Deployment 将立刻开始执行滚动更新,最终结果如下图所示:
+* 点击 ***继续更新*** 的开关,Deployment 将立刻开始执行滚动更新,如下图所示:
- 
+ 
@@ -131,5 +131,4 @@ meta:
-
-[返回 Deployment](./#deployment-概述)
+[返回 Deployment](./#deployment-概述)
\ No newline at end of file
diff --git a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315114441313.png b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315114441313.png
deleted file mode 100644
index 19ac23c..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315114441313.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315114807304.png b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315114807304.png
deleted file mode 100644
index 3aa8066..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315114807304.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315115222693.png b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315115222693.png
deleted file mode 100644
index a4db2de..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315115222693.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315115224518.png b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315115224518.png
deleted file mode 100644
index a4db2de..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20200315115224518.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20210404183613285.png b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20210404183613285.png
new file mode 100644
index 0000000..95af7d2
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20210404183613285.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20210404183808138.png b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20210404183808138.png
new file mode 100644
index 0000000..ce9f703
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20210404183808138.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20210404183911945.png b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20210404183911945.png
new file mode 100644
index 0000000..187177e
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/rollback.assets/image-20210404183911945.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/rollback.md b/learning/k8s-intermediate/workload/wl-deployment/rollback.md
index fa9d9d4..30a60e4 100644
--- a/learning/k8s-intermediate/workload/wl-deployment/rollback.md
+++ b/learning/k8s-intermediate/workload/wl-deployment/rollback.md
@@ -230,21 +230,21 @@ meta:
* 假设您更新 Deployment 的时候,犯了一个拼写错误,将 `1.9.1` 写成了 `1.91`,如下图所示:
- 
+ 
* 该更新将卡住,新的副本集中的 Pod 将因为抓取不到镜像而不能启动,并陷入不断抓取镜像的死循环当中,如下图所示:
- 
+ 
## 检查 Deployment 的更新历史,并回滚
-* 上图中,显示了该 Deployment 有三个副本集,分别对应 Deployment 的版本 `1`、`2`、`3`。点击某一个副本集上的 ***回滚*** 按钮,Kuboard 将为您对比两个版本之间的差异,如下图所示:
+* 上图中,显示了该 Deployment 有三个副本集,分别对应 Deployment 的版本 `1`、`2`、`3`。点击某一个副本集上的 ***回滚到*** 按钮,Kuboard 将为您对比两个版本之间的差异,如下图所示:
- 
+ 
-* 点击 **确认回滚** 按钮,将回滚到选定的版本
+* 点击 **确认** 按钮,将回滚到选定的版本
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315133044513.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315133044513.png
deleted file mode 100644
index e772847..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315133044513.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315135123901.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315135123901.png
deleted file mode 100644
index ef4f406..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315135123901.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315135701001.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315135701001.png
deleted file mode 100644
index 6d20877..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315135701001.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315135949626.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315135949626.png
deleted file mode 100644
index 922729e..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315135949626.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315140245614.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315140245614.png
deleted file mode 100644
index 4b47295..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315140245614.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315140447782.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315140447782.png
deleted file mode 100644
index e24d307..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315140447782.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315140740451.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315140740451.png
deleted file mode 100644
index 5631204..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20200315140740451.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184116094.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184116094.png
new file mode 100644
index 0000000..95a68d7
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184116094.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184525753.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184525753.png
new file mode 100644
index 0000000..e4fa65b
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184525753.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184712639.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184712639.png
new file mode 100644
index 0000000..dd3cf56
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184712639.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184759213.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184759213.png
new file mode 100644
index 0000000..6e6d90c
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184759213.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184920104.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184920104.png
new file mode 100644
index 0000000..c32063c
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404184920104.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404185157096.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404185157096.png
new file mode 100644
index 0000000..5b31d67
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404185157096.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404185426429.png b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404185426429.png
new file mode 100644
index 0000000..0a8abaa
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/scale.assets/image-20210404185426429.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/scale.md b/learning/k8s-intermediate/workload/wl-deployment/scale.md
index e3e908b..4f949a8 100644
--- a/learning/k8s-intermediate/workload/wl-deployment/scale.md
+++ b/learning/k8s-intermediate/workload/wl-deployment/scale.md
@@ -93,11 +93,9 @@ meta:
## 执行伸缩
-* 在 Deployment 详情页面,点击 ***伸缩*** 按钮,调整副本数并保存,如下图所示:
+* 在 Deployment 详情页面,点击下图中 `向左箭头` 或 `向右箭头` 即可完成对 Deployment 的伸缩操作;
- 即可完成对 Deployment 的伸缩操作;
-
- 
+ 
* `kubectl autoscale` 指令可以执行对 Deployment 的自动伸缩,目前 Kuboard 界面还不支持此操作。
@@ -119,29 +117,29 @@ meta:
修改后保存。
- 
+ 
* 确认当前 10 个副本正在运行,如下图所示:
- 
+ 
* 点击 ***调整镜像标签*** 按钮,将容器镜像更新到一个不存在的标签,例如 `sometag`,如下图所示:
- 
+ 
* 此时,Deployment 将新建一个副本集,并且其期望的副本数为 `5`,原来的副本集的期望副本数被调整为 `8`,如下图所示:
由于新副本集中的 Pod 不能获取到镜像,因此滚动更新将卡在这个位置。
- 
+ 
* 点击 ***伸缩*** 按钮,将期望副本数调整为 `15`,如下图所示:
- 
+ 
-* 此时,由于比原来期望的副本数增加了 5,新增副本数将按比例增加到新、旧两个副本集,最终结果如下图所示:
+* 此时,由于比原来期望的副本数增加了 5,新增副本数将增加到旧副本集,最终结果如下图所示:(不同 Kubernetes 版本中,行为并不完全一致,比如,某些版本中,会将新增副本数按比例增加到新、旧副本集中,而截图中使用 Kubernetes v1.18,将所有新增副本数都增加到了旧副本集)
- 
+ 
diff --git a/learning/k8s-intermediate/workload/wl-deployment/status.assets/image-20200315163007630.png b/learning/k8s-intermediate/workload/wl-deployment/status.assets/image-20200315163007630.png
deleted file mode 100644
index 298a02d..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/status.assets/image-20200315163007630.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/status.assets/image-20210404190424295.png b/learning/k8s-intermediate/workload/wl-deployment/status.assets/image-20210404190424295.png
new file mode 100644
index 0000000..a7b55b0
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/status.assets/image-20210404190424295.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/status.md b/learning/k8s-intermediate/workload/wl-deployment/status.md
index f6146e8..4adbfaf 100644
--- a/learning/k8s-intermediate/workload/wl-deployment/status.md
+++ b/learning/k8s-intermediate/workload/wl-deployment/status.md
@@ -20,7 +20,7 @@ Deployment 的生命周期中,将会进入不同的状态,这些状态可能
-
+
Progressing 状态
@@ -162,13 +162,13 @@ $ echo $?
* 暂停(pause)Deployment,以对 Deployment 的 Pod template 执行多处更新
-
+
在前面的处理中,您已经熟悉了 Kuboard 界面中如何管理 Deployment 的滚动更新过程。此外,还有少许 Deployment 的状态信息显示在运行时信息这个区块,如下图所示:
> 您也可以直接查看 Deployment 的 YAML 内容。
-
+
diff --git a/learning/k8s-intermediate/workload/wl-deployment/strategy.assets/image-20200315163608635.png b/learning/k8s-intermediate/workload/wl-deployment/strategy.assets/image-20200315163608635.png
deleted file mode 100644
index f20c416..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/strategy.assets/image-20200315163608635.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/strategy.assets/image-20210404191259449.png b/learning/k8s-intermediate/workload/wl-deployment/strategy.assets/image-20210404191259449.png
new file mode 100644
index 0000000..153ffef
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/strategy.assets/image-20210404191259449.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/strategy.md b/learning/k8s-intermediate/workload/wl-deployment/strategy.md
index ac7b636..0c9fa4f 100644
--- a/learning/k8s-intermediate/workload/wl-deployment/strategy.md
+++ b/learning/k8s-intermediate/workload/wl-deployment/strategy.md
@@ -17,7 +17,7 @@ meta:
Kuboard 中,可以通过如下界面编辑部署策略。
-
+
其中字段的含义如下:
diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315111231323.png b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315111231323.png
deleted file mode 100644
index 5c2dc55..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315111231323.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315111509644.png b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315111509644.png
deleted file mode 100644
index c4ab083..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315111509644.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315111838761.png b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315111838761.png
deleted file mode 100644
index 7d183ef..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315111838761.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315113204869.png b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315113204869.png
deleted file mode 100644
index 810b125..0000000
Binary files a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20200315113204869.png and /dev/null differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404182058429.png b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404182058429.png
new file mode 100644
index 0000000..ff7f4ad
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404182058429.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404182203934.png b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404182203934.png
new file mode 100644
index 0000000..7a9857c
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404182203934.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404182350539.png b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404182350539.png
new file mode 100644
index 0000000..844e306
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404182350539.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404183433437.png b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404183433437.png
new file mode 100644
index 0000000..7a83ecf
Binary files /dev/null and b/learning/k8s-intermediate/workload/wl-deployment/update.assets/image-20210404183433437.png differ
diff --git a/learning/k8s-intermediate/workload/wl-deployment/update.md b/learning/k8s-intermediate/workload/wl-deployment/update.md
index 0138380..2eed62b 100644
--- a/learning/k8s-intermediate/workload/wl-deployment/update.md
+++ b/learning/k8s-intermediate/workload/wl-deployment/update.md
@@ -151,13 +151,13 @@ meta:
1. 进入 Deployment 查看界面,如下图所示:
- 
+ 
2. 点击上图中的 ***调整镜像标签*** 按钮
将新版本字段修改为 `1.9.1`,并点击 ***确定*** 按钮,如下图所示:
- 
+ 
@@ -165,11 +165,11 @@ meta:
更新过程中,截图如下:
- 
+ 
完成更新后,截图如下:
- 
+ 
diff --git a/support/a.yml b/support/a.yml
new file mode 100644
index 0000000..dd0e2a8
--- /dev/null
+++ b/support/a.yml
@@ -0,0 +1,114 @@
+---
+apiVersion: kuboard.cn/v1
+kind: KuboardAddon
+metadata:
+ name: pv-browser.addons.kuboard.cn
+ namespace: kube-system
+spec:
+ scope: Cluster
+ extensions: []
+ info:
+ name: 存储卷浏览器
+ id: pv-browser.addons.kuboard.cn
+ version: v3.0.1
+ lastUpdate: '2020-11-26'
+ maintainer: shaohq@foxmail.com
+ scope: Cluster
+ description: 在集群概览页显示存储卷的利用率,查看存储卷内文件内容
+ document: 'https://addons.kuboard.cn/kuboard-pv-browser/v3.0.1/README.md'
+ addonUrl: 'https://addons.kuboard.cn/kuboard-pv-browser/v3.0.1/addon.yaml'
+ addonResourceUrl: 'https://addons.kuboard.cn/kuboard-pv-browser/v3.0.1/addonResource.yaml'
+status:
+ status: LOADED
+
+---
+apiVersion: kuboard.cn/v1
+k8sYamls:
+ kuboard-pv-browser: |-
+ apiVersion: apps/v1
+ kind: DaemonSet
+ metadata:
+ annotations:
+ k8s.kuboard.cn/ingress: 'false'
+ k8s.kuboard.cn/service: none
+ k8s.kuboard.cn/workload: kuboard-pv-browser
+ labels:
+ k8s.kuboard.cn/layer: monitor
+ k8s.kuboard.cn/name: kuboard-pv-browser
+ name: kuboard-pv-browser
+ namespace: kuboard
+ spec:
+ revisionHistoryLimit: 10
+ selector:
+ matchLabels:
+ k8s.kuboard.cn/layer: monitor
+ k8s.kuboard.cn/name: kuboard-pv-browser
+ template:
+ metadata:
+ labels:
+ k8s.kuboard.cn/layer: monitor
+ k8s.kuboard.cn/name: kuboard-pv-browser
+ spec:
+ containers:
+ - image: swr.cn-east-2.myhuaweicloud.com/kuboard/kuboard-pv-browser:v3.0.1
+ imagePullPolicy: IfNotPresent
+ name: delegator
+ volumeMounts:
+ - mountPath: /var/lib/kubelet
+ name: kubelet
+ - mountPath: /run/mount
+ name: mounts
+ - command:
+ - sleep
+ - '360000'
+ image: swr.cn-east-2.myhuaweicloud.com/kuboard/kuboard-pv-browser:v3.0.1
+ imagePullPolicy: IfNotPresent
+ name: pv-browser
+ volumeMounts:
+ - mountPath: /var/lib/kubelet
+ name: kubelet
+ - mountPath: /run/mount
+ name: mounts
+ dnsPolicy: ClusterFirst
+ tolerations:
+ - effect: ''
+ key: node-role.kubernetes.io/master
+ operator: Exists
+ restartPolicy: Always
+ schedulerName: default-scheduler
+ terminationGracePeriodSeconds: 30
+ volumes:
+ - hostPath:
+ path: /var/lib/kubelet
+ type: DirectoryOrCreate
+ name: kubelet
+ - hostPath:
+ path: /run/mount
+ type: DirectoryOrCreate
+ name: mounts
+kind: KuboardAddonResource
+lifecycleHandler:
+ additionalStep: >-
+ 请确认您的 Kuboard
+ 版本不低于 v3.0.0-alpha.5
+ beforeUninstall: JavaScriptToExecuteBeforeUninstall
+ disable: JavaScriptToExecuteBeforeDisable
+ initialize: >
+ import { startInitTasks, completeInitTask, failInitTask, KuboardProxy } from
+ '/addon-api/index.js'
+
+
+ export function initializeKuboardAddon (initContext) {
+ startInitTasks([
+ {name: 'pvbrowser', description: '初始化任务 pv-browser', descriptionEn: 'init task: pv-browser' },
+ ])
+ setTimeout(_ => {
+ completeInitTask('pvbrowser')
+ }, 1000)
+ console.log('finished')
+ }
+ install:
+ - kuboard-pv-browser
+metadata:
+ name: pv-browser.addons.kuboard.cn
+ namespace: kube-system
diff --git a/support/b.yml b/support/b.yml
new file mode 100644
index 0000000..818a05d
--- /dev/null
+++ b/support/b.yml
@@ -0,0 +1,115 @@
+---
+apiVersion: kuboard.cn/v1
+kind: KuboardAddon
+metadata:
+ name: pv-browser.addons.kuboard.cn
+ namespace: kuboard
+spec:
+ scope: Cluster
+ extensions: []
+ info:
+ name: 存储卷浏览器
+ id: pv-browser.addons.kuboard.cn
+ version: v3.0.1
+ lastUpdate: '2020-11-26'
+ maintainer: shaohq@foxmail.com
+ scope: Cluster
+ description: 在集群概览页显示存储卷的利用率,查看存储卷内文件内容
+ document: 'https://addons.kuboard.cn/kuboard-pv-browser/v3.0.1/README.md'
+ addonUrl: 'https://addons.kuboard.cn/kuboard-pv-browser/v3.0.1/addon.yaml'
+ addonResourceUrl: 'https://addons.kuboard.cn/kuboard-pv-browser/v3.0.1/addonResource.yaml'
+status:
+ status: LOADED
+
+
+---
+apiVersion: kuboard.cn/v1
+k8sYamls:
+ kuboard-pv-browser: |-
+ apiVersion: apps/v1
+ kind: DaemonSet
+ metadata:
+ annotations:
+ k8s.kuboard.cn/ingress: 'false'
+ k8s.kuboard.cn/service: none
+ k8s.kuboard.cn/workload: kuboard-pv-browser
+ labels:
+ k8s.kuboard.cn/layer: monitor
+ k8s.kuboard.cn/name: kuboard-pv-browser
+ name: kuboard-pv-browser
+ namespace: kuboard
+ spec:
+ revisionHistoryLimit: 10
+ selector:
+ matchLabels:
+ k8s.kuboard.cn/layer: monitor
+ k8s.kuboard.cn/name: kuboard-pv-browser
+ template:
+ metadata:
+ labels:
+ k8s.kuboard.cn/layer: monitor
+ k8s.kuboard.cn/name: kuboard-pv-browser
+ spec:
+ containers:
+ - image: swr.cn-east-2.myhuaweicloud.com/kuboard/kuboard-pv-browser:v3.0.1
+ imagePullPolicy: IfNotPresent
+ name: delegator
+ volumeMounts:
+ - mountPath: /var/lib/kubelet
+ name: kubelet
+ - mountPath: /run/mount
+ name: mounts
+ - command:
+ - sleep
+ - '360000'
+ image: swr.cn-east-2.myhuaweicloud.com/kuboard/kuboard-pv-browser:v3.0.1
+ imagePullPolicy: IfNotPresent
+ name: pv-browser
+ volumeMounts:
+ - mountPath: /var/lib/kubelet
+ name: kubelet
+ - mountPath: /run/mount
+ name: mounts
+ dnsPolicy: ClusterFirst
+ tolerations:
+ - effect: ''
+ key: node-role.kubernetes.io/master
+ operator: Exists
+ restartPolicy: Always
+ schedulerName: default-scheduler
+ terminationGracePeriodSeconds: 30
+ volumes:
+ - hostPath:
+ path: /var/lib/kubelet
+ type: DirectoryOrCreate
+ name: kubelet
+ - hostPath:
+ path: /run/mount
+ type: DirectoryOrCreate
+ name: mounts
+kind: KuboardAddonResource
+lifecycleHandler:
+ additionalStep: >-
+ 请确认您的 Kuboard
+ 版本不低于 v3.0.0-alpha.5
+ beforeUninstall: JavaScriptToExecuteBeforeUninstall
+ disable: JavaScriptToExecuteBeforeDisable
+ initialize: >
+ import { startInitTasks, completeInitTask, failInitTask, KuboardProxy } from
+ '/addon-api/index.js'
+
+
+ export function initializeKuboardAddon (initContext) {
+ startInitTasks([
+ {name: 'pvbrowser', description: '初始化任务 pv-browser', descriptionEn: 'init task: pv-browser' },
+ ])
+ setTimeout(_ => {
+ completeInitTask('pvbrowser')
+ }, 1000)
+ console.log('finished')
+ }
+ install:
+ - kuboard-pv-browser
+metadata:
+ name: pv-browser.addons.kuboard.cn
+ namespace: kuboard
diff --git a/support/change-log/v3.0.x.md b/support/change-log/v3.0.x.md
index 7896448..db6ab41 100644
--- a/support/change-log/v3.0.x.md
+++ b/support/change-log/v3.0.x.md
@@ -9,10 +9,37 @@ description: 本文描述了Kuboard_v3.x的版本变更说明
-
+
+## v3.1.1.0
+
+**发布日期**
+
+2021年4月5日
+
+**优化**
+
+* 工作负载编辑器
+ * 显示容器的默认资源请求/响应
+ * 容器生命周期回调
+ * 存储挂载表单校验
+* ReplicaSet 悬浮时显示镜像的版本;
+* 记住工作负载页面的展开状态(仅在当前会话中)
+
+**BUG修正**
+
+* spec.type === 'ClusterIP' && spec.clusterIP === 'None' 时,应该被判定为 Headless Service
+ * 列表
+ * 编辑器
+ * 查看页面
+* 工作负载列表页,批量重启后,状态不正确的问题
+* 工作负载编辑器(仅在 v3.1.1-beta.1 中出现如下 BUG)
+ * 不能复制工作负载的 BUG
+ * ImagePullSecret 重复的问题
+ * 填写镜像时输入 `/` 后 RepoType 被重置的问题
+* 在名称空间列表中删除名称空间后,不能正常刷新列表的问题
+* 编辑节点标签后,页面不能正常刷新的问题
--->
## v3.1.1-beta.1