Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update reclass and pip dependencies #528

Merged
merged 2 commits into from
Jun 16, 2020
Merged

Update reclass and pip dependencies #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b70fef2
Update reclass version and add new required config var in reclass-con…
uberspot Jun 16, 2020
0444941
Update some pip dependencies
uberspot Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/terraform/inventory/reclass-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ inventory_base_uri: .
nodes_uri: targets
classes_uri: classes
compose_node_name: false
class_mappings_match_path: true
class_mappings:
- develop/* env.develop
- prod/* env.prod
Expand Down
2 changes: 1 addition & 1 deletion kapitan/reclass
Open in desktop
Submodule reclass updated 15 files
+1 −1 README-extensions.rst
+7 −0 doc/source/operations.rst
+9 −5 reclass/core.py
+5 −3 reclass/datatypes/entity.py
+2 −0 reclass/defaults.py
+2 −2 reclass/errors.py
+1 −0 reclass/settings.py
+4 −3 reclass/storage/yaml_fs/__init__.py
+9 −5 reclass/storage/yaml_git/__init__.py
+2 −5 reclass/storage/yamldata.py
+2 −0 reclass/tests/data/04/classes/one.yml
+2 −0 reclass/tests/data/04/classes/three.yml
+2 −0 reclass/tests/data/04/classes/two.yml
+2 −0 reclass/tests/data/04/nodes/alpha/node1.yml
+15 −3 reclass/tests/test_core.py
12 changes: 6 additions & 6 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
# kapitan dependencies
jsonnet==0.15.0
jsonnet==0.16.0
pyyaml>=5.3.1
Jinja2>=2.11.2
jsonschema==3.2.0
python-gnupg==0.4.6
six>=1.14.0
six>=1.15.0
cryptography>=2.9.2
google-api-python-client==1.7.11
boto3>=1.13.4
boto3>=1.14.3
requests==2.23.0
addict==2.2.1
yamllint>=1.23.0
cffi
rfc3987==1.3.8
GitPython==3.1.2
hvac==0.10.1
docker==4.2.0
GitPython==3.1.3
hvac==0.10.4
docker==4.2.1
# Reclass dependencies
pyparsing