Browse Source

Merge pull request #3068 from riverzhang/swap

Enable swap
pull/3037/head
Rong Zhang 6 years ago
committed by GitHub
parent
commit
e71f261935
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
  1. 6
      roles/kubernetes/preinstall/tasks/verify-settings.yml
  2. 2
      roles/kubespray-defaults/defaults/main.yaml

6
roles/kubernetes/preinstall/tasks/verify-settings.yml

@ -86,12 +86,6 @@
when: access_ip is defined
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
assert:
that: rbac_enabled

2
roles/kubespray-defaults/defaults/main.yaml

@ -13,7 +13,7 @@ kube_api_anonymous_auth: false
is_atomic: false
# optional disable the swap
disable_swap: false
disable_swap: true
## Change this to use another Kubernetes version, e.g. a current beta release
kube_version: v1.10.4

Loading…
Cancel
Save