From 96e00ed954cc749b439fb4971b664f8a2084ed6d Mon Sep 17 00:00:00 2001 From: DEiselt <55788675+DEiselt@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:30:49 +0200 Subject: [PATCH] Fix wrong k8s version referenced in helm values and generator script ignoring this file. (#136) * fixed: script update cluster-class values Signed-off-by: Danny Eiselt * updated: k8s version in cluster-class values Signed-off-by: Danny Eiselt --------- Signed-off-by: Danny Eiselt --- hack/generate_version.py | 21 +++++++++++++++---- .../openstack/scs/cluster-class/values.yaml | 4 ++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/hack/generate_version.py b/hack/generate_version.py index 7ed5809d..52f4ec13 100755 --- a/hack/generate_version.py +++ b/hack/generate_version.py @@ -199,12 +199,25 @@ def update_cluster_class(target: PosixPath, **kwargs): Returns: None """ - logger.info("Updating %s", target) - content = readfile(target) + chart_file = target.joinpath("Chart.yaml") + values_file = target.joinpath("values.yaml") + + logger.info("Updating %s", chart_file) + content = readfile(chart_file) version = get_dash_version(kwargs["kubernetes"]) content["name"] = f"openstack-scs-{version}-cluster-class" - writefile(target, content) + writefile(chart_file, content) + + logger.info("Updating %s", values_file) + content = readfile(values_file) + + content["images"]["controlPlane"][ + "name" + ] = f"ubuntu-capi-image-v{kwargs["kubernetes"]}" + content["images"]["worker"]["name"] = f"ubuntu-capi-image-v{kwargs["kubernetes"]}" + + writefile(values_file, content) def update_node_images(target: PosixPath, **kwargs): @@ -280,5 +293,5 @@ def update_node_images(target: PosixPath, **kwargs): **tv, ) update_csctl_conf(output_dir.joinpath("csctl.yaml"), **tv) - update_cluster_class(output_dir.joinpath("cluster-class", "Chart.yaml"), **tv) + update_cluster_class(output_dir.joinpath("cluster-class"), **tv) update_node_images(output_dir.joinpath("node-images", "config.yaml"), **tv) diff --git a/providers/openstack/scs/cluster-class/values.yaml b/providers/openstack/scs/cluster-class/values.yaml index e2195a9d..5d15de94 100644 --- a/providers/openstack/scs/cluster-class/values.yaml +++ b/providers/openstack/scs/cluster-class/values.yaml @@ -14,9 +14,9 @@ openstack_loadbalancer_apiserver: true # TBD, currently needed: images: controlPlane: - name: ubuntu-capi-image-v1.27.14 + name: ubuntu-capi-image-v1.28.11 worker: - name: ubuntu-capi-image-v1.27.14 + name: ubuntu-capi-image-v1.28.11 identityRef: name: openstack cloudName: openstack