Skip to content

Fix generate_version.py for cluster addons with multiple charts #206

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

Merged
jschoone merged 1 commit into from
Mar 7, 2025
Merged

Fix generate_version.py for cluster addons with multiple charts #206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions hack/generate_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@ def create_output_dir(version: str) -> PosixPath:
# Copy whole tree from src dir and remove "versions.yaml" file
shutil.copytree(SOURCE_PATH, out_dir)
out_dir.joinpath("versions.yaml").unlink()
out_dir.joinpath("cluster-addon", "Chart.lock").unlink()
shutil.rmtree(str(out_dir.joinpath("cluster-addon", "charts")))
for file in out_dir.joinpath("cluster-addon").rglob("Chart.lock"):
file.unlink()
for folder in out_dir.joinpath("cluster-addon").rglob("charts"):
shutil.rmtree(folder)

return out_dir

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

for tv in target_versions:
output_dir = create_output_dir(tv["kubernetes"])
update_cluster_addon(
output_dir.joinpath("cluster-addon", "Chart.yaml"),
for chart_yaml in output_dir.joinpath("cluster-addon").rglob("Chart.yaml"):
update_cluster_addon(
chart_yaml,
args.build,
args.build_verbose,
**tv,
)
)
update_csctl_conf(output_dir.joinpath("csctl.yaml"), **tv)
update_cluster_class(output_dir.joinpath("cluster-class"), **tv)
update_node_images(output_dir.joinpath("node-images", "config.yaml"), **tv)