Feature/test vagrant (#8)

* add Vagrant driver for a larger test coverage.
* Update build environment.
* Bug in token provisioning for worker instances fixed.
* update README
* update molecule config

Author: bodsch

.ansible-lint

@@ -3,5 +3,3 @@
 skip_list:
   - name[casing]
   - name[template]
-
-...

.editorconfig

@@ -16,8 +16,8 @@ insert_final_newline = true
 max_line_length = 100
 
 [*.py]
+indent_style = space
 indent_size = 4
 
 [*.md]
 trim_trailing_whitespace = false
-

.flake8

@@ -1,14 +1,19 @@
 [flake8]
 
+# E221 multiple spaces before operator
+# E251 unexpected spaces around keyword / parameter equals
+
+ignore = E221,E251
+
 exclude =
   # No need to traverse our git directory
   .git,
   # There's no value in checking cache directories
   __pycache__,
   .tox
 
-
 # E203: https://github.com/python/black/issues/315
 # ignore = D,E741,W503,W504,H,E501,E203
 
 max-line-length = 195
+

.github/workflows/main.yml

@@ -52,18 +52,14 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r test-requirements.txt
 
-      # See: https://github.com/geerlingguy/ansible-role-mysql/issues/422
-      - name: Disable AppArmor
-        run: |
-            set -x
-            sudo apt-get install apparmor-profiles
-            sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-            sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-
       - name: test with tox
         run: |
-          tox -e ansible_$(printf "${{ matrix.ansible-version }}") \
-            -- molecule test --scenario-name default
+          make \
+            test \
+            -e TOX_SCENARIO="${{ matrix.scenario }}" \
+            -e TOX_ANSIBLE="ansible_${{ matrix.ansible-version }}" \
+            -e DISTRIBUTION="${{ matrix.image }}"
+
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
@@ -101,18 +97,13 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r test-requirements.txt
 
-      # See: https://github.com/geerlingguy/ansible-role-mysql/issues/422
-      - name: Disable AppArmor
-        run: |
-            set -x
-            sudo apt-get install apparmor-profiles
-            sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-            sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-
       - name: test with tox
         run: |
-          tox -e ansible_$(printf "${{ matrix.ansible-version }}") \
-            -- molecule test --scenario-name default
+          make \
+            test \
+            -e TOX_SCENARIO="${{ matrix.scenario }}" \
+            -e TOX_ANSIBLE="ansible_${{ matrix.ansible-version }}" \
+            -e DISTRIBUTION="${{ matrix.image }}"
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

.github/workflows/multi-controller.yml

@@ -32,7 +32,7 @@ jobs:
         ansible-version:
           - '6.1'
         scenario:
-          - default
+          - multi-controller
 
     steps:
       - name: check out the codebase.
@@ -50,18 +50,14 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r test-requirements.txt
 
-      # See: https://github.com/geerlingguy/ansible-role-mysql/issues/422
-      - name: Disable AppArmor
-        run: |
-            set -x
-            sudo apt-get install apparmor-profiles
-            sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-            sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-
       - name: test with tox
         run: |
-          tox -e ansible_$(printf "${{ matrix.ansible-version }}") \
-            -- molecule test --scenario-name multi-controller
+          make \
+            test \
+            -e TOX_SCENARIO="${{ matrix.scenario }}" \
+            -e TOX_ANSIBLE="ansible_${{ matrix.ansible-version }}" \
+            -e DISTRIBUTION="${{ matrix.image }}"
+
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

.github/workflows/multi-worker.yml

@@ -32,7 +32,7 @@ jobs:
         ansible-version:
           - '6.1'
         scenario:
-          - default
+          - multi-worker
 
     steps:
       - name: check out the codebase.
@@ -50,18 +50,14 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r test-requirements.txt
 
-      # See: https://github.com/geerlingguy/ansible-role-mysql/issues/422
-      - name: Disable AppArmor
-        run: |
-            set -x
-            sudo apt-get install apparmor-profiles
-            sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
-            sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
-
       - name: test with tox
         run: |
-          tox -e ansible_$(printf "${{ matrix.ansible-version }}") \
-            -- molecule test --scenario-name multi-worker
+          make \
+            test \
+            -e TOX_SCENARIO="${{ matrix.scenario }}" \
+            -e TOX_ANSIBLE="ansible_${{ matrix.ansible-version }}" \
+            -e DISTRIBUTION="${{ matrix.image }}"
+
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'

.gitignore

@@ -1,3 +1,6 @@
 .tox
-__pycache__
 .galaxy_install_info
+*kate-swp
+__pycache__
+.cache
+.directory

.yamllint

@@ -1,27 +1,40 @@
 ---
+# Based on ansible-lint config
 extends: default
+
 rules:
-  line-length:
-    max: 195
-    level: warning
   braces:
-    min-spaces-inside: 0
     max-spaces-inside: 1
+    level: error
   brackets:
-    min-spaces-inside: 0
     max-spaces-inside: 1
-  indentation:
-    spaces: 2
+    level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
   comments: disable
   comments-indentation: disable
+  document-start: disable
+  empty-lines:
+    max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation:
+    spaces: 2
+  key-duplicates: enable
+  line-length:
+    max: 195
+    level: warning
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: disable
   truthy: disable
 
 ignore: |
-  tests/
   molecule/
-  .molecule/
-  .travis.yml
-  .tox/
-  .github/
-  k0s_example.yaml
-  templates/k0s/k0s_1.25.2.yml
+  .github

Makefile

@@ -1,12 +1,14 @@
 #
 export TOX_SCENARIO  ?= default
-# export TOX_PYTHON    ?= py310
 export TOX_ANSIBLE   ?= ansible_6.1
 
 .PHONY: converge destroy verify lint
 
 default: converge
 
+test:
+	@hooks/test
+
 converge:
 	@hooks/converge
 

README.md

@@ -8,13 +8,29 @@ Use vanilla upstream Kubernetes distro [k0s](https://github.com/k0sproject/k0s).
 Similar to [movd/k0s-ansible](https://github.com/movd/k0s-ansible), **but** better (i think so ;) )
 
 
-[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bodsch/ansible-k0s/CI)][ci]
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/bodsch/ansible-k0s/main.yml?branch=main)][ci]
 [![GitHub issues](https://img.shields.io/github/issues/bodsch/ansible-k0s)][issues]
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/bodsch/ansible-k0s)][releases]
+[![Ansible Quality Score](https://img.shields.io/ansible/quality/50067?label=role%20quality)][quality]
 
 [ci]: https://github.com/bodsch/ansible-k0s/actions
 [issues]: https://github.com/bodsch/ansible-k0s/issues?q=is%3Aopen+is%3Aissue
 [releases]: https://github.com/bodsch/ansible-k0s/releases
+[quality]: https://galaxy.ansible.com/bodsch/k0s
+
+
+If `latest` is set for `k0s_version`, the role tries to install the latest release version.  
+**Please use this with caution, as incompatibilities between releases may occur!**
+
+The binaries are installed below `/usr/local/bin/k0s/${k0s_version}` and later linked to `/usr/bin`. 
+This should make it possible to downgrade relatively safely.
+
+The k0s archive is stored on the Ansible controller, unpacked and then the binaries are copied to the target system.
+The cache directory can be defined via the environment variable `CUSTOM_LOCAL_TMP_DIRECTORY`. 
+By default it is `${HOME}/.cache/ansible/k0s`.  
+If this type of installation is not desired, the download can take place directly on the target system. 
+However, this must be explicitly activated by setting `k0s_direct_download` to `true`.
+
 
 
 ## Why better?
@@ -39,9 +55,24 @@ Tested on
 
 ## working implementation
 
-The example of a working implementation can be viewed at [GitLab](https://gitlab.com/kubernetes-cluser).  
+The example of a working implementation can be viewed at [GitLab](https://gitlab.com/integration-tests/k0s).  
 A suitable infrastructure based on KVM and Terraform can be created in the repository.
 
+There are some tests in `molecule` that could be used.
+For reasons that are not clear to me, the tests in a docker container are not very meaningful.
+I have therefore extended the tests with the *Vagrant* driver.
+
+There is a `Makefile` to start the tests:
+
+```shell
+make test -e TOX_SCENARIO=multi-worker
+```
+
+
+```shell
+make test -e TOX_SCENARIO=vagrant-multi-worker
+```
+
 
 ## Contribution
 
@@ -52,7 +83,7 @@ Please read [Contribution](CONTRIBUTING.md)
 
 The `master` Branch is my *Working Horse* includes the "latest, hot shit" and can be complete broken!
 
-If you want to use something stable, please use a [Tagged Version](https://gitlab.com/bodsch/ansible-k0s/-/tags)!
+If you want to use something stable, please use a [Tagged Version](https://github.com/bodsch/ansible-k0s/tags)!
 
 
 ## usage