mirror of
https://github.com/yannh/kubeconform.git
synced 2026-02-19 09:57:02 +00:00
Suppot symlink dependencies; improving ci dir discovery
This commit is contained in:
parent
2097831d98
commit
c0a3c0fde2
1 changed files with 16 additions and 6 deletions
|
|
@ -307,12 +307,15 @@ def parse_config(filename):
|
||||||
return args
|
return args
|
||||||
|
|
||||||
|
|
||||||
def get_values_files(values_dir, values_pattern):
|
def get_values_files(values_dir, values_pattern, chart_dir=None):
|
||||||
values_files = []
|
values_files = []
|
||||||
|
|
||||||
# Get values files
|
|
||||||
if os.path.isdir(values_dir):
|
if os.path.isdir(values_dir):
|
||||||
|
# Get values files from a specific path
|
||||||
values_files = glob(os.path.join(values_dir, values_pattern))
|
values_files = glob(os.path.join(values_dir, values_pattern))
|
||||||
|
elif chart_dir is not None and os.path.isdir(os.path.join(chart_dir, values_dir)):
|
||||||
|
# Get values files from the chart directory
|
||||||
|
values_files = glob(os.path.join(chart_dir, values_dir, values_pattern))
|
||||||
|
|
||||||
return values_files
|
return values_files
|
||||||
|
|
||||||
|
|
@ -336,11 +339,17 @@ def run_helm_dependecy_build(args):
|
||||||
for d in data["dependencies"]:
|
for d in data["dependencies"]:
|
||||||
if not (
|
if not (
|
||||||
"name" in d
|
"name" in d
|
||||||
and "version" in d
|
and (
|
||||||
and os.path.isfile(
|
(
|
||||||
os.path.join(
|
"version" in d
|
||||||
charts_dir, "%s-%s.tgz" % (d["name"], d["version"])
|
and os.path.isfile(
|
||||||
|
os.path.join(
|
||||||
|
charts_dir,
|
||||||
|
"%s-%s.tgz" % (d["name"], d["version"]),
|
||||||
|
)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
|
or os.path.islink(os.path.join(charts_dir, d["name"]))
|
||||||
)
|
)
|
||||||
):
|
):
|
||||||
# Dependency missing, let's get it
|
# Dependency missing, let's get it
|
||||||
|
|
@ -529,6 +538,7 @@ def main():
|
||||||
values_files = get_values_files(
|
values_files = get_values_files(
|
||||||
args["wrapper"].values_dir,
|
args["wrapper"].values_dir,
|
||||||
args["wrapper"].values_pattern,
|
args["wrapper"].values_pattern,
|
||||||
|
args["helm_tmpl"][-1],
|
||||||
)
|
)
|
||||||
|
|
||||||
# Run tests
|
# Run tests
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue