Skip to content

Commit

Permalink
k3s, metallb, kube-vip updates (techno-tim#119)
Browse files Browse the repository at this point in the history
* feat(k3s): Updated to v1.24.6+k3s1

* feat(kube-vip): Update to v0.5.5

* feat(metal-lb): Update to v0.13.6

* fix(pip): Freeze requirements

* fix(lint): Fixed ansible-lint
  • Loading branch information
timothystewart6 authored Oct 15, 2022
1 parent 14508ec commit cb2fa7c
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 17 deletions.
8 changes: 4 additions & 4 deletions inventory/sample/group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
k3s_version: v1.24.4+k3s1
k3s_version: v1.24.6+k3s1
# this is the user that has ssh access to these machines
ansible_user: ansibleuser
systemd_dir: /etc/systemd/system
Expand Down Expand Up @@ -41,11 +41,11 @@ extra_agent_args: >-
{{ extra_args }}
# image tag for kube-vip
kube_vip_tag_version: "v0.5.0"
kube_vip_tag_version: "v0.5.5"

# image tag for metal lb
metal_lb_speaker_tag_version: "v0.13.5"
metal_lb_controller_tag_version: "v0.13.5"
metal_lb_speaker_tag_version: "v0.13.6"
metal_lb_controller_tag_version: "v0.13.6"

# metallb ip range for load balancer
metal_lb_ip_range: "192.168.30.80-192.168.30.90"
6 changes: 4 additions & 2 deletions molecule/resources/verify/from_outside/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
run_once: true
delegate_to: "{{ outside_host }}"
block:
- ansible.builtin.import_tasks: kubecfg-fetch.yml
- name: "Test CASE: Get kube config"
ansible.builtin.import_tasks: kubecfg-fetch.yml
- name: "TEST CASE: Get nodes"
ansible.builtin.include_tasks: test/get-nodes.yml
- name: "TEST CASE: Deploy example"
ansible.builtin.include_tasks: test/deploy-example.yml
always:
- ansible.builtin.import_tasks: kubecfg-cleanup.yml
- name: "TEST CASE: Cleanup"
ansible.builtin.import_tasks: kubecfg-cleanup.yml
81 changes: 71 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,71 @@
ansible-core>=2.13.2
ansible-lint>=6.6.0
jmespath
jsonpatch
kubernetes>=12.0.0
molecule-vagrant>=1.0.0
molecule>=4.0.1
netaddr>=0.8.0
pyyaml>=3.11
yamllint>=1.28.0
ansible-compat==2.2.1
ansible-core==2.13.5
ansible-lint==6.8.2
arrow==1.2.3
attrs==22.1.0
binaryornot==0.4.4
black==22.10.0
bracex==2.3.post1
cachetools==5.2.0
Cerberus==1.3.2
certifi==2022.9.24
cffi==1.15.1
chardet==5.0.0
charset-normalizer==2.1.1
click==8.1.3
click-help-colors==0.9.1
commonmark==0.9.1
cookiecutter==2.1.1
cryptography==38.0.1
distro==1.8.0
enrich==1.2.7
filelock==3.8.0
google-auth==2.12.0
idna==3.4
importlib-resources==5.10.0
Jinja2==3.1.2
jinja2-time==0.2.0
jmespath==1.0.1
jsonpatch==1.32
jsonpointer==2.3
jsonschema==4.16.0
kubernetes==24.2.0
MarkupSafe==2.1.1
molecule==4.0.1
molecule-vagrant==1.0.0
mypy-extensions==0.4.3
netaddr==0.8.0
oauthlib==3.2.1
packaging==21.3
pathspec==0.10.1
pkgutil-resolve-name==1.3.10
platformdirs==2.5.2
pluggy==1.0.0
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycparser==2.21
Pygments==2.13.0
pyparsing==3.0.9
pyrsistent==0.18.1
python-dateutil==2.8.2
python-slugify==6.1.2
python-vagrant==1.0.0
PyYAML==6.0
requests==2.28.1
requests-oauthlib==1.3.1
resolvelib==0.8.1
rich==12.6.0
rsa==4.9
ruamel.yaml==0.17.21
ruamel.yaml.clib==0.2.6
selinux==0.2.1
six==1.16.0
subprocess-tee==0.3.5
text-unidecode==1.3
tomli==2.0.1
typing-extensions==4.4.0
urllib3==1.26.12
wcmatch==8.4.1
websocket-client==1.4.1
yamllint==1.28.0
zipp==3.9.0
2 changes: 1 addition & 1 deletion roles/raspberrypi/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
- raspberry_pi|default(false)
- ansible_facts.lsb.description|default("") is match("Debian.*bullseye")

- name: execute OS related {{ action }} tasks on the Raspberry Pi
- name: execute OS related tasks on the Raspberry Pi - {{ action }}
include_tasks: "{{ item }}"
with_first_found:
- "{{ action }}/{{ detected_distribution }}-{{ detected_distribution_major_version }}.yml"
Expand Down

0 comments on commit cb2fa7c

Please sign in to comment.