From 8d8bbc294a468f986fb31b94de6fedf007bee39f Mon Sep 17 00:00:00 2001
From: AtzeDeVries <atze.devries@naturalis.nl>
Date: Mon, 17 Sep 2018 09:00:55 +0200
Subject: [PATCH 1/2] fix for resolvconf in ubuntu18

---
 roles/kubernetes/node/tasks/facts.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/roles/kubernetes/node/tasks/facts.yml b/roles/kubernetes/node/tasks/facts.yml
index 41e31c8dc..98a6ba73f 100644
--- a/roles/kubernetes/node/tasks/facts.yml
+++ b/roles/kubernetes/node/tasks/facts.yml
@@ -8,3 +8,14 @@
     standalone_kubelet: >-
       {%- if inventory_hostname in groups['kube-master'] and inventory_hostname not in groups['kube-node'] -%}true{%- else -%}false{%- endif -%}
     kubelet_cgroup_driver_detected: "{{ docker_cgroup_driver_result.stdout }}"
+
+- name: os specific vars
+  include_vars: "{{ item }}"
+  with_first_found:
+    - files:
+        - "{{ ansible_distribution|lower }}-{{ ansible_distribution_version|lower|replace('/', '_') }}.yml"
+        - "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yml"
+        - "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version|lower|replace('/', '_') }}.yml"
+        - "{{ ansible_distribution|lower }}.yml"
+        - "{{ ansible_os_family|lower }}.yml"
+      skip: true

From 482857611a301e59101632e6515cdba0807f1eb2 Mon Sep 17 00:00:00 2001
From: AtzeDeVries <atze.devries@naturalis.nl>
Date: Mon, 17 Sep 2018 09:01:55 +0200
Subject: [PATCH 2/2] added extra var for ubuntu 18 netplan resolv

---
 roles/kubernetes/node/vars/ubuntu-18.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 roles/kubernetes/node/vars/ubuntu-18.yml

diff --git a/roles/kubernetes/node/vars/ubuntu-18.yml b/roles/kubernetes/node/vars/ubuntu-18.yml
new file mode 100644
index 000000000..59bc55dda
--- /dev/null
+++ b/roles/kubernetes/node/vars/ubuntu-18.yml
@@ -0,0 +1,2 @@
+---
+kube_resolv_conf: "/run/systemd/resolve/resolv.conf"