Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
e71f2619
Unverified
Commit
e71f2619
authored
6 years ago
by
Rong Zhang
Committed by
GitHub
6 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #3068 from riverzhang/swap
Enable swap
parents
b1ef336f
b902602d
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes/preinstall/tasks/verify-settings.yml
+0
-6
0 additions, 6 deletions
roles/kubernetes/preinstall/tasks/verify-settings.yml
roles/kubespray-defaults/defaults/main.yaml
+1
-1
1 addition, 1 deletion
roles/kubespray-defaults/defaults/main.yaml
with
1 addition
and
7 deletions
roles/kubernetes/preinstall/tasks/verify-settings.yml
+
0
−
6
View file @
e71f2619
...
@@ -86,12 +86,6 @@
...
@@ -86,12 +86,6 @@
when
:
access_ip is defined
when
:
access_ip is defined
ignore_errors
:
"
{{
ignore_assert_errors
}}"
ignore_errors
:
"
{{
ignore_assert_errors
}}"
-
name
:
Stop if swap enabled
assert
:
that
:
ansible_swaptotal_mb ==
0
when
:
kubelet_fail_swap_on|default(true)
ignore_errors
:
"
{{
ignore_assert_errors
}}"
-
name
:
Stop if RBAC is not enabled when dashboard is enabled
-
name
:
Stop if RBAC is not enabled when dashboard is enabled
assert
:
assert
:
that
:
rbac_enabled
that
:
rbac_enabled
...
...
This diff is collapsed.
Click to expand it.
roles/kubespray-defaults/defaults/main.yaml
+
1
−
1
View file @
e71f2619
...
@@ -13,7 +13,7 @@ kube_api_anonymous_auth: false
...
@@ -13,7 +13,7 @@ kube_api_anonymous_auth: false
is_atomic
:
false
is_atomic
:
false
# optional disable the swap
# optional disable the swap
disable_swap
:
fals
e
disable_swap
:
tru
e
## Change this to use another Kubernetes version, e.g. a current beta release
## Change this to use another Kubernetes version, e.g. a current beta release
kube_version
:
v1.10.4
kube_version
:
v1.10.4
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment