WIP to be squashed properly

Author: Julien Girardin

roles/bootstrap_token/tasks/main.yaml

@@ -4,6 +4,7 @@
     nodes_to_join: >-
       {{ q('inventory_hostnames', kube_cp_group ~ ':' ~ kube_worker_group)
          |map('extract', hostvars)
+         |selectattr('_kubelet_config_stat', 'defined')
          |rejectattr('_kubelet_config_stat.stat.exists')
          |map(attribute='inventory_hostname')|list }}
   run_once: true

roles/common_vars/defaults/main.yml

@@ -6,3 +6,6 @@ kube_cp_group: kube_control_plane
 kube_worker_group: kube_workers
 
 cp_node: '{{ (groups.cp_running|default(groups[kube_cp_group]))|first }}'
+
+target_kube_version: '{{ hostvars[cp_node].target_kube_version }}'
+target_kubeadm_version: '{{ hostvars[cp_node].target_kubeadm_version }}'

roles/packages/meta/main.yml

@@ -1,19 +1,4 @@
 ---
 dependencies:
   - role: packages_common
-galaxy_info:
-  author: Julien Girardin
-  description: Install kubernetes related packages
-  company: Enix
-  license: Apache
-  min_ansible_version: 2.7
-  platforms:
-    - name: Ubuntu
-      versions:
-        - 18.04
-        - 20.04
-  galaxy_tags:
-    - kubernetes
-    - kubeadm
-    - kubelet
-    - kubectl
+  - role: common_vars

tests/conftest.py

@@ -95,8 +95,8 @@ def vagrant(tmpdir):
     return LocalVagrant(inventory_dir_copy=tmpdir)
 
 
-@then("Set cluster {variable} = {value}")
-@given("The cluster {variable) = {value}")
+@then(parsers.parse("Set cluster {variable} = {value}"))
+@given(parsers.parse("The cluster {variable} = {value}"))
 def cluster_set_param(provider, variable, value):
     provider.vars[variable] = value
     # Refresh infrastructure
@@ -179,18 +179,12 @@ def ansible_playbook(
         dry_run = True
     else:
         dry_run = False
-    playbook_list = re.findall(r"[\w./]+", playbooks)
-    if not all(os.path.exists(p) for p in playbook_list):
-        playbook_list_subdir = [os.path.join("playbooks", p) for p in playbook_list]
-        if all(os.path.exists(p) for p in playbook_list_subdir):
-            playbook_list = playbook_list_subdir
-        else:
-            raise ValueError("All playbooks could not be found")
+    playbook_list = re.findall(r"[^\s]+", playbooks)
     result = run_ansible_playbook(
         virtualenv,
-        playbook_list,
-        ansible_extra_args=ansible_extra_args,
         inventory=inventory,
+        playbooks=playbook_list,
+        ansible_extra_args=ansible_extra_args,
         dry_run=dry_run,
     )
     if error:

tests/features/join_nodes.feature

@@ -1,10 +1,10 @@
-Feature: Upgrade
-    A test to upgrade a kubeadm cluster
+Feature: Join Nodes
+    A test to join nodes to a kubeadm cluster
 
-    Scenario: Upgrade via ansible-kubeadm
+    Scenario: Join nodes via ansible-kubeadm
         Given I want ansible 3
         Given The cluster control_plane_count = 1
-        Given The cluster worker_count = 1
+        Given The cluster worker_count = 0
         Given Some running VMs
 
         When With those group_vars on group all:
@@ -18,14 +18,22 @@ Feature: Upgrade
               cgroupDriver: "systemd"
             kube_version: 1.23
         When I run the playbook tests/playbooks/prepare.yml
-        When I run the playbooks 00_apiserver_proxy.yml
-                                 01_site.yml
-        When I run the playbook tests/playbooks/cni.yml
+        When I run the playbooks playbooks/00_apiserver_proxy.yml
+                                 playbooks/01_site.yml
+        When I run the playbooks tests/playbooks/delete_bootstrap_token.yml
 
-        Then Set cluster worker_count = 2
+        Then Set cluster worker_count = 1
+        When I run the playbook tests/playbooks/prepare.yml
+        When I run the playbooks playbooks/01_site.yml --tags bootstrap_token
+        When I reset tasks counters
+        When I run the playbooks playbooks/01_site.yml --tags bootstrap_token
+        Then I should see no orange/yellow changed tasks
+        When I run the playbooks playbooks/01_site.yml --tags join -l *-node-1
+        Then I should have a working cluster
 
-        When With those group_vars on group all: kube_version: 1.24
-        When I run the playbooks 00_apiserver_proxy.yml
-                                 01_site.yml
+        Then Set cluster control_plane_count = 2
+        When I run the playbook tests/playbooks/prepare.yml
+        When I run the playbooks playbooks/00_apiserver_proxy.yml
+                                 playbooks/01_site.yml
 
         Then I should have a working cluster

tests/helpers/ansible.py

@@ -2,6 +2,7 @@
 import os
 
 import ansible_runner
+import ansible_runner.interface
 
 
 def install_ansible(virtualenv, version=None):
@@ -22,36 +23,47 @@ def install_galaxy_deps(virtualenv):
             "install",
             "-r",
             os.path.join(test_dir, "ansible.requirements.yml"),
-            "-p",
-            os.path.join(test_dir, "playbooks/roles"),
         ]
     )
+    #    [
+    #        "ansible-galaxy",
+    #        "collection",
+    #        "install",
+    #        "git+file://{}".format(os.path.dirname(os.path.dirname(os.path.dirname(test_dir)))),
+    #    ]
+    # )
 
 
 def run_ansible_playbook(
-    virtualenv, playbooks, dry_run=False, ansible_extra_args=None, **kwargs
+    virtualenv, inventory, playbooks, dry_run=False, ansible_extra_args=None, **kwargs
 ):
     if isinstance(playbooks, str):
         playbooks = [playbooks]
-    playbooks = [
-        os.path.join(os.path.dirname(__file__), "../..", pbk) for pbk in playbooks
-    ]
+    # playbooks = [
+    #    os.path.join(os.path.dirname(__file__), "../..", pbk) for pbk in playbooks
+    # ]
     # ansible_runner has several "bugs":
     # - Don't accept multiple playbooks on the parameter "playbook" (which is supposed to accept list)
     # - If you pass custom binary it cannot say if ansible or ansible-playbook so doesn't inject playbook anymore
     # => thus, pass playbooks as cmdline
     envvars = dict(os.environ)
     envvars.setdefault("ANSIBLE_HOST_KEY_CHECKING", "false")
     envvars.setdefault("ANSIBLE_FORCE_COLOR", "true")
-    cmdline = " ".join(itertools.chain(ansible_extra_args or [], playbooks))
+    cmdline_args = [
+        "-i",
+        inventory,
+        *itertools.chain(playbooks, ansible_extra_args or []),
+    ]
     if dry_run:
-        cmdline += " -C"
-    return ansible_runner.run(
-        binary=os.path.join(virtualenv.virtualenv, "bin/ansible-playbook"),
-        cmdline=cmdline,
+        cmdline_args += ["-C"]
+    runner = ansible_runner.interface.init_command_config(
+        executable_cmd=os.path.join(virtualenv.virtualenv, "bin/ansible-playbook"),
+        cmdline_args=cmdline_args,
         envvars=envvars,
         **kwargs
     )
+    runner.run()
+    return runner
 
 
 def assert_ansible_error(run):

tests/test_basic.py

@@ -17,3 +17,8 @@ def test_upgrade(operating_system):
 @scenario("features/haproxy.feature", "Test upgrade to haproxy pkg")
 def test_haproxy(operating_system):
     pass
+
+
+@scenario("features/join_nodes.feature", "Join nodes via ansible-kubeadm")
+def test_join_nodes(operating_system):
+    pass