Skip to content

Commit

Permalink
update ansible version
Browse files Browse the repository at this point in the history
  • Loading branch information
Tcharl committed Dec 22, 2023
1 parent 9dfd1a6 commit c9b04cc
Show file tree
Hide file tree
Showing 9 changed files with 762 additions and 734 deletions.
3 changes: 3 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ exclude_paths:
- tests
- meta/
- molecule/
- .github/
skip_list:
- experimental # all rules tagged as experimental
- '106' # Role name {} does not match ``^[a-z][a-z0-9_]+$`` pattern
- galaxy[no-changelog]
- var-naming[no-role-prefix]
1 change: 1 addition & 0 deletions galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ license:
tags:
- "istio"
- "calico"
- "cloud"
6 changes: 3 additions & 3 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ driver:
name: virtualbox
platforms:
- name: master.osgiliath.test
box: ${TESTBOX:-fedora/38-cloud-base}
box: ${TESTBOX:-fedora/39-cloud-base}
provider_options:
cpus: 2
memory: 5120
Expand All @@ -25,7 +25,7 @@ platforms:
- kube_master
- ipaclients
- name: ipa.osgiliath.test
box: ${TESTBOX:-fedora/38-cloud-base}
box: ${TESTBOX:-fedora/39-cloud-base}
provider_options:
cpus: 2
memory: 5120
Expand All @@ -38,7 +38,7 @@ platforms:
groups:
- ipaservers
- name: node1.osgiliath.test
box: ${TESTBOX:-fedora/38-cloud-base}
box: ${TESTBOX:-fedora/39-cloud-base}
provider_options:
cpus: 2
memory: 5120
Expand Down
6 changes: 3 additions & 3 deletions molecule/kvm/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ driver:
name: libvirt
platforms:
- name: master.osgiliath.test
box: ${TESTBOX:-fedora/38-cloud-base}
box: ${TESTBOX:-fedora/39-cloud-base}
provider_options:
driver: "kvm"
cpus: 2
Expand All @@ -26,7 +26,7 @@ platforms:
- kube_master
- ipaclients
- name: ipa.osgiliath.test
box: ${TESTBOX:-fedora/38-cloud-base}
box: ${TESTBOX:-fedora/39-cloud-base}
provider_options:
driver: "kvm"
cpus: 2
Expand All @@ -40,7 +40,7 @@ platforms:
groups:
- ipaservers
- name: node1.osgiliath.test
box: ${TESTBOX:-fedora/38-cloud-base}
box: ${TESTBOX:-fedora/39-cloud-base}
provider_options:
driver: "kvm"
cpus: 2
Expand Down
1,337 changes: 683 additions & 654 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ packages = [

[tool.poetry.dependencies]
python = ">3.10"
ansible = "^7.5.0"
ansible = "^9.1.0"
jmespath = "^1.0.1"
netaddr = "^0.8.0"
kubernetes = "*"

[tool.poetry.group.dev.dependencies]
ansible-compat = "*"
flake8 = "*"
yamllint = "*"
pytest-testinfra = "*"
python-vagrant = "*"
molecule-plugins = {version = "*", extras = ["vagrant"]}
ansible-lint = "*"
ansible-lint = {version = "^v6.22.1", markers = "platform_system != 'Windows'" }

[build-system]
requires = ["poetry-core"]
Expand Down
101 changes: 48 additions & 53 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,73 +1,68 @@
ansible-compat==3.0.2 ; python_full_version > "3.10.0"
ansible-core==2.14.6 ; python_full_version > "3.10.0"
ansible-lint==6.8.7 ; python_full_version > "3.10.0"
ansible==7.6.0 ; python_full_version > "3.10.0"
arrow==1.2.3 ; python_full_version > "3.10.0"
ansible-compat==4.1.10 ; python_full_version > "3.10.0"
ansible-core==2.16.2 ; python_full_version > "3.10.0"
ansible-lint==6.22.1 ; platform_system != "Windows" and python_full_version > "3.10.0"
ansible==9.1.0 ; python_full_version > "3.10.0"
attrs==23.1.0 ; python_full_version > "3.10.0"
binaryornot==0.4.4 ; python_full_version > "3.10.0"
black==23.3.0 ; python_full_version > "3.10.0"
bracex==2.3.post1 ; python_full_version > "3.10.0"
cachetools==3.1.1 ; python_full_version > "3.10.0"
certifi==2023.5.7 ; python_full_version > "3.10.0"
cffi==1.15.1 ; python_full_version > "3.10.0"
chardet==5.1.0 ; python_full_version > "3.10.0"
charset-normalizer==3.1.0 ; python_full_version > "3.10.0"
click-help-colors==0.9.1 ; python_full_version > "3.10.0"
click==8.1.3 ; python_full_version > "3.10.0"
black==23.12.0 ; platform_system != "Windows" and python_full_version > "3.10.0"
bracex==2.4 ; python_full_version > "3.10.0"
cachetools==5.3.2 ; python_full_version > "3.10.0"
certifi==2023.11.17 ; python_full_version > "3.10.0"
cffi==1.16.0 ; python_full_version > "3.10.0"
charset-normalizer==3.3.2 ; python_full_version > "3.10.0"
click-help-colors==0.9.4 ; python_full_version > "3.10.0"
click==8.1.7 ; python_full_version > "3.10.0"
colorama==0.4.6 ; python_full_version > "3.10.0" and (sys_platform == "win32" or platform_system == "Windows")
cookiecutter==2.1.1 ; python_full_version > "3.10.0"
cryptography==40.0.2 ; python_full_version > "3.10.0"
cryptography==41.0.7 ; python_full_version > "3.10.0"
enrich==1.2.7 ; python_full_version > "3.10.0"
exceptiongroup==1.1.1 ; python_version < "3.11" and python_full_version > "3.10.0"
filelock==3.12.0 ; python_full_version > "3.10.0"
flake8==6.0.0 ; python_full_version > "3.10.0"
google-auth==2.17.3 ; python_full_version > "3.10.0"
idna==3.4 ; python_full_version > "3.10.0"
exceptiongroup==1.2.0 ; python_version < "3.11" and python_full_version > "3.10.0"
filelock==3.13.1 ; platform_system != "Windows" and python_full_version > "3.10.0"
flake8==6.1.0 ; python_full_version > "3.10.0"
google-auth==2.25.2 ; python_full_version > "3.10.0"
idna==3.6 ; python_full_version > "3.10.0"
iniconfig==2.0.0 ; python_full_version > "3.10.0"
jinja2-time==0.2.0 ; python_full_version > "3.10.0"
jinja2==3.1.2 ; python_full_version > "3.10.0"
jmespath==1.0.1 ; python_full_version > "3.10.0"
jsonschema==4.17.3 ; python_full_version > "3.10.0"
kubernetes==26.1.0 ; python_full_version > "3.10.0"
markdown-it-py==2.2.0 ; python_full_version > "3.10.0"
markupsafe==2.1.2 ; python_full_version > "3.10.0"
jsonschema-specifications==2023.11.2 ; python_full_version > "3.10.0"
jsonschema==4.20.0 ; python_full_version > "3.10.0"
kubernetes==28.1.0 ; python_full_version > "3.10.0"
markdown-it-py==3.0.0 ; python_full_version > "3.10.0"
markupsafe==2.1.3 ; python_full_version > "3.10.0"
mccabe==0.7.0 ; python_full_version > "3.10.0"
mdurl==0.1.2 ; python_full_version > "3.10.0"
molecule-plugins[vagrant]==23.4.1 ; python_full_version > "3.10.0"
molecule==5.0.1 ; python_full_version > "3.10.0"
mypy-extensions==1.0.0 ; python_full_version > "3.10.0"
molecule-plugins[vagrant]==23.5.0 ; python_full_version > "3.10.0"
molecule==6.0.3 ; python_full_version > "3.10.0"
mypy-extensions==1.0.0 ; platform_system != "Windows" and python_full_version > "3.10.0"
netaddr==0.8.0 ; python_full_version > "3.10.0"
oauthlib==3.2.2 ; python_full_version > "3.10.0"
packaging==23.1 ; python_full_version > "3.10.0"
pathspec==0.11.1 ; python_full_version > "3.10.0"
platformdirs==3.5.1 ; python_full_version > "3.10.0"
pluggy==1.0.0 ; python_full_version > "3.10.0"
packaging==23.2 ; python_full_version > "3.10.0"
pathspec==0.12.1 ; python_full_version > "3.10.0"
platformdirs==4.1.0 ; platform_system != "Windows" and python_full_version > "3.10.0"
pluggy==1.3.0 ; python_full_version > "3.10.0"
pyasn1-modules==0.3.0 ; python_full_version > "3.10.0"
pyasn1==0.5.0 ; python_full_version > "3.10.0"
pycodestyle==2.10.0 ; python_full_version > "3.10.0"
pyasn1==0.5.1 ; python_full_version > "3.10.0"
pycodestyle==2.11.1 ; python_full_version > "3.10.0"
pycparser==2.21 ; python_full_version > "3.10.0"
pyflakes==3.0.1 ; python_full_version > "3.10.0"
pygments==2.15.1 ; python_full_version > "3.10.0"
pyrsistent==0.19.3 ; python_full_version > "3.10.0"
pytest-testinfra==8.1.0 ; python_full_version > "3.10.0"
pytest==7.3.1 ; python_full_version > "3.10.0"
pyflakes==3.1.0 ; python_full_version > "3.10.0"
pygments==2.17.2 ; python_full_version > "3.10.0"
pytest-testinfra==10.0.0 ; python_full_version > "3.10.0"
pytest==7.4.3 ; python_full_version > "3.10.0"
python-dateutil==2.8.2 ; python_full_version > "3.10.0"
python-slugify==8.0.1 ; python_full_version > "3.10.0"
python-vagrant==1.0.0 ; python_full_version > "3.10.0"
pyyaml==6.0 ; python_full_version > "3.10.0"
pyyaml==6.0.1 ; python_full_version > "3.10.0"
referencing==0.32.0 ; python_full_version > "3.10.0"
requests-oauthlib==1.3.1 ; python_full_version > "3.10.0"
requests==2.31.0 ; python_full_version > "3.10.0"
resolvelib==0.8.1 ; python_full_version > "3.10.0"
rich==13.3.5 ; python_full_version > "3.10.0"
resolvelib==1.0.1 ; python_full_version > "3.10.0"
rich==13.7.0 ; python_full_version > "3.10.0"
rpds-py==0.15.2 ; python_full_version > "3.10.0"
rsa==4.2 ; python_full_version > "3.10.0"
ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.12" and python_full_version > "3.10.0"
ruamel-yaml==0.17.28 ; python_full_version > "3.10.0"
setuptools==67.8.0 ; python_full_version > "3.10.0"
ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.13" and platform_system != "Windows" and python_full_version > "3.10.0"
ruamel-yaml==0.18.5 ; platform_system != "Windows" and python_full_version > "3.10.0"
six==1.16.0 ; python_full_version > "3.10.0"
subprocess-tee==0.4.1 ; python_full_version > "3.10.0"
text-unidecode==1.3 ; python_full_version > "3.10.0"
tomli==2.0.1 ; python_version < "3.11" and python_full_version > "3.10.0"
urllib3==2.0.2 ; python_full_version > "3.10.0"
wcmatch==8.4.1 ; python_full_version > "3.10.0"
websocket-client==1.5.2 ; python_full_version > "3.10.0"
yamllint==1.32.0 ; python_full_version > "3.10.0"
typing-extensions==4.9.0 ; platform_system != "Windows" and python_full_version > "3.10.0" and python_version < "3.11"
urllib3==1.26.18 ; python_full_version > "3.10.0"
wcmatch==8.5 ; python_full_version > "3.10.0"
websocket-client==1.7.0 ; python_full_version > "3.10.0"
yamllint==1.33.0 ; python_full_version > "3.10.0"
35 changes: 17 additions & 18 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
ansible-core==2.14.6 ; python_full_version > "3.10.0"
ansible==7.6.0 ; python_full_version > "3.10.0"
cachetools==3.1.1 ; python_full_version > "3.10.0"
certifi==2023.5.7 ; python_full_version > "3.10.0"
cffi==1.15.1 ; python_full_version > "3.10.0"
charset-normalizer==3.1.0 ; python_full_version > "3.10.0"
cryptography==40.0.2 ; python_full_version > "3.10.0"
google-auth==2.17.3 ; python_full_version > "3.10.0"
idna==3.4 ; python_full_version > "3.10.0"
ansible-core==2.16.2 ; python_full_version > "3.10.0"
ansible==9.1.0 ; python_full_version > "3.10.0"
cachetools==5.3.2 ; python_full_version > "3.10.0"
certifi==2023.11.17 ; python_full_version > "3.10.0"
cffi==1.16.0 ; python_full_version > "3.10.0"
charset-normalizer==3.3.2 ; python_full_version > "3.10.0"
cryptography==41.0.7 ; python_full_version > "3.10.0"
google-auth==2.25.2 ; python_full_version > "3.10.0"
idna==3.6 ; python_full_version > "3.10.0"
jinja2==3.1.2 ; python_full_version > "3.10.0"
jmespath==1.0.1 ; python_full_version > "3.10.0"
kubernetes==26.1.0 ; python_full_version > "3.10.0"
markupsafe==2.1.2 ; python_full_version > "3.10.0"
kubernetes==28.1.0 ; python_full_version > "3.10.0"
markupsafe==2.1.3 ; python_full_version > "3.10.0"
netaddr==0.8.0 ; python_full_version > "3.10.0"
oauthlib==3.2.2 ; python_full_version > "3.10.0"
packaging==23.1 ; python_full_version > "3.10.0"
packaging==23.2 ; python_full_version > "3.10.0"
pyasn1-modules==0.3.0 ; python_full_version > "3.10.0"
pyasn1==0.5.0 ; python_full_version > "3.10.0"
pyasn1==0.5.1 ; python_full_version > "3.10.0"
pycparser==2.21 ; python_full_version > "3.10.0"
python-dateutil==2.8.2 ; python_full_version > "3.10.0"
pyyaml==6.0 ; python_full_version > "3.10.0"
pyyaml==6.0.1 ; python_full_version > "3.10.0"
requests-oauthlib==1.3.1 ; python_full_version > "3.10.0"
requests==2.31.0 ; python_full_version > "3.10.0"
resolvelib==0.8.1 ; python_full_version > "3.10.0"
resolvelib==1.0.1 ; python_full_version > "3.10.0"
rsa==4.2 ; python_full_version > "3.10.0"
setuptools==67.8.0 ; python_full_version > "3.10.0"
six==1.16.0 ; python_full_version > "3.10.0"
urllib3==2.0.2 ; python_full_version > "3.10.0"
websocket-client==1.5.2 ; python_full_version > "3.10.0"
urllib3==1.26.18 ; python_full_version > "3.10.0"
websocket-client==1.7.0 ; python_full_version > "3.10.0"
1 change: 1 addition & 0 deletions tasks/service-mesh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
until: result is succeeded
retries: 5
delay: 10
changed_when: false
when:
- kube_masters_group in group_names

Expand Down

0 comments on commit c9b04cc

Please sign in to comment.