Skip to content

Commit

Permalink
Merge pull request #1078 from projectsyn/renovate/kapitan-0.x
Browse files Browse the repository at this point in the history
Update dependency kapitan to v0.34.4
  • Loading branch information
simu authored Jan 17, 2025
2 parents f8f54e4 + 8b0444c commit 5f42020
Show file tree
Hide file tree
Showing 3 changed files with 182 additions and 21 deletions.
37 changes: 21 additions & 16 deletions commodore/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,26 +269,31 @@ def kapitan_compile(
cached.args.multiline_string_style = "literal"
cached.args.yaml_dump_null_as_empty = False
cached.args.verbose = config.trace
cached.args.output_path = output_dir
cached.args.targets = targets
cached.args.parallelism = None
cached.args.labels = None
cached.args.prune = False
cached.args.indent = 2
cached.args.reveal = reveal
cached.args.cache = False
cached.args.cache_paths = None
cached.args.fetch = config.fetch_dependencies
# We always want to force-fetch when we want to fetch dependencies
# XXX(sg): We need to set `force` because otherwise `compile_targets()` raises an exception
# becaues the field is missing, but we can't set it to true, because otherwise
# `compile_targets()` emits a deprecation warning.
cached.args.force = False
cached.args.force_fetch = config.fetch_dependencies
cached.args.validate = False
cached.args.schemas_path = config.work_dir / "schemas"
cached.args.jinja2_filters = defaults.DEFAULT_JINJA2_FILTERS_PATH
cached.args.use_go_jsonnet = True
kapitan_targets.compile_targets(
inventory_path=cached.args.inventory_path,
search_paths=search_paths,
output_path=output_dir,
desired_targets=targets,
parallelism=None,
labels=None,
ref_controller=refController,
prune=False,
indent=2,
reveal=reveal,
cache=False,
cache_paths=None,
fetch=config.fetch_dependencies,
# We always want to force-fetch when we want to fetch dependencies
force_fetch=config.fetch_dependencies,
validate=False,
schemas_path=config.work_dir / "schemas",
jinja2_filters=defaults.DEFAULT_JINJA2_FILTERS_PATH,
use_go_jsonnet=True,
args=cached.args,
)


Expand Down
164 changes: 160 additions & 4 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ python = ">=3.10, <3.13"
# dependency resolution very slow.
boto3 = "^1.26.145"
botocore="^1.29.145"
kapitan = "0.34.2"
kapitan = "0.34.4"
click = "8.1.8"
gitpython = "3.1.44"
requests = "2.32.3"
Expand Down

0 comments on commit 5f42020

Please sign in to comment.