Compare commits
No commits in common. "1e4d82d403bcd58f376535e0923e719f2b9c935f" and "d43e295f30e99b9ebc6807998aa60b7504eb3b5e" have entirely different histories.
1e4d82d403
...
d43e295f30
5 changed files with 12 additions and 50 deletions
|
|
@ -57,25 +57,3 @@
|
||||||
# - need_firewall|bool
|
# - need_firewall|bool
|
||||||
# - firewall_name == "firewalld"
|
# - firewall_name == "firewalld"
|
||||||
- kubernetes_server|bool
|
- kubernetes_server|bool
|
||||||
|
|
||||||
- name: Install kubernetes tools
|
|
||||||
dnf:
|
|
||||||
name: "{{ kubernetes_package_name }}"
|
|
||||||
enablerepo: "kubernetes"
|
|
||||||
state: present
|
|
||||||
update_cache: yes
|
|
||||||
# notify: Restart kubelet
|
|
||||||
when:
|
|
||||||
- ansible_pkg_mgr == "dnf"
|
|
||||||
- (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s")
|
|
||||||
|
|
||||||
- name: Install kubernetes tools
|
|
||||||
yum:
|
|
||||||
name: "{{ kubernetes_package_name }}"
|
|
||||||
enablerepo: "kubernetes"
|
|
||||||
state: present
|
|
||||||
update_cache: yes
|
|
||||||
# notify: Restart kubelet
|
|
||||||
when:
|
|
||||||
- ansible_pkg_mgr == "yum"
|
|
||||||
- (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s")
|
|
||||||
|
|
|
||||||
|
|
@ -5,22 +5,6 @@
|
||||||
# when:
|
# when:
|
||||||
# - kubernetes_cni == "wireguard"
|
# - kubernetes_cni == "wireguard"
|
||||||
|
|
||||||
- name: Install the k3s-selinux rpm from a remote repo for yum distro
|
|
||||||
yum:
|
|
||||||
name: "https://github.com/k3s-io/k3s-selinux/releases/download/v0.2.stable.1/k3s-selinux-0.2-1.el7_8.noarch.rpm"
|
|
||||||
state: present
|
|
||||||
disable_gpg_check: yes
|
|
||||||
when:
|
|
||||||
- ansible_pkg_mgr == "yum"
|
|
||||||
|
|
||||||
- name: Install the k3s-selinux rpm from a remote repo for dnf distro
|
|
||||||
dnf:
|
|
||||||
name: "https://github.com/k3s-io/k3s-selinux/releases/download/v0.2.stable.1/k3s-selinux-0.2-1.el7_8.noarch.rpm"
|
|
||||||
state: present
|
|
||||||
disable_gpg_check: yes
|
|
||||||
when:
|
|
||||||
- ansible_pkg_mgr == "dnf"
|
|
||||||
|
|
||||||
- name: Check if /usr/local/bin/k3s already existe
|
- name: Check if /usr/local/bin/k3s already existe
|
||||||
stat:
|
stat:
|
||||||
path: /usr/local/bin/k3s
|
path: /usr/local/bin/k3s
|
||||||
|
|
|
||||||
|
|
@ -39,14 +39,14 @@
|
||||||
- name: Install kubernetes rules for {{ ansible_os_family }} OS family
|
- name: Install kubernetes rules for {{ ansible_os_family }} OS family
|
||||||
include_tasks: "{{ ansible_os_family }}.yml"
|
include_tasks: "{{ ansible_os_family }}.yml"
|
||||||
|
|
||||||
#- name: Install kubernetes tools
|
- name: Install kubernetes tools
|
||||||
# package:
|
package:
|
||||||
# name: "{{ kubernetes_package_name }}"
|
name: "{{ kubernetes_package_name }}"
|
||||||
# state: present
|
state: present
|
||||||
# update_cache: yes
|
update_cache: yes
|
||||||
## notify: Restart kubelet
|
# notify: Restart kubelet
|
||||||
# when:
|
when:
|
||||||
# - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s")
|
- (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s")
|
||||||
|
|
||||||
- name: Include kubernetes server rules
|
- name: Include kubernetes server rules
|
||||||
include_tasks: "install_server.yml"
|
include_tasks: "install_server.yml"
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@ Type=notify
|
||||||
EnvironmentFile=/etc/systemd/system/k3s.service.env
|
EnvironmentFile=/etc/systemd/system/k3s.service.env
|
||||||
{% if kubernetes_master|bool %}
|
{% if kubernetes_master|bool %}
|
||||||
{% if vars['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined %}
|
{% if vars['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined %}
|
||||||
ExecStart=/usr/local/bin/k3s server --flannel-backend=wireguard --disable traefik --secrets-encryption --cluster-init --selinux
|
ExecStart=/usr/local/bin/k3s server --flannel-backend=wireguard --disable traefik --secrets-encryption --cluster-init
|
||||||
{% else %}
|
{% else %}
|
||||||
ExecStart=/usr/local/bin/k3s server --flannel-backend=wireguard --disable traefik --secrets-encryption --server https://{{ kubernetes_master }}:6443 --token ${NODE_TOKEN} --selinux
|
ExecStart=/usr/local/bin/k3s server --flannel-backend=wireguard --disable traefik --secrets-encryption --server https://{{ kubernetes_master }}:6443 --token ${NODE_TOKEN}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% else %}
|
{% else %}
|
||||||
ExecStart=/usr/local/bin/k3s agent --server https://{{ kubernetes_master }}:6443 --token ${NODE_TOKEN} --selinux
|
ExecStart=/usr/local/bin/k3s agent --server https://{{ kubernetes_master }}:6443 --token ${NODE_TOKEN}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
KillMode=process
|
KillMode=process
|
||||||
Delegate=yes
|
Delegate=yes
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
[kubernetes]
|
[kubernetes]
|
||||||
name=Kubernetes
|
name=Kubernetes
|
||||||
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{ ansible_machine }}
|
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{ ansible_machine }}
|
||||||
enabled=0
|
enabled=1
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
repo_gpgcheck=1
|
repo_gpgcheck=1
|
||||||
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
|
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue