From 2e5b51cc24b6f6c91e7f969fe14e3adc2d4e80f2 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 21 Apr 2018 23:28:35 +0200 Subject: rename all .yaml to .yml --- roles/kubernetes-net/handlers/main.yaml | 4 -- roles/kubernetes-net/handlers/main.yml | 4 ++ roles/kubernetes-net/tasks/add.yaml | 114 -------------------------------- roles/kubernetes-net/tasks/add.yml | 114 ++++++++++++++++++++++++++++++++ roles/kubernetes-net/tasks/main.yaml | 8 --- roles/kubernetes-net/tasks/main.yml | 8 +++ roles/kubernetes-net/tasks/remove.yaml | 28 -------- roles/kubernetes-net/tasks/remove.yml | 28 ++++++++ 8 files changed, 154 insertions(+), 154 deletions(-) delete mode 100644 roles/kubernetes-net/handlers/main.yaml create mode 100644 roles/kubernetes-net/handlers/main.yml delete mode 100644 roles/kubernetes-net/tasks/add.yaml create mode 100644 roles/kubernetes-net/tasks/add.yml delete mode 100644 roles/kubernetes-net/tasks/main.yaml create mode 100644 roles/kubernetes-net/tasks/main.yml delete mode 100644 roles/kubernetes-net/tasks/remove.yaml create mode 100644 roles/kubernetes-net/tasks/remove.yml (limited to 'roles/kubernetes-net') diff --git a/roles/kubernetes-net/handlers/main.yaml b/roles/kubernetes-net/handlers/main.yaml deleted file mode 100644 index bb7fde2b..00000000 --- a/roles/kubernetes-net/handlers/main.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: reload systemd - systemd: - daemon_reload: yes diff --git a/roles/kubernetes-net/handlers/main.yml b/roles/kubernetes-net/handlers/main.yml new file mode 100644 index 00000000..bb7fde2b --- /dev/null +++ b/roles/kubernetes-net/handlers/main.yml @@ -0,0 +1,4 @@ +--- +- name: reload systemd + systemd: + daemon_reload: yes diff --git a/roles/kubernetes-net/tasks/add.yaml b/roles/kubernetes-net/tasks/add.yaml deleted file mode 100644 index f4e422c6..00000000 --- a/roles/kubernetes-net/tasks/add.yaml +++ /dev/null @@ -1,114 +0,0 @@ ---- -- name: create docker config directory - file: - name: /etc/docker - state: directory - mode: 0700 - -- name: disable docker iptables and bridge - copy: - src: daemon.json - dest: /etc/docker/daemon.json - -- name: create network config directory - file: - name: /var/lib/kubenet/ - state: directory - -- name: configure wireguard port - set_fact: - kubenet_wireguard_port: "{{ kubernetes.wireguard_port | default(51820) }}" - -- name: install ifupdown script - template: - src: ifupdown.sh.j2 - dest: /var/lib/kubenet/ifupdown.sh - mode: 0755 - # TODO: notify reload... this is unfortunately already to late because - # it must probably be brought down by the old version of the script - -- name: generate wireguard private key - shell: "umask 077; wg genkey > /var/lib/kubenet/kube-wg0.privatekey" - args: - creates: /var/lib/kubenet/kube-wg0.privatekey - -- name: fetch wireguard public key - shell: "wg pubkey < /var/lib/kubenet/kube-wg0.privatekey" - register: kubenet_wireguard_pubkey - changed_when: false - check_mode: no - -- name: install systemd service unit for network interfaces - copy: - src: kubenet-interfaces.service - dest: /etc/systemd/system/kubenet-interfaces.service - # TODO: notify: reload??? - -- name: make sure kubenet interfaces service is started and enabled - systemd: - daemon_reload: yes - name: kubenet-interfaces.service - state: started - enabled: yes - -- name: get list of currently installed kubenet peers - find: - path: /etc/systemd/system/ - pattern: "kubenet-peer-*.service" - register: kubenet_peers_installed - -- name: compute list of peers to be added - set_fact: - kubenet_peers_to_add: "{{ kubernetes_nodes | difference(inventory_hostname) }}" - -- name: compute list of peers to be removed - set_fact: - kubenet_peers_to_remove: "{{ kubenet_peers_installed.files | map(attribute='path') | map('replace', '/etc/systemd/system/kubenet-peer-', '') | map('replace', '.service', '') | difference(kubenet_peers_to_add) }}" - -- name: stop/disable systemd units for stale kubenet peers - with_items: "{{ kubenet_peers_to_remove }}" - systemd: - name: "kubenet-peer-{{ item }}.service" - state: stopped - enabled: no - -- name: remove systemd units for stale kubenet peers - with_items: "{{ kubenet_peers_to_remove }}" - file: - name: "/etc/systemd/system/kubenet-peer-{{ item }}.service" - state: absent - -- name: install systemd units for every kubenet peer - with_items: "{{ kubenet_peers_to_add }}" - loop_control: - loop_var: peer - template: - src: kubenet-peer.service.j2 - dest: "/etc/systemd/system/kubenet-peer-{{ peer }}.service" - # TODO: notify restart for peers that change... - -- name: make sure kubenet peer services are started and enabled - with_items: "{{ kubenet_peers_to_add }}" - systemd: - daemon_reload: yes - name: "kubenet-peer-{{ item }}.service" - state: started - enabled: yes - -- name: enable IPv4 forwarding - sysctl: - name: net.ipv4.ip_forward - value: 1 - sysctl_set: yes - state: present - reload: yes - -- name: create cni config directory - file: - name: /etc/cni/net.d - state: directory - -- name: install cni config - template: - src: k8s.json.j2 - dest: /etc/cni/net.d/k8s.json diff --git a/roles/kubernetes-net/tasks/add.yml b/roles/kubernetes-net/tasks/add.yml new file mode 100644 index 00000000..f4e422c6 --- /dev/null +++ b/roles/kubernetes-net/tasks/add.yml @@ -0,0 +1,114 @@ +--- +- name: create docker config directory + file: + name: /etc/docker + state: directory + mode: 0700 + +- name: disable docker iptables and bridge + copy: + src: daemon.json + dest: /etc/docker/daemon.json + +- name: create network config directory + file: + name: /var/lib/kubenet/ + state: directory + +- name: configure wireguard port + set_fact: + kubenet_wireguard_port: "{{ kubernetes.wireguard_port | default(51820) }}" + +- name: install ifupdown script + template: + src: ifupdown.sh.j2 + dest: /var/lib/kubenet/ifupdown.sh + mode: 0755 + # TODO: notify reload... this is unfortunately already to late because + # it must probably be brought down by the old version of the script + +- name: generate wireguard private key + shell: "umask 077; wg genkey > /var/lib/kubenet/kube-wg0.privatekey" + args: + creates: /var/lib/kubenet/kube-wg0.privatekey + +- name: fetch wireguard public key + shell: "wg pubkey < /var/lib/kubenet/kube-wg0.privatekey" + register: kubenet_wireguard_pubkey + changed_when: false + check_mode: no + +- name: install systemd service unit for network interfaces + copy: + src: kubenet-interfaces.service + dest: /etc/systemd/system/kubenet-interfaces.service + # TODO: notify: reload??? + +- name: make sure kubenet interfaces service is started and enabled + systemd: + daemon_reload: yes + name: kubenet-interfaces.service + state: started + enabled: yes + +- name: get list of currently installed kubenet peers + find: + path: /etc/systemd/system/ + pattern: "kubenet-peer-*.service" + register: kubenet_peers_installed + +- name: compute list of peers to be added + set_fact: + kubenet_peers_to_add: "{{ kubernetes_nodes | difference(inventory_hostname) }}" + +- name: compute list of peers to be removed + set_fact: + kubenet_peers_to_remove: "{{ kubenet_peers_installed.files | map(attribute='path') | map('replace', '/etc/systemd/system/kubenet-peer-', '') | map('replace', '.service', '') | difference(kubenet_peers_to_add) }}" + +- name: stop/disable systemd units for stale kubenet peers + with_items: "{{ kubenet_peers_to_remove }}" + systemd: + name: "kubenet-peer-{{ item }}.service" + state: stopped + enabled: no + +- name: remove systemd units for stale kubenet peers + with_items: "{{ kubenet_peers_to_remove }}" + file: + name: "/etc/systemd/system/kubenet-peer-{{ item }}.service" + state: absent + +- name: install systemd units for every kubenet peer + with_items: "{{ kubenet_peers_to_add }}" + loop_control: + loop_var: peer + template: + src: kubenet-peer.service.j2 + dest: "/etc/systemd/system/kubenet-peer-{{ peer }}.service" + # TODO: notify restart for peers that change... + +- name: make sure kubenet peer services are started and enabled + with_items: "{{ kubenet_peers_to_add }}" + systemd: + daemon_reload: yes + name: "kubenet-peer-{{ item }}.service" + state: started + enabled: yes + +- name: enable IPv4 forwarding + sysctl: + name: net.ipv4.ip_forward + value: 1 + sysctl_set: yes + state: present + reload: yes + +- name: create cni config directory + file: + name: /etc/cni/net.d + state: directory + +- name: install cni config + template: + src: k8s.json.j2 + dest: /etc/cni/net.d/k8s.json diff --git a/roles/kubernetes-net/tasks/main.yaml b/roles/kubernetes-net/tasks/main.yaml deleted file mode 100644 index c8d06380..00000000 --- a/roles/kubernetes-net/tasks/main.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: add node to overlay network - include_tasks: add.yaml - when: k8s_remove_node is not defined - -- name: remove node from overlay network - include_tasks: remove.yaml - when: k8s_remove_node is defined diff --git a/roles/kubernetes-net/tasks/main.yml b/roles/kubernetes-net/tasks/main.yml new file mode 100644 index 00000000..8c94292e --- /dev/null +++ b/roles/kubernetes-net/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- name: add node to overlay network + include_tasks: add.yml + when: k8s_remove_node is not defined + +- name: remove node from overlay network + include_tasks: remove.yml + when: k8s_remove_node is defined diff --git a/roles/kubernetes-net/tasks/remove.yaml b/roles/kubernetes-net/tasks/remove.yaml deleted file mode 100644 index 6695bd5d..00000000 --- a/roles/kubernetes-net/tasks/remove.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- name: check if kubenet interface service unit exists - stat: - path: /etc/systemd/system/kubenet-interfaces.service - register: kubenet_interface_unit - -- name: bring down kubenet interface - systemd: - name: kubenet-interfaces.service - state: stopped - when: kubenet_interface_unit.stat.exists - -- name: gather list of all kubenet related service units - find: - path: /etc/systemd/system/ - patterns: - - "kubenet-peer-*.service" - - kubenet-interfaces.service - register: kubenet_units_installed - -- name: remove all kubenet related files and directories - with_flattened: - - "{{ kubenet_units_installed.files | map(attribute='path') | list }}" - - /var/lib/kubenet - file: - path: "{{ item }}" - state: absent - notify: reload systemd diff --git a/roles/kubernetes-net/tasks/remove.yml b/roles/kubernetes-net/tasks/remove.yml new file mode 100644 index 00000000..6695bd5d --- /dev/null +++ b/roles/kubernetes-net/tasks/remove.yml @@ -0,0 +1,28 @@ +--- +- name: check if kubenet interface service unit exists + stat: + path: /etc/systemd/system/kubenet-interfaces.service + register: kubenet_interface_unit + +- name: bring down kubenet interface + systemd: + name: kubenet-interfaces.service + state: stopped + when: kubenet_interface_unit.stat.exists + +- name: gather list of all kubenet related service units + find: + path: /etc/systemd/system/ + patterns: + - "kubenet-peer-*.service" + - kubenet-interfaces.service + register: kubenet_units_installed + +- name: remove all kubenet related files and directories + with_flattened: + - "{{ kubenet_units_installed.files | map(attribute='path') | list }}" + - /var/lib/kubenet + file: + path: "{{ item }}" + state: absent + notify: reload systemd -- cgit v1.2.3