Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kubeasz
Commits
8d24ad9b
Commit
8d24ad9b
authored
3 years ago
by
gjmzj
Browse files
Options
Download
Email Patches
Plain Diff
调整:docker/containerd运行时安装互不影响
parent
ad7f1082
master
dev3
3.2.0
3.1.1
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/release-notes/kubeasz-3.1.1.md
+1
-1
docs/release-notes/kubeasz-3.1.1.md
roles/cluster-addon/tasks/dashboard.yml
+2
-0
roles/cluster-addon/tasks/dashboard.yml
roles/containerd/tasks/main.yml
+0
-9
roles/containerd/tasks/main.yml
roles/docker/tasks/main.yml
+1
-5
roles/docker/tasks/main.yml
with
4 additions
and
15 deletions
+4
-15
docs/release-notes/kubeasz-3.1.1.md
+
1
-
1
View file @
8d24ad9b
...
...
@@ -32,4 +32,4 @@ kubeasz 用户可以确认集群各项功能符合预期,既符合k8s设计标
-
修复:coredns 1.8.4 rbac settings
-
修复:docker/containerd是否需要安装的判断条件
-
修复:暂时绕过centos7.9开启KUBE_RESERVED的问题
-
调整:docker/containerd运行时安装互不影响
This diff is collapsed.
Click to expand it.
roles/cluster-addon/tasks/dashboard.yml
+
2
-
0
View file @
8d24ad9b
...
...
@@ -25,6 +25,8 @@
-
name
:
prepare some dirs
file
:
name={{ cluster_dir }}/yml/dashboard state=directory
run_once
:
true
connection
:
local
-
name
:
准备 dashboard的部署文件
template
:
src=dashboard/{{ item }}.j2 dest={{ cluster_dir }}/yml/dashboard/{{ item }}
...
...
This diff is collapsed.
Click to expand it.
roles/containerd/tasks/main.yml
+
0
-
9
View file @
8d24ad9b
-
name
:
获取是否已经安装docker
shell
:
'
systemctl
is-active
docker
||
echo
"NoFound"'
register
:
docker_status
-
name
:
WARNNING 提示
debug
:
msg
:
"
[WARN]:
docker
is
running,
and
containerd
will
be
installed"
when
:
'
"NoFound"
not
in
docker_status.stdout'
-
name
:
获取是否已经安装containerd
shell
:
'
systemctl
is-active
containerd
||
echo
"NoFound"'
register
:
containerd_svc
...
...
This diff is collapsed.
Click to expand it.
roles/docker/tasks/main.yml
+
1
-
5
View file @
8d24ad9b
...
...
@@ -2,10 +2,6 @@
shell
:
'
systemctl
is-active
docker
||
echo
"NoFound"'
register
:
docker_svc
-
name
:
获取是否已经安装containerd
shell
:
'
systemctl
is-active
containerd
||
echo
"NoFound"'
register
:
containerd_svc
# 18.09.x 版本二进制名字有变化,需要做判断
-
name
:
获取docker版本信息
shell
:
"
{{
base_dir
}}/bin/dockerd
--version|cut
-d'
'
-f3"
...
...
@@ -113,7 +109,7 @@
-
name
:
配置 docker 命令软链接
file
:
src={{ bin_dir }}/docker dest=/usr/bin/docker state=link
ignore_errors
:
true
when
:
"
'NoFound'
in
containerd_svc.stdout
and
'NoFound'
in
docker_svc.stdout"
when
:
"
'NoFound'
in
docker_svc.stdout"
## 可选 ------安装docker查询镜像 tag的小工具----
-
name
:
下载 docker-tag
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help