From 98308448d40f3c07c4afd58cf41ba2ad6dfe7e23 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 29 Sep 2019 00:42:21 +0200 Subject: refactoring kubernetes roles --- common/kubernetes.yml | 15 +-- roles/kubernetes/base/tasks/main.yml | 26 +---- roles/kubernetes/kubeadm/base/tasks/main.yml | 34 +++++++ roles/kubernetes/kubeadm/master/tasks/main.yml | 109 +++++++++++++++++++++ .../master/templates/kubeadm-cluster.config.j2 | 34 +++++++ roles/kubernetes/kubeadm/node/tasks/main.yml | 18 ++++ roles/kubernetes/kubeadm/reset/tasks/main.yml | 3 + roles/kubernetes/master/tasks/main.yml | 109 --------------------- .../master/templates/kubeadm-cluster.config.j2 | 34 ------- .../net/files/kubenet-interfaces.service | 12 --- roles/kubernetes/net/filter_plugins/kubenet.py | 33 ------- roles/kubernetes/net/handlers/main.yml | 4 - .../kubeguard/files/kubeguard-interfaces.service | 12 +++ .../net/kubeguard/filter_plugins/kubeguard.py | 33 +++++++ roles/kubernetes/net/kubeguard/handlers/main.yml | 4 + roles/kubernetes/net/kubeguard/meta/main.yml | 4 + roles/kubernetes/net/kubeguard/tasks/add.yml | 103 +++++++++++++++++++ roles/kubernetes/net/kubeguard/tasks/main.yml | 8 ++ roles/kubernetes/net/kubeguard/tasks/remove.yml | 26 +++++ .../net/kubeguard/templates/ifupdown.sh.j2 | 55 +++++++++++ .../kubernetes/net/kubeguard/templates/k8s.json.j2 | 12 +++ .../kubeguard/templates/kubeguard-peer.service.j2 | 36 +++++++ roles/kubernetes/net/meta/main.yml | 4 - roles/kubernetes/net/tasks/add.yml | 103 ------------------- roles/kubernetes/net/tasks/main.yml | 8 -- roles/kubernetes/net/tasks/remove.yml | 26 ----- roles/kubernetes/net/templates/ifupdown.sh.j2 | 55 ----------- roles/kubernetes/net/templates/k8s.json.j2 | 12 --- .../net/templates/kubenet-peer.service.j2 | 36 ------- roles/kubernetes/node/tasks/add.yml | 18 ---- roles/kubernetes/node/tasks/main.yml | 8 -- roles/kubernetes/node/tasks/remove.yml | 3 - 32 files changed, 501 insertions(+), 496 deletions(-) create mode 100644 roles/kubernetes/kubeadm/base/tasks/main.yml create mode 100644 roles/kubernetes/kubeadm/master/tasks/main.yml create mode 100644 roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 create mode 100644 roles/kubernetes/kubeadm/node/tasks/main.yml create mode 100644 roles/kubernetes/kubeadm/reset/tasks/main.yml delete mode 100644 roles/kubernetes/master/tasks/main.yml delete mode 100644 roles/kubernetes/master/templates/kubeadm-cluster.config.j2 delete mode 100644 roles/kubernetes/net/files/kubenet-interfaces.service delete mode 100644 roles/kubernetes/net/filter_plugins/kubenet.py delete mode 100644 roles/kubernetes/net/handlers/main.yml create mode 100644 roles/kubernetes/net/kubeguard/files/kubeguard-interfaces.service create mode 100644 roles/kubernetes/net/kubeguard/filter_plugins/kubeguard.py create mode 100644 roles/kubernetes/net/kubeguard/handlers/main.yml create mode 100644 roles/kubernetes/net/kubeguard/meta/main.yml create mode 100644 roles/kubernetes/net/kubeguard/tasks/add.yml create mode 100644 roles/kubernetes/net/kubeguard/tasks/main.yml create mode 100644 roles/kubernetes/net/kubeguard/tasks/remove.yml create mode 100644 roles/kubernetes/net/kubeguard/templates/ifupdown.sh.j2 create mode 100644 roles/kubernetes/net/kubeguard/templates/k8s.json.j2 create mode 100644 roles/kubernetes/net/kubeguard/templates/kubeguard-peer.service.j2 delete mode 100644 roles/kubernetes/net/meta/main.yml delete mode 100644 roles/kubernetes/net/tasks/add.yml delete mode 100644 roles/kubernetes/net/tasks/main.yml delete mode 100644 roles/kubernetes/net/tasks/remove.yml delete mode 100644 roles/kubernetes/net/templates/ifupdown.sh.j2 delete mode 100644 roles/kubernetes/net/templates/k8s.json.j2 delete mode 100644 roles/kubernetes/net/templates/kubenet-peer.service.j2 delete mode 100644 roles/kubernetes/node/tasks/add.yml delete mode 100644 roles/kubernetes/node/tasks/main.yml delete mode 100644 roles/kubernetes/node/tasks/remove.yml diff --git a/common/kubernetes.yml b/common/kubernetes.yml index e0073c0e..311f3ebd 100644 --- a/common/kubernetes.yml +++ b/common/kubernetes.yml @@ -38,18 +38,19 @@ hosts: _kubernetes_nodes_ roles: - role: docker + - role: kubernetes/net/kubeguard - role: kubernetes/base - - role: kubernetes/net + - role: kubernetes/kubeadm/base - name: configure kubernetes master hosts: _kubernetes_masters_ roles: - - role: kubernetes/master + - role: kubernetes/kubeadm/master - name: configure kubernetes non-master nodes hosts: _kubernetes_nodes_:!_kubernetes_masters_ roles: - - role: kubernetes/node + - role: kubernetes/kubeadm/node ######## - name: check for nodes to be removed @@ -75,11 +76,11 @@ - name: try to clean superflous nodes hosts: _kubernetes_nodes_remove_ - vars: - kubernetes_remove_node: yes roles: - - role: kubernetes/node - - role: kubernetes/net + - role: kubernetes/kubeadm/reset + - role: kubernetes/net/kubeguard + vars: + kubeguard_remove_node: yes - name: remove node from api server hosts: _kubernetes_masters_ diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index bf62f7d2..0b0be821 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -42,30 +42,20 @@ - name: update apt cache meta: flush_handlers -- name: install basic kubernetes components +- name: install kubelet apt: name: - "kubelet{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}" - - "kubeadm{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}" - - "kubectl{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}" state: present -- name: disable automatic upgrades for kubernetes components +- name: disable automatic upgrades for kubelet when: kubernetes.pkg_version is defined loop: - kubelet - - kubeadm - - kubectl dpkg_selections: name: "{{ item }}" selection: hold -- name: set kubelet node-ip - lineinfile: - name: "/etc/default/kubelet" - regexp: '^KUBELET_EXTRA_ARGS=' - line: 'KUBELET_EXTRA_ARGS=--node-ip={{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[inventory_hostname]) | ipaddr(1) | ipaddr("address") }}' - - name: add dummy group with gid 998 group: name: app @@ -77,15 +67,3 @@ uid: 998 group: app password: "!" - -- name: add kubectl/kubeadm completion for shells - loop: - - zsh - - bash - blockinfile: - path: "/root/.{{ item }}rc" - create: yes - marker: "### {mark} ANSIBLE MANAGED BLOCK for kubectl ###" - content: | - source <(kubectl completion {{ item }}) - source <(kubeadm completion {{ item }}) diff --git a/roles/kubernetes/kubeadm/base/tasks/main.yml b/roles/kubernetes/kubeadm/base/tasks/main.yml new file mode 100644 index 00000000..2d9b9eed --- /dev/null +++ b/roles/kubernetes/kubeadm/base/tasks/main.yml @@ -0,0 +1,34 @@ +--- +- name: install kubeadm and kubectl + apt: + name: + - "kubeadm{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}" + - "kubectl{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}" + state: present + +- name: disable automatic upgrades for kubeadm and kubectl + when: kubernetes.pkg_version is defined + loop: + - kubeadm + - kubectl + dpkg_selections: + name: "{{ item }}" + selection: hold + +- name: set kubelet node-ip + lineinfile: + name: "/etc/default/kubelet" + regexp: '^KUBELET_EXTRA_ARGS=' + line: 'KUBELET_EXTRA_ARGS=--node-ip={{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[inventory_hostname]) | ipaddr(1) | ipaddr("address") }}' + +- name: add kubectl/kubeadm completion for shells + loop: + - zsh + - bash + blockinfile: + path: "/root/.{{ item }}rc" + create: yes + marker: "### {mark} ANSIBLE MANAGED BLOCK for kubectl ###" + content: | + source <(kubectl completion {{ item }}) + source <(kubeadm completion {{ item }}) diff --git a/roles/kubernetes/kubeadm/master/tasks/main.yml b/roles/kubernetes/kubeadm/master/tasks/main.yml new file mode 100644 index 00000000..7cc6fe94 --- /dev/null +++ b/roles/kubernetes/kubeadm/master/tasks/main.yml @@ -0,0 +1,109 @@ +--- +- name: check if kubeconfig admin.conf already exists + stat: + path: /etc/kubernetes/admin.conf + register: kubeconfig_admin_stats + +### cluster not yet initialized + +- name: create new cluster + when: kubeconfig_admin_stats.stat.exists == False + block: + + - name: generate bootstrap token for new cluster + command: kubeadm token generate + changed_when: False + check_mode: no + register: kubeadm_token_generate + + - name: create kubernetes config directory + file: + path: /etc/kubernetes + state: directory + + ## TODO test whether the generated cluster configs really works - since it has never been used... + - name: install cluster config for kubeadm + template: + src: kubeadm-cluster.config.j2 + dest: /etc/kubernetes/kubeadm-cluster.config + + - name: set up kubernetes master + command: "kubeadm init --config '/etc/kubernetes/kubeadm-cluster.config' --token '{{ kubeadm_token_generate.stdout }}' --token-ttl 42m --skip-token-print" + args: + creates: /etc/kubernetes/pki/ca.crt + register: kubeadm_init + + - name: dump output of kubeadm init to log file + when: kubeadm_init.changed + copy: + content: "{{ kubeadm_init.stdout }}\n" + dest: /etc/kubernetes/kubeadm-init.log + +### cluster is already initialized + +- name: prepare cluster for new nodes + when: kubeconfig_admin_stats.stat.exists == True + block: + + - name: fetch list of current nodes + command: kubectl get nodes -o name + changed_when: False + check_mode: no + register: kubectl_node_list + + - name: save list of current nodes + set_fact: + kubernetes_current_nodes: "{{ kubectl_node_list.stdout_lines | map('replace', 'node/', '') | list }}" + + - name: create bootstrap token for existing cluster + when: kubernetes_nodes | difference(kubernetes_current_nodes) | length > 0 + command: kubeadm token create --ttl 42m + check_mode: no + register: kubeadm_token_create + +## + +- name: check if master is tainted (1/2) + command: "kubectl --kubeconfig /etc/kubernetes/admin.conf get node {{ inventory_hostname }} -o json" + check_mode: no + register: kubectl_get_node + changed_when: False + +- name: check if master is tainted (2/2) + set_fact: + kube_node_taints: "{% set node_info = kubectl_get_node.stdout | from_json %}{%if node_info.spec.taints is defined %}{{ node_info.spec.taints | map(attribute='key') | list }}{% endif %}" + +- name: remove taint from master node + when: "kubernetes.dedicated_master == False and 'node-role.kubernetes.io/master' in kube_node_taints" + command: kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes --all node-role.kubernetes.io/master- + +- name: add taint for master node + when: "kubernetes.dedicated_master == True and 'node-role.kubernetes.io/master' not in kube_node_taints" + command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ ansible_nodename }} node-role.kubernetes.io/master='':NoSchedule" + +- name: install openssl + apt: + name: openssl + state: present + +- name: get ca certificate digest + shell: "openssl x509 -pubkey -in /etc/kubernetes/pki/ca.crt | openssl rsa -pubin -outform der 2>/dev/null | openssl dgst -sha256 -hex | sed 's/^.* //'" + check_mode: no + register: kube_ca_openssl + changed_when: False + +- name: set variables needed by kubernetes/nodes to join the cluster + set_fact: + kube_bootstrap_token: "{% if kubeadm_token_generate.stdout is defined %}{{ kubeadm_token_generate.stdout }}{% elif kubeadm_token_create.stdout is defined %}{{ kubeadm_token_create.stdout }}{% endif %}" + kube_bootstrap_ca_cert_hash: "sha256:{{ kube_ca_openssl.stdout }}" + +- name: prepare kubectl (1/2) + file: + name: /root/.kube + state: directory + +- name: prepare kubectl (2/2) + file: + dest: /root/.kube/config + src: /etc/kubernetes/admin.conf + state: link diff --git a/roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 b/roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 new file mode 100644 index 00000000..07c4dddd --- /dev/null +++ b/roles/kubernetes/kubeadm/master/templates/kubeadm-cluster.config.j2 @@ -0,0 +1,34 @@ +{# https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1 #} +apiVersion: kubeadm.k8s.io/v1beta1 +kind: ClusterConfiguration +kubernetesVersion: v{{ kubernetes.version }} +clusterName: {{ kubernetes.cluster_name }} +certificatesDir: /etc/kubernetes/pki +{% if kubernetes.api_advertise_ip %} +controlPlaneEndpoint: "{{ kubernetes.api_advertise_ip }}:6443" +{% endif %} +imageRepository: k8s.gcr.io +networking: + dnsDomain: cluster.local + podSubnet: {{ kubernetes.pod_ip_range }} + serviceSubnet: {{ kubernetes.service_ip_range }} +etcd: + local: + dataDir: /var/lib/etcd +apiServer: +{% if kubernetes.api_extra_sans | length > 0 %} + certSANs: +{% for san in kubernetes.api_extra_sans %} + - {{ san }} +{% endfor %} +{% endif %} + extraArgs: +{% if kubernetes.api_advertise_ip %} + advertise-address: {{ kubernetes.api_advertise_ip }} +{% endif %} + authorization-mode: Node,RBAC + timeoutForControlPlane: 4m0s +controllerManager: {} +scheduler: {} +dns: + type: CoreDNS diff --git a/roles/kubernetes/kubeadm/node/tasks/main.yml b/roles/kubernetes/kubeadm/node/tasks/main.yml new file mode 100644 index 00000000..9f0057f9 --- /dev/null +++ b/roles/kubernetes/kubeadm/node/tasks/main.yml @@ -0,0 +1,18 @@ +--- +- name: get master vars + set_fact: + kube_bootstrap_token: "{{ hostvars[kubernetes_master].kube_bootstrap_token }}" + kube_bootstrap_ca_cert_hash: "{{ hostvars[kubernetes_master].kube_bootstrap_ca_cert_hash }}" + kube_master_addr: "{{ kubernetes.api_advertise_ip | default(hostvars[kubernetes_master].ansible_default_ipv4.address) }}" + +- name: join kubernetes node + command: "kubeadm join --token {{ kube_bootstrap_token }} {{ kube_master_addr }}:6443 --discovery-token-ca-cert-hash {{ kube_bootstrap_ca_cert_hash }}" + args: + creates: /etc/kubernetes/kubelet.conf + register: kubeadm_join + +- name: dump output of kubeadm join to log file + when: kubeadm_join.changed + copy: + content: "{{ kubeadm_join.stdout }}\n" + dest: /etc/kubernetes/kubeadm-join.log diff --git a/roles/kubernetes/kubeadm/reset/tasks/main.yml b/roles/kubernetes/kubeadm/reset/tasks/main.yml new file mode 100644 index 00000000..a6d64c7d --- /dev/null +++ b/roles/kubernetes/kubeadm/reset/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- name: clean up settings and files created by kubeadm + command: kubeadm reset -f diff --git a/roles/kubernetes/master/tasks/main.yml b/roles/kubernetes/master/tasks/main.yml deleted file mode 100644 index 7cc6fe94..00000000 --- a/roles/kubernetes/master/tasks/main.yml +++ /dev/null @@ -1,109 +0,0 @@ ---- -- name: check if kubeconfig admin.conf already exists - stat: - path: /etc/kubernetes/admin.conf - register: kubeconfig_admin_stats - -### cluster not yet initialized - -- name: create new cluster - when: kubeconfig_admin_stats.stat.exists == False - block: - - - name: generate bootstrap token for new cluster - command: kubeadm token generate - changed_when: False - check_mode: no - register: kubeadm_token_generate - - - name: create kubernetes config directory - file: - path: /etc/kubernetes - state: directory - - ## TODO test whether the generated cluster configs really works - since it has never been used... - - name: install cluster config for kubeadm - template: - src: kubeadm-cluster.config.j2 - dest: /etc/kubernetes/kubeadm-cluster.config - - - name: set up kubernetes master - command: "kubeadm init --config '/etc/kubernetes/kubeadm-cluster.config' --token '{{ kubeadm_token_generate.stdout }}' --token-ttl 42m --skip-token-print" - args: - creates: /etc/kubernetes/pki/ca.crt - register: kubeadm_init - - - name: dump output of kubeadm init to log file - when: kubeadm_init.changed - copy: - content: "{{ kubeadm_init.stdout }}\n" - dest: /etc/kubernetes/kubeadm-init.log - -### cluster is already initialized - -- name: prepare cluster for new nodes - when: kubeconfig_admin_stats.stat.exists == True - block: - - - name: fetch list of current nodes - command: kubectl get nodes -o name - changed_when: False - check_mode: no - register: kubectl_node_list - - - name: save list of current nodes - set_fact: - kubernetes_current_nodes: "{{ kubectl_node_list.stdout_lines | map('replace', 'node/', '') | list }}" - - - name: create bootstrap token for existing cluster - when: kubernetes_nodes | difference(kubernetes_current_nodes) | length > 0 - command: kubeadm token create --ttl 42m - check_mode: no - register: kubeadm_token_create - -## - -- name: check if master is tainted (1/2) - command: "kubectl --kubeconfig /etc/kubernetes/admin.conf get node {{ inventory_hostname }} -o json" - check_mode: no - register: kubectl_get_node - changed_when: False - -- name: check if master is tainted (2/2) - set_fact: - kube_node_taints: "{% set node_info = kubectl_get_node.stdout | from_json %}{%if node_info.spec.taints is defined %}{{ node_info.spec.taints | map(attribute='key') | list }}{% endif %}" - -- name: remove taint from master node - when: "kubernetes.dedicated_master == False and 'node-role.kubernetes.io/master' in kube_node_taints" - command: kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes --all node-role.kubernetes.io/master- - -- name: add taint for master node - when: "kubernetes.dedicated_master == True and 'node-role.kubernetes.io/master' not in kube_node_taints" - command: "kubectl --kubeconfig /etc/kubernetes/admin.conf taint nodes {{ ansible_nodename }} node-role.kubernetes.io/master='':NoSchedule" - -- name: install openssl - apt: - name: openssl - state: present - -- name: get ca certificate digest - shell: "openssl x509 -pubkey -in /etc/kubernetes/pki/ca.crt | openssl rsa -pubin -outform der 2>/dev/null | openssl dgst -sha256 -hex | sed 's/^.* //'" - check_mode: no - register: kube_ca_openssl - changed_when: False - -- name: set variables needed by kubernetes/nodes to join the cluster - set_fact: - kube_bootstrap_token: "{% if kubeadm_token_generate.stdout is defined %}{{ kubeadm_token_generate.stdout }}{% elif kubeadm_token_create.stdout is defined %}{{ kubeadm_token_create.stdout }}{% endif %}" - kube_bootstrap_ca_cert_hash: "sha256:{{ kube_ca_openssl.stdout }}" - -- name: prepare kubectl (1/2) - file: - name: /root/.kube - state: directory - -- name: prepare kubectl (2/2) - file: - dest: /root/.kube/config - src: /etc/kubernetes/admin.conf - state: link diff --git a/roles/kubernetes/master/templates/kubeadm-cluster.config.j2 b/roles/kubernetes/master/templates/kubeadm-cluster.config.j2 deleted file mode 100644 index 07c4dddd..00000000 --- a/roles/kubernetes/master/templates/kubeadm-cluster.config.j2 +++ /dev/null @@ -1,34 +0,0 @@ -{# https://godoc.org/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta1 #} -apiVersion: kubeadm.k8s.io/v1beta1 -kind: ClusterConfiguration -kubernetesVersion: v{{ kubernetes.version }} -clusterName: {{ kubernetes.cluster_name }} -certificatesDir: /etc/kubernetes/pki -{% if kubernetes.api_advertise_ip %} -controlPlaneEndpoint: "{{ kubernetes.api_advertise_ip }}:6443" -{% endif %} -imageRepository: k8s.gcr.io -networking: - dnsDomain: cluster.local - podSubnet: {{ kubernetes.pod_ip_range }} - serviceSubnet: {{ kubernetes.service_ip_range }} -etcd: - local: - dataDir: /var/lib/etcd -apiServer: -{% if kubernetes.api_extra_sans | length > 0 %} - certSANs: -{% for san in kubernetes.api_extra_sans %} - - {{ san }} -{% endfor %} -{% endif %} - extraArgs: -{% if kubernetes.api_advertise_ip %} - advertise-address: {{ kubernetes.api_advertise_ip }} -{% endif %} - authorization-mode: Node,RBAC - timeoutForControlPlane: 4m0s -controllerManager: {} -scheduler: {} -dns: - type: CoreDNS diff --git a/roles/kubernetes/net/files/kubenet-interfaces.service b/roles/kubernetes/net/files/kubenet-interfaces.service deleted file mode 100644 index f27fb85b..00000000 --- a/roles/kubernetes/net/files/kubenet-interfaces.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Kubernetes Network Interfaces -After=network.target - -[Service] -Type=oneshot -ExecStart=/var/lib/kubenet/ifupdown.sh up -ExecStop=/var/lib/kubenet/ifupdown.sh down -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/roles/kubernetes/net/filter_plugins/kubenet.py b/roles/kubernetes/net/filter_plugins/kubenet.py deleted file mode 100644 index c1312dd8..00000000 --- a/roles/kubernetes/net/filter_plugins/kubenet.py +++ /dev/null @@ -1,33 +0,0 @@ -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - -from ansible import errors - - -def direct_net_zone(data, myname, peer): - try: - zones = [] - for zone in data: - if myname in data[zone]['node_interface'] and peer in data[zone]['node_interface']: - zones.append(zone) - - if not zones: - return "" - if len(zones) > 1: - raise errors.AnsibleFilterError("host '%s' and '%s' have multiple direct net zones in common: %s" % - (myname, peer, zones.join(','))) - return zones[0] - - except Exception as e: - raise errors.AnsibleFilterError("direct_net_zones(): %s" % str(e)) - - -class FilterModule(object): - - ''' Kubernetes Network Filters ''' - filter_map = { - 'direct_net_zone': direct_net_zone, - } - - def filters(self): - return self.filter_map diff --git a/roles/kubernetes/net/handlers/main.yml b/roles/kubernetes/net/handlers/main.yml deleted file mode 100644 index bb7fde2b..00000000 --- a/roles/kubernetes/net/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: reload systemd - systemd: - daemon_reload: yes diff --git a/roles/kubernetes/net/kubeguard/files/kubeguard-interfaces.service b/roles/kubernetes/net/kubeguard/files/kubeguard-interfaces.service new file mode 100644 index 00000000..f45df88a --- /dev/null +++ b/roles/kubernetes/net/kubeguard/files/kubeguard-interfaces.service @@ -0,0 +1,12 @@ +[Unit] +Description=Kubernetes Network Interfaces +After=network.target + +[Service] +Type=oneshot +ExecStart=/var/lib/kubeguard/ifupdown.sh up +ExecStop=/var/lib/kubeguard/ifupdown.sh down +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/roles/kubernetes/net/kubeguard/filter_plugins/kubeguard.py b/roles/kubernetes/net/kubeguard/filter_plugins/kubeguard.py new file mode 100644 index 00000000..199ff14b --- /dev/null +++ b/roles/kubernetes/net/kubeguard/filter_plugins/kubeguard.py @@ -0,0 +1,33 @@ +from __future__ import (absolute_import, division, print_function) +__metaclass__ = type + +from ansible import errors + + +def direct_net_zone(data, myname, peer): + try: + zones = [] + for zone in data: + if myname in data[zone]['node_interface'] and peer in data[zone]['node_interface']: + zones.append(zone) + + if not zones: + return "" + if len(zones) > 1: + raise errors.AnsibleFilterError("host '%s' and '%s' have multiple direct net zones in common: %s" % + (myname, peer, zones.join(','))) + return zones[0] + + except Exception as e: + raise errors.AnsibleFilterError("direct_net_zones(): %s" % str(e)) + + +class FilterModule(object): + + ''' Kubeguard Network Filters ''' + filter_map = { + 'direct_net_zone': direct_net_zone, + } + + def filters(self): + return self.filter_map diff --git a/roles/kubernetes/net/kubeguard/handlers/main.yml b/roles/kubernetes/net/kubeguard/handlers/main.yml new file mode 100644 index 00000000..bb7fde2b --- /dev/null +++ b/roles/kubernetes/net/kubeguard/handlers/main.yml @@ -0,0 +1,4 @@ +--- +- name: reload systemd + systemd: + daemon_reload: yes diff --git a/roles/kubernetes/net/kubeguard/meta/main.yml b/roles/kubernetes/net/kubeguard/meta/main.yml new file mode 100644 index 00000000..5017b623 --- /dev/null +++ b/roles/kubernetes/net/kubeguard/meta/main.yml @@ -0,0 +1,4 @@ +--- +dependencies: +- role: wireguard + when: kubeguard_remove_node is not defined diff --git a/roles/kubernetes/net/kubeguard/tasks/add.yml b/roles/kubernetes/net/kubeguard/tasks/add.yml new file mode 100644 index 00000000..b604302b --- /dev/null +++ b/roles/kubernetes/net/kubeguard/tasks/add.yml @@ -0,0 +1,103 @@ +--- +- name: create network config directory + file: + name: /var/lib/kubeguard/ + state: directory + +- name: configure wireguard port + set_fact: + kubeguard_wireguard_port: "{{ kubernetes.wireguard_port | default(51820) }}" + +- name: install ifupdown script + template: + src: ifupdown.sh.j2 + dest: /var/lib/kubeguard/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/kubeguard/kube-wg0.privatekey" + args: + creates: /var/lib/kubeguard/kube-wg0.privatekey + +- name: fetch wireguard public key + shell: "wg pubkey < /var/lib/kubeguard/kube-wg0.privatekey" + register: kubeguard_wireguard_pubkey + changed_when: false + check_mode: no + +- name: install systemd service unit for network interfaces + copy: + src: kubeguard-interfaces.service + dest: /etc/systemd/system/kubeguard-interfaces.service + # TODO: notify: reload??? + +- name: make sure kubeguard interfaces service is started and enabled + systemd: + daemon_reload: yes + name: kubeguard-interfaces.service + state: started + enabled: yes + +- name: get list of currently installed kubeguard peers + find: + path: /etc/systemd/system/ + pattern: "kubeguard-peer-*.service" + register: kubeguard_peers_installed + +- name: compute list of peers to be added + set_fact: + kubeguard_peers_to_add: "{{ kubernetes_nodes | difference(inventory_hostname) }}" + +- name: compute list of peers to be removed + set_fact: + kubeguard_peers_to_remove: "{{ kubeguard_peers_installed.files | map(attribute='path') | map('replace', '/etc/systemd/system/kubeguard-peer-', '') | map('replace', '.service', '') | difference(kubeguard_peers_to_add) }}" + +- name: stop/disable systemd units for stale kubeguard peers + loop: "{{ kubeguard_peers_to_remove }}" + systemd: + name: "kubeguard-peer-{{ item }}.service" + state: stopped + enabled: no + +- name: remove systemd units for stale kubeguard peers + loop: "{{ kubeguard_peers_to_remove }}" + file: + name: "/etc/systemd/system/kubeguard-peer-{{ item }}.service" + state: absent + +- name: install systemd units for every kubeguard peer + loop: "{{ kubeguard_peers_to_add }}" + loop_control: + loop_var: peer + template: + src: kubeguard-peer.service.j2 + dest: "/etc/systemd/system/kubeguard-peer-{{ peer }}.service" + # TODO: notify restart for peers that change... + +- name: make sure kubeguard peer services are started and enabled + loop: "{{ kubeguard_peers_to_add }}" + systemd: + daemon_reload: yes + name: "kubeguard-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/kubeguard/tasks/main.yml b/roles/kubernetes/net/kubeguard/tasks/main.yml new file mode 100644 index 00000000..0e87af11 --- /dev/null +++ b/roles/kubernetes/net/kubeguard/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- name: add node to overlay network + include_tasks: add.yml + when: kubeguard_remove_node is not defined + +- name: remove node from overlay network + include_tasks: remove.yml + when: kubeguard_remove_node is defined diff --git a/roles/kubernetes/net/kubeguard/tasks/remove.yml b/roles/kubernetes/net/kubeguard/tasks/remove.yml new file mode 100644 index 00000000..d24f9eff --- /dev/null +++ b/roles/kubernetes/net/kubeguard/tasks/remove.yml @@ -0,0 +1,26 @@ +--- +- name: check if kubeguard interface service unit exists + stat: + path: /etc/systemd/system/kubeguard-interfaces.service + register: kubeguard_interface_unit + +- name: bring down kubeguard interface + systemd: + name: kubeguard-interfaces.service + state: stopped + when: kubeguard_interface_unit.stat.exists + +- name: gather list of all kubeguard related service units + find: + path: /etc/systemd/system/ + patterns: + - "kubeguard-peer-*.service" + - kubeguard-interfaces.service + register: kubeguard_units_installed + +- name: remove all kubeguard related files and directories + loop: "{{ kubeguard_units_installed.files | map(attribute='path') | list | flatten | union(['/var/lib/kubeguard']) }}" + file: + path: "{{ item }}" + state: absent + notify: reload systemd diff --git a/roles/kubernetes/net/kubeguard/templates/ifupdown.sh.j2 b/roles/kubernetes/net/kubeguard/templates/ifupdown.sh.j2 new file mode 100644 index 00000000..87849ee9 --- /dev/null +++ b/roles/kubernetes/net/kubeguard/templates/ifupdown.sh.j2 @@ -0,0 +1,55 @@ +#!/bin/bash + +set -e + +CONF_D="/var/lib/kubeguard/" + +INET_IF="{{ ansible_default_ipv4.interface }}" + +POD_NET_CIDR="{{ kubernetes.pod_ip_range }}" + +{% set br_net = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[inventory_hostname]) -%} +BR_IF="kube-br0" +BR_IP="{{ br_net | ipaddr(1) | ipaddr('address') }}" +BR_IP_CIDR="{{ br_net | ipaddr(1) }}" +BR_NET_CIDR="{{ br_net }}" + +TUN_IF="kube-wg0" +TUN_IP_CIDR="{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, 0) | ipaddr(kubernetes.net_index[inventory_hostname]) }}" + + +case "$1" in + up) + # bring up bridge for local pods + ip link add dev "$BR_IF" type bridge + ip addr add dev "$BR_IF" "$BR_IP_CIDR" + ip link set up dev "$BR_IF" + iptables -t nat -A POSTROUTING -s "$BR_NET_CIDR" -o "$INET_IF" -j MASQUERADE + modprobe br_netfilter + + # bring up wireguard tunnel to other nodes + ip link add dev "$TUN_IF" type wireguard + ip addr add dev "$TUN_IF" "$TUN_IP_CIDR" + wg set "$TUN_IF" listen-port {{ kubeguard_wireguard_port }} private-key "$CONF_D/$TUN_IF.privatekey" + ip link set up dev "$TUN_IF" + + # make pods and service IPs reachable + # !!! use IP of bridge as source so we don't produce martians if direct-zones are involved!!! + ip route add "$POD_NET_CIDR" dev "$TUN_IF" src "$BR_IP" + ;; + down) + # bring down wireguard tunnel to other nodes + ip route del "$POD_NET_CIDR" dev "$TUN_IF" + ip link del dev "$TUN_IF" + + # bring down bridge for local pods + iptables -t nat -D POSTROUTING -s "$BR_NET_CIDR" -o "$INET_IF" -j MASQUERADE + ip link del dev "$BR_IF" + ;; + *) + echo "usage: $0 (up|down)" + exit 1 + ;; +esac + +exit 0 diff --git a/roles/kubernetes/net/kubeguard/templates/k8s.json.j2 b/roles/kubernetes/net/kubeguard/templates/k8s.json.j2 new file mode 100644 index 00000000..f457ed1c --- /dev/null +++ b/roles/kubernetes/net/kubeguard/templates/k8s.json.j2 @@ -0,0 +1,12 @@ +{ + "cniVersion": "0.3.1", + "name": "k8s", + "type": "bridge", + "bridge": "kube-br0", + "isDefaultGateway": true, + "hairpinMode": true, + "ipam": { + "type": "host-local", + "subnet": "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[inventory_hostname]) }}" + } +} diff --git a/roles/kubernetes/net/kubeguard/templates/kubeguard-peer.service.j2 b/roles/kubernetes/net/kubeguard/templates/kubeguard-peer.service.j2 new file mode 100644 index 00000000..54251caf --- /dev/null +++ b/roles/kubernetes/net/kubeguard/templates/kubeguard-peer.service.j2 @@ -0,0 +1,36 @@ +[Unit] +Description=Kubernetes Network Peer {{ peer }} +After=network.target +Requires=kubeguard-interfaces.service +After=kubeguard-interfaces.service + +{% set pod_net_peer = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[peer]) -%} +{% set direct_zone = kubernetes.direct_net_zones | direct_net_zone(inventory_hostname, peer) -%} +{% if direct_zone %} +{% set direct_ip = kubernetes.direct_net_zones[direct_zone].transfer_net | ipaddr(kubernetes.net_index[inventory_hostname]) %} +{% set direct_interface = kubernetes.direct_net_zones[direct_zone].node_interface[inventory_hostname] %} +{% set direct_ip_peer = kubernetes.direct_net_zones[direct_zone].transfer_net | ipaddr(kubernetes.net_index[peer]) %} +{% else %} +{% set tun_ip = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, 0) | ipaddr(kubernetes.net_index[peer]) -%} +{% set wg_pubkey = hostvars[peer].kubeguard_wireguard_pubkey.stdout -%} +{% set wg_host = hostvars[peer].external_ip | default(hostvars[peer].ansible_default_ipv4.address) -%} +{% set wg_port = hostvars[peer].kubeguard_wireguard_port -%} +{% set wg_allowedips = (tun_ip | ipaddr('address')) + "/32," + pod_net_peer %} +{% endif %} +[Service] +Type=oneshot +{% if direct_zone %} +ExecStart=/sbin/ip addr add {{ direct_ip }} dev {{ direct_interface }} +ExecStart=/sbin/ip link set up dev {{ direct_interface }} +ExecStart=/sbin/ip route add {{ pod_net_peer }} via {{ direct_ip_peer | ipaddr('address') }} +ExecStop=/sbin/ip route del {{ pod_net_peer }} +ExecStop=/sbin/ip link set down dev {{ direct_interface }} +ExecStop=/sbin/ip addr del {{ direct_ip }} dev {{ direct_interface }} +{% else %} +ExecStart=/usr/bin/wg set kube-wg0 peer {{ wg_pubkey }} allowed-ips {{ wg_allowedips }} endpoint {{ wg_host }}:{{ wg_port }} persistent-keepalive 10 +ExecStop=/usr/bin/wg set kube-wg0 peer {{ wg_pubkey }} remove +{% endif %} +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/roles/kubernetes/net/meta/main.yml b/roles/kubernetes/net/meta/main.yml deleted file mode 100644 index a3d4d97b..00000000 --- a/roles/kubernetes/net/meta/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -dependencies: -- role: wireguard - when: kubernetes_remove_node is not defined diff --git a/roles/kubernetes/net/tasks/add.yml b/roles/kubernetes/net/tasks/add.yml deleted file mode 100644 index 4fe7c5e2..00000000 --- a/roles/kubernetes/net/tasks/add.yml +++ /dev/null @@ -1,103 +0,0 @@ ---- -- 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 - loop: "{{ kubenet_peers_to_remove }}" - systemd: - name: "kubenet-peer-{{ item }}.service" - state: stopped - enabled: no - -- name: remove systemd units for stale kubenet peers - loop: "{{ kubenet_peers_to_remove }}" - file: - name: "/etc/systemd/system/kubenet-peer-{{ item }}.service" - state: absent - -- name: install systemd units for every kubenet peer - loop: "{{ 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 - loop: "{{ 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.yml b/roles/kubernetes/net/tasks/main.yml deleted file mode 100644 index 8aa7221e..00000000 --- a/roles/kubernetes/net/tasks/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: add node to overlay network - include_tasks: add.yml - when: kubernetes_remove_node is not defined - -- name: remove node from overlay network - include_tasks: remove.yml - when: kubernetes_remove_node is defined diff --git a/roles/kubernetes/net/tasks/remove.yml b/roles/kubernetes/net/tasks/remove.yml deleted file mode 100644 index e74f42c1..00000000 --- a/roles/kubernetes/net/tasks/remove.yml +++ /dev/null @@ -1,26 +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 - loop: "{{ kubenet_units_installed.files | map(attribute='path') | list | flatten | union(['/var/lib/kubenet']) }}" - file: - path: "{{ item }}" - state: absent - notify: reload systemd diff --git a/roles/kubernetes/net/templates/ifupdown.sh.j2 b/roles/kubernetes/net/templates/ifupdown.sh.j2 deleted file mode 100644 index 995d358b..00000000 --- a/roles/kubernetes/net/templates/ifupdown.sh.j2 +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -set -e - -CONF_D="/var/lib/kubenet/" - -INET_IF="{{ ansible_default_ipv4.interface }}" - -POD_NET_CIDR="{{ kubernetes.pod_ip_range }}" - -{% set br_net = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[inventory_hostname]) -%} -BR_IF="kube-br0" -BR_IP="{{ br_net | ipaddr(1) | ipaddr('address') }}" -BR_IP_CIDR="{{ br_net | ipaddr(1) }}" -BR_NET_CIDR="{{ br_net }}" - -TUN_IF="kube-wg0" -TUN_IP_CIDR="{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, 0) | ipaddr(kubernetes.net_index[inventory_hostname]) }}" - - -case "$1" in - up) - # bring up bridge for local pods - ip link add dev "$BR_IF" type bridge - ip addr add dev "$BR_IF" "$BR_IP_CIDR" - ip link set up dev "$BR_IF" - iptables -t nat -A POSTROUTING -s "$BR_NET_CIDR" -o "$INET_IF" -j MASQUERADE - modprobe br_netfilter - - # bring up wireguard tunnel to other nodes - ip link add dev "$TUN_IF" type wireguard - ip addr add dev "$TUN_IF" "$TUN_IP_CIDR" - wg set "$TUN_IF" listen-port {{ kubenet_wireguard_port }} private-key "$CONF_D/$TUN_IF.privatekey" - ip link set up dev "$TUN_IF" - - # make pods and service IPs reachable - # !!! use IP of bridge as source so we don't produce martians if direct-zones are involved!!! - ip route add "$POD_NET_CIDR" dev "$TUN_IF" src "$BR_IP" - ;; - down) - # bring down wireguard tunnel to other nodes - ip route del "$POD_NET_CIDR" dev "$TUN_IF" - ip link del dev "$TUN_IF" - - # bring down bridge for local pods - iptables -t nat -D POSTROUTING -s "$BR_NET_CIDR" -o "$INET_IF" -j MASQUERADE - ip link del dev "$BR_IF" - ;; - *) - echo "usage: $0 (up|down)" - exit 1 - ;; -esac - -exit 0 diff --git a/roles/kubernetes/net/templates/k8s.json.j2 b/roles/kubernetes/net/templates/k8s.json.j2 deleted file mode 100644 index f457ed1c..00000000 --- a/roles/kubernetes/net/templates/k8s.json.j2 +++ /dev/null @@ -1,12 +0,0 @@ -{ - "cniVersion": "0.3.1", - "name": "k8s", - "type": "bridge", - "bridge": "kube-br0", - "isDefaultGateway": true, - "hairpinMode": true, - "ipam": { - "type": "host-local", - "subnet": "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[inventory_hostname]) }}" - } -} diff --git a/roles/kubernetes/net/templates/kubenet-peer.service.j2 b/roles/kubernetes/net/templates/kubenet-peer.service.j2 deleted file mode 100644 index bee211af..00000000 --- a/roles/kubernetes/net/templates/kubenet-peer.service.j2 +++ /dev/null @@ -1,36 +0,0 @@ -[Unit] -Description=Kubernetes Network Peer {{ peer }} -After=network.target -Requires=kubenet-interfaces.service -After=kubenet-interfaces.service - -{% set pod_net_peer = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[peer]) -%} -{% set direct_zone = kubernetes.direct_net_zones | direct_net_zone(inventory_hostname, peer) -%} -{% if direct_zone %} -{% set direct_ip = kubernetes.direct_net_zones[direct_zone].transfer_net | ipaddr(kubernetes.net_index[inventory_hostname]) %} -{% set direct_interface = kubernetes.direct_net_zones[direct_zone].node_interface[inventory_hostname] %} -{% set direct_ip_peer = kubernetes.direct_net_zones[direct_zone].transfer_net | ipaddr(kubernetes.net_index[peer]) %} -{% else %} -{% set tun_ip = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, 0) | ipaddr(kubernetes.net_index[peer]) -%} -{% set wg_pubkey = hostvars[peer].kubenet_wireguard_pubkey.stdout -%} -{% set wg_host = hostvars[peer].external_ip | default(hostvars[peer].ansible_default_ipv4.address) -%} -{% set wg_port = hostvars[peer].kubenet_wireguard_port -%} -{% set wg_allowedips = (tun_ip | ipaddr('address')) + "/32," + pod_net_peer %} -{% endif %} -[Service] -Type=oneshot -{% if direct_zone %} -ExecStart=/sbin/ip addr add {{ direct_ip }} dev {{ direct_interface }} -ExecStart=/sbin/ip link set up dev {{ direct_interface }} -ExecStart=/sbin/ip route add {{ pod_net_peer }} via {{ direct_ip_peer | ipaddr('address') }} -ExecStop=/sbin/ip route del {{ pod_net_peer }} -ExecStop=/sbin/ip link set down dev {{ direct_interface }} -ExecStop=/sbin/ip addr del {{ direct_ip }} dev {{ direct_interface }} -{% else %} -ExecStart=/usr/bin/wg set kube-wg0 peer {{ wg_pubkey }} allowed-ips {{ wg_allowedips }} endpoint {{ wg_host }}:{{ wg_port }} persistent-keepalive 10 -ExecStop=/usr/bin/wg set kube-wg0 peer {{ wg_pubkey }} remove -{% endif %} -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/roles/kubernetes/node/tasks/add.yml b/roles/kubernetes/node/tasks/add.yml deleted file mode 100644 index 9f0057f9..00000000 --- a/roles/kubernetes/node/tasks/add.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: get master vars - set_fact: - kube_bootstrap_token: "{{ hostvars[kubernetes_master].kube_bootstrap_token }}" - kube_bootstrap_ca_cert_hash: "{{ hostvars[kubernetes_master].kube_bootstrap_ca_cert_hash }}" - kube_master_addr: "{{ kubernetes.api_advertise_ip | default(hostvars[kubernetes_master].ansible_default_ipv4.address) }}" - -- name: join kubernetes node - command: "kubeadm join --token {{ kube_bootstrap_token }} {{ kube_master_addr }}:6443 --discovery-token-ca-cert-hash {{ kube_bootstrap_ca_cert_hash }}" - args: - creates: /etc/kubernetes/kubelet.conf - register: kubeadm_join - -- name: dump output of kubeadm join to log file - when: kubeadm_join.changed - copy: - content: "{{ kubeadm_join.stdout }}\n" - dest: /etc/kubernetes/kubeadm-join.log diff --git a/roles/kubernetes/node/tasks/main.yml b/roles/kubernetes/node/tasks/main.yml deleted file mode 100644 index e29fbc29..00000000 --- a/roles/kubernetes/node/tasks/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: add node cluster - include_tasks: add.yml - when: kubernetes_remove_node is not defined - -- name: remove node from cluster - include_tasks: remove.yml - when: kubernetes_remove_node is defined diff --git a/roles/kubernetes/node/tasks/remove.yml b/roles/kubernetes/node/tasks/remove.yml deleted file mode 100644 index a6d64c7d..00000000 --- a/roles/kubernetes/node/tasks/remove.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: clean up settings and files created by kubeadm - command: kubeadm reset -f -- cgit v1.2.3