Skip to content

Commit

Permalink
Update to ansible 2.15 (kubernetes-sigs#10481)
Browse files Browse the repository at this point in the history
* ansible: upgrade to version >= 2.15.5

Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>

* tests: update requirements

Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>

* contrib/openstack: fix wrong gitignore pattern

Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>

* tests: add missing tzdata requirement

Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>

* tests: remove some molecules tests

Those doesn't work in Ansible 2.15. Ansible can't load builtin now
apparently and these tests are not worth it.

Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>

---------

Signed-off-by: Arthur Outhenin-Chalandre <arthur@cri.epita.fr>
  • Loading branch information
MrFreezeex authored and pedromcpedro committed May 8, 2024
1 parent c239e65 commit 775794e
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 100 deletions.
2 changes: 1 addition & 1 deletion contrib/terraform/openstack/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.terraform
*.tfvars
!sample-inventory\/cluster.tfvars
!sample-inventory/cluster.tfvars
*.tfstate
*.tfstate.backup
2 changes: 1 addition & 1 deletion docs/ansible.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Based on the table below and the available python version for your ansible host

| Ansible Version | Python Version |
|-----------------|----------------|
| 2.14 | 3.9-3.11 |
| >= 2.15.5 | 3.9-3.11 |

## Inventory

Expand Down
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
requires_ansible: '>=2.14.0'
requires_ansible: '>=2.15.5'
4 changes: 2 additions & 2 deletions playbooks/ansible_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
gather_facts: false
become: no
vars:
minimal_ansible_version: 2.14.0
maximal_ansible_version: 2.15.0
minimal_ansible_version: 2.15.5 # 2.15 versions before 2.15.5 are known to be buggy for kubespray
maximal_ansible_version: 2.17.0
ansible_connection: local
tags: always
tasks:
Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ansible==7.6.0
cryptography==41.0.1
ansible==8.5.0
cryptography==41.0.4
jinja2==3.1.2
jmespath==1.0.1
MarkupSafe==2.1.3
netaddr==0.8.0
netaddr==0.9.0
pbr==5.11.1
ruamel.yaml==0.17.31
ruamel.yaml.clib==0.2.7
ruamel.yaml==0.17.35
ruamel.yaml.clib==0.2.8
43 changes: 0 additions & 43 deletions roles/adduser/molecule/default/tests/test_default.py

This file was deleted.

40 changes: 0 additions & 40 deletions roles/bastion-ssh-config/molecule/default/tests/test_default.py

This file was deleted.

15 changes: 8 additions & 7 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
-r ../requirements.txt
ansible-lint==6.16.2
apache-libcloud==3.7.0
ara[server]==1.6.1
ansible-lint==6.20.3
apache-libcloud==3.8.0
ara[server]==1.7.0
dopy==0.3.7
molecule==5.0.1
molecule-plugins[vagrant]==23.4.1
molecule==6.0.2
molecule-plugins[vagrant]==23.5.0
python-vagrant==1.0.0
pytest-testinfra==8.1.0
tox==4.5.2
pytest-testinfra==9.0.0
tox==4.11.3
yamllint==1.32.0
tzdata==2023.3

0 comments on commit 775794e

Please sign in to comment.