From 94d5e2eda0a03f66e72a6a910adf9c41717741c5 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 17 Sep 2025 15:18:26 +0200 Subject: [PATCH] Add templates_dir input param to Workflow Templates related to cluster bootstrap Change-Id: I04c62fef743d13a468e8a2092797ec4b38f8c98e Signed-off-by: garciadeblas --- .../building-blocks/cluster-management-wft.yaml | 6 ++++++ .../canned-operations/full-bootstrap-cluster-wft.yaml | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml index 5de11428..58454c7f 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/building-blocks/cluster-management-wft.yaml @@ -735,6 +735,8 @@ spec: value: "agekey" - name: fleet_repo_url - name: sw_catalogs_repo_url + - name: templates_dir + value: "/sw-catalogs/sw-catalogs-osm/cloud-resources/flux-remote-bootstrap/cluster-base/templates" # Other parameters - Recommended to keep defaults - name: mgmt_project_name @@ -775,6 +777,10 @@ spec: - "{{inputs.parameters.public_key_new_cluster}}" - '' - "{{inputs.parameters.imported_cluster}}" + - '' + - '' + - '' + - "{{inputs.parameters.templates_dir}}" volumeMounts: - name: fleet-repo-volume mountPath: '{{inputs.parameters.fleet_mount_path}}' diff --git a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-bootstrap-cluster-wft.yaml b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-bootstrap-cluster-wft.yaml index 54e012f4..22822115 100644 --- a/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-bootstrap-cluster-wft.yaml +++ b/installers/flux/templates/sw-catalogs/infra-configs/osm-workflows/templates/wf-templates/canned-operations/full-bootstrap-cluster-wft.yaml @@ -43,6 +43,8 @@ spec: - name: secret_name_private_age_key_for_new_cluster - name: key_name_in_secret value: "agekey" + - name: templates_dir + value: "/sw-catalogs/sw-catalogs-osm/cloud-resources/flux-remote-bootstrap/cluster-base/templates" # Recommended to keep this default - name: imported_cluster @@ -85,6 +87,7 @@ spec: - name: secret_name_private_age_key_for_new_cluster - name: key_name_in_secret - name: imported_cluster + - name: templates_dir # Debugging - name: debug @@ -179,6 +182,8 @@ spec: value: "{{inputs.parameters.git_sw_catalogs_url}}" - name: imported_cluster value: "{{inputs.parameters.imported_cluster}}" + - name: templates_dir + value: "{{inputs.parameters.templates_dir}}" # ------ end of transformations # ------ Commit transaction -- 2.25.1