From a1c7175bd15736c03961f697734a9d3d6caacb0d Mon Sep 17 00:00:00 2001 From: Techno Tim Date: Sat, 5 Nov 2022 18:37:46 -0500 Subject: [PATCH] fix(requirements.txt): Use pip-compile (#148) * fix(requirements.txt): Use pip-compile * fix(lint): Remove anchors from molecule since they aren't yet supported via lint * fix(lint): Remove anchors from molecule since they aren't yet supported via lint --- molecule/default/molecule.yml | 73 ++++++++------ molecule/ipv6/molecule.yml | 38 +++---- requirements.in | 13 +++ requirements.txt | 180 +++++++++++++++++++++++++++++++--- 4 files changed, 243 insertions(+), 61 deletions(-) create mode 100644 requirements.in diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index ddb6410..4a07503 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,56 +3,73 @@ dependency: name: galaxy driver: name: vagrant -.platform_presets: - - &control +platforms: + + - name: control1 + box: generic/ubuntu2204 memory: 2048 cpus: 2 groups: - k3s_cluster - master - - &node - memory: 2048 - cpus: 2 - groups: - - k3s_cluster - - node - - &debian - box: generic/debian11 - - &rocky - box: generic/rocky9 - - &ubuntu - box: generic/ubuntu2204 + interfaces: + - network_name: private_network + ip: 192.168.30.38 config_options: # We currently can not use public-key based authentication on Ubuntu 22.04, # see: https://github.com/chef/bento/issues/1405 ssh.username: "vagrant" ssh.password: "vagrant" -platforms: - - <<: [*control, *ubuntu] - name: control1 - interfaces: - - network_name: private_network - ip: 192.168.30.38 - - <<: [*control, *debian] - name: control2 + + - name: control2 + box: generic/debian11 + memory: 2048 + cpus: 2 + groups: + - k3s_cluster + - master interfaces: - network_name: private_network ip: 192.168.30.39 - - <<: [*control, *rocky] - name: control3 + + - name: control3 + box: generic/rocky9 + memory: 2048 + cpus: 2 + groups: + - k3s_cluster + - master interfaces: - network_name: private_network ip: 192.168.30.40 - - <<: [*node, *ubuntu] - name: node1 + + - name: node1 + box: generic/ubuntu2204 + memory: 2048 + cpus: 2 + groups: + - k3s_cluster + - node interfaces: - network_name: private_network ip: 192.168.30.41 - - <<: [*node, *rocky] - name: node2 + config_options: + # We currently can not use public-key based authentication on Ubuntu 22.04, + # see: https://github.com/chef/bento/issues/1405 + ssh.username: "vagrant" + ssh.password: "vagrant" + + - name: node2 + box: generic/rocky9 + memory: 2048 + cpus: 2 + groups: + - k3s_cluster + - node interfaces: - network_name: private_network ip: 192.168.30.42 + provisioner: name: ansible playbooks: diff --git a/molecule/ipv6/molecule.yml b/molecule/ipv6/molecule.yml index e1be705..d6935cb 100644 --- a/molecule/ipv6/molecule.yml +++ b/molecule/ipv6/molecule.yml @@ -3,37 +3,39 @@ dependency: name: galaxy driver: name: vagrant -.platform_presets: - - &control +platforms: + + - name: control1 + box: generic/ubuntu2204 memory: 2048 cpus: 2 groups: - k3s_cluster - master - - &node - memory: 2048 - cpus: 2 - groups: - - k3s_cluster - - node - - &ubuntu - box: generic/ubuntu2204 + interfaces: + - network_name: private_network + ip: fdad:bad:ba55::de:11 config_options: # We currently can not use public-key based authentication on Ubuntu 22.04, # see: https://github.com/chef/bento/issues/1405 ssh.username: "vagrant" ssh.password: "vagrant" -platforms: - - <<: [*control, *ubuntu] - name: control1 - interfaces: - - network_name: private_network - ip: fdad:bad:ba55::de:11 - - <<: [*node, *ubuntu] - name: node1 + + - name: node1 + box: generic/ubuntu2204 + memory: 2048 + cpus: 2 + groups: + - k3s_cluster + - node interfaces: - network_name: private_network ip: fdad:bad:ba55::de:21 + config_options: + # We currently can not use public-key based authentication on Ubuntu 22.04, + # see: https://github.com/chef/bento/issues/1405 + ssh.username: "vagrant" + ssh.password: "vagrant" provisioner: name: ansible playbooks: diff --git a/requirements.in b/requirements.in new file mode 100644 index 0000000..4a3cbb0 --- /dev/null +++ b/requirements.in @@ -0,0 +1,13 @@ +molecule>=4.0.1 +ansible-core>=2.13.2 +ansible-lint>=6.6.0 +kubernetes>=12.0.0 +molecule-vagrant>=1.0.0 +molecule>=4.0.1 +netaddr>=0.8.0 +pyyaml>=3.11 +yamllint>=1.28.0 +jmespath>=1.0.1 +jsonpatch>=1.32 +pre-commit>=2.20.0 +netaddr>=0.8.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 80e77a7..85768b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,72 +1,222 @@ -ansible-compat==2.2.1 +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# pip-compile requirements.in +# +ansible-compat==2.2.4 + # via + # ansible-lint + # molecule ansible-core==2.13.5 -ansible-lint==6.8.4 + # via + # -r requirements.in + # ansible-lint +ansible-lint==6.8.6 + # via -r requirements.in arrow==1.2.3 + # via jinja2-time attrs==22.1.0 + # via jsonschema binaryornot==0.4.4 + # via cookiecutter black==22.10.0 + # via ansible-lint bracex==2.3.post1 + # via wcmatch cachetools==5.2.0 -Cerberus==1.3.2 + # via google-auth certifi==2022.9.24 + # via + # kubernetes + # requests cffi==1.15.1 + # via cryptography +cfgv==3.3.1 + # via pre-commit chardet==5.0.0 + # via binaryornot charset-normalizer==2.1.1 + # via requests click==8.1.3 + # via + # black + # click-help-colors + # cookiecutter + # molecule click-help-colors==0.9.1 + # via molecule commonmark==0.9.1 + # via rich cookiecutter==2.1.1 -cryptography==38.0.1 + # via molecule +cryptography==38.0.3 + # via ansible-core +distlib==0.3.6 + # via virtualenv distro==1.8.0 + # via selinux enrich==1.2.7 + # via molecule filelock==3.8.0 -google-auth==2.13.0 + # via + # ansible-lint + # virtualenv +google-auth==2.14.0 + # via kubernetes +identify==2.5.8 + # via pre-commit idna==3.4 + # via requests importlib-resources==5.10.0 -Jinja2==3.1.2 + # via jsonschema +jinja2==3.1.2 + # via + # ansible-core + # cookiecutter + # jinja2-time + # molecule + # molecule-vagrant jinja2-time==0.2.0 + # via cookiecutter jmespath==1.0.1 + # via -r requirements.in jsonpatch==1.32 + # via -r requirements.in jsonpointer==2.3 -jsonschema==4.16.0 -kubernetes==24.2.0 -MarkupSafe==2.1.1 -molecule==4.0.1 + # via jsonpatch +jsonschema==4.17.0 + # via + # ansible-compat + # ansible-lint + # molecule +kubernetes==25.3.0 + # via -r requirements.in +markupsafe==2.1.1 + # via jinja2 +molecule==4.0.3 + # via + # -r requirements.in + # molecule-vagrant molecule-vagrant==1.0.0 + # via -r requirements.in mypy-extensions==0.4.3 + # via black netaddr==0.8.0 + # via -r requirements.in +nodeenv==1.7.0 + # via pre-commit oauthlib==3.2.2 + # via requests-oauthlib packaging==21.3 + # via + # ansible-compat + # ansible-core + # ansible-lint + # molecule pathspec==0.10.1 + # via + # black + # yamllint pkgutil-resolve-name==1.3.10 + # via jsonschema platformdirs==2.5.2 + # via + # black + # virtualenv pluggy==1.0.0 + # via molecule pre-commit==2.20.0 + # via -r requirements.in pyasn1==0.4.8 + # via + # pyasn1-modules + # rsa pyasn1-modules==0.2.8 + # via google-auth pycparser==2.21 -Pygments==2.13.0 + # via cffi +pygments==2.13.0 + # via rich pyparsing==3.0.9 + # via packaging pyrsistent==0.19.2 + # via jsonschema python-dateutil==2.8.2 + # via + # arrow + # kubernetes python-slugify==6.1.2 + # via cookiecutter python-vagrant==1.0.0 -PyYAML==6.0 + # via molecule-vagrant +pyyaml==6.0 + # via + # -r requirements.in + # ansible-compat + # ansible-core + # ansible-lint + # cookiecutter + # kubernetes + # molecule + # molecule-vagrant + # pre-commit + # yamllint requests==2.28.1 + # via + # cookiecutter + # kubernetes + # requests-oauthlib requests-oauthlib==1.3.1 + # via kubernetes resolvelib==0.8.1 + # via ansible-core rich==12.6.0 + # via + # ansible-lint + # enrich + # molecule rsa==4.9 -ruamel.yaml==0.17.21 -ruamel.yaml.clib==0.2.7 + # via google-auth +ruamel-yaml==0.17.21 + # via ansible-lint +ruamel-yaml-clib==0.2.7 + # via ruamel-yaml selinux==0.2.1 + # via molecule-vagrant six==1.16.0 + # via + # google-auth + # kubernetes + # python-dateutil subprocess-tee==0.3.5 + # via ansible-compat text-unidecode==1.3 + # via python-slugify +toml==0.10.2 + # via pre-commit tomli==2.0.1 + # via black typing-extensions==4.4.0 + # via + # black + # rich urllib3==1.26.12 + # via + # kubernetes + # requests +virtualenv==20.16.6 + # via pre-commit wcmatch==8.4.1 -websocket-client==1.4.1 + # via ansible-lint +websocket-client==1.4.2 + # via kubernetes yamllint==1.28.0 + # via + # -r requirements.in + # ansible-lint zipp==3.10.0 + # via importlib-resources + +# The following packages are considered to be unsafe in a requirements file: +# setuptools