Skip to content

Commit b3e8dfd

Browse files
Nils98Arjschoone
authored andcommitted
Fix generate_version.py for cluster addons with multiple charts (#206)
Signed-off-by: Nils Arnold <[email protected]>
1 parent 06b18f7 commit b3e8dfd

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

hack/generate_version.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@ def create_output_dir(version: str) -> PosixPath:
8585
# Copy whole tree from src dir and remove "versions.yaml" file
8686
shutil.copytree(SOURCE_PATH, out_dir)
8787
out_dir.joinpath("versions.yaml").unlink()
88-
out_dir.joinpath("cluster-addon", "Chart.lock").unlink()
89-
shutil.rmtree(str(out_dir.joinpath("cluster-addon", "charts")))
88+
for file in out_dir.joinpath("cluster-addon").rglob("Chart.lock"):
89+
file.unlink()
90+
for folder in out_dir.joinpath("cluster-addon").rglob("charts"):
91+
shutil.rmtree(folder)
9092

9193
return out_dir
9294

@@ -286,12 +288,13 @@ def update_node_images(target: PosixPath, **kwargs):
286288

287289
for tv in target_versions:
288290
output_dir = create_output_dir(tv["kubernetes"])
289-
update_cluster_addon(
290-
output_dir.joinpath("cluster-addon", "Chart.yaml"),
291+
for chart_yaml in output_dir.joinpath("cluster-addon").rglob("Chart.yaml"):
292+
update_cluster_addon(
293+
chart_yaml,
291294
args.build,
292295
args.build_verbose,
293296
**tv,
294-
)
297+
)
295298
update_csctl_conf(output_dir.joinpath("csctl.yaml"), **tv)
296299
update_cluster_class(output_dir.joinpath("cluster-class"), **tv)
297300
update_node_images(output_dir.joinpath("node-images", "config.yaml"), **tv)

0 commit comments

Comments
 (0)