diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index be10842..7eaf639 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -57,25 +57,3 @@ # - need_firewall|bool # - firewall_name == "firewalld" - 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") diff --git a/tasks/cluster_k3s.yml b/tasks/cluster_k3s.yml index cb4e527..9318b77 100644 --- a/tasks/cluster_k3s.yml +++ b/tasks/cluster_k3s.yml @@ -5,22 +5,6 @@ # when: # - 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 stat: path: /usr/local/bin/k3s diff --git a/tasks/main.yml b/tasks/main.yml index 5fe21e7..b57a12b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -39,14 +39,14 @@ - name: Install kubernetes rules for {{ ansible_os_family }} OS family include_tasks: "{{ ansible_os_family }}.yml" -#- name: Install kubernetes tools -# package: -# name: "{{ kubernetes_package_name }}" -# state: present -# update_cache: yes -## notify: Restart kubelet -# when: -# - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s") +- name: Install kubernetes tools + package: + name: "{{ kubernetes_package_name }}" + state: present + update_cache: yes +# notify: Restart kubelet + when: + - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s") - name: Include kubernetes server rules include_tasks: "install_server.yml" diff --git a/templates/etc/systemd/system/k3s.service.j2 b/templates/etc/systemd/system/k3s.service.j2 index 03f00a5..0ac1a83 100644 --- a/templates/etc/systemd/system/k3s.service.j2 +++ b/templates/etc/systemd/system/k3s.service.j2 @@ -8,12 +8,12 @@ Type=notify EnvironmentFile=/etc/systemd/system/k3s.service.env {% if kubernetes_master|bool %} {% 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 %} -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 %} {% 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 %} KillMode=process Delegate=yes diff --git a/templates/etc/yum.repos.d/kubernetes.repo.j2 b/templates/etc/yum.repos.d/kubernetes.repo.j2 index b04037a..7ac0fdb 100644 --- a/templates/etc/yum.repos.d/kubernetes.repo.j2 +++ b/templates/etc/yum.repos.d/kubernetes.repo.j2 @@ -1,7 +1,7 @@ [kubernetes] name=Kubernetes baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{ ansible_machine }} -enabled=0 +enabled=1 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