From 61e2506e272953eef544b197494f109a9efe9034 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 8 Aug 2025 12:09:30 +0200 Subject: [PATCH] Fix cluster delete krm-function when no intermediate mgmt cluster Change-Id: Ibc49ddf8669942d3aa22d89bd0e9cae4bb02b15d Signed-off-by: garciadeblas --- .../scripts/library/krm-functions.rc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docker/osm-krm-functions/scripts/library/krm-functions.rc b/docker/osm-krm-functions/scripts/library/krm-functions.rc index 93331064..2b5d6966 100644 --- a/docker/osm-krm-functions/scripts/library/krm-functions.rc +++ b/docker/osm-krm-functions/scripts/library/krm-functions.rc @@ -1005,19 +1005,17 @@ function delete_remote_cluster() { local PROJECT_NAME="${2:-"${MGMT_PROJECT_NAME}"}" local FLEET_REPO_DIR="${3:-"${FLEET_REPO_DIR}"}" local MGMT_RESOURCES_DIR="${4:-"${MGMT_RESOURCES_DIR}"}" - local MGMT_CLUSTER_DIR="${5:-"${MGMT_CLUSTER_DIR}"}" + local MGMT_CLUSTER_NAME="${5:-"${MGMT_CLUSTER_NAME}"}" # Optional inputs: Paths for each profile in the Git repo local INFRA_CONTROLLERS_DIR="${6:-"${FLEET_REPO_DIR}/${PROJECT_NAME}/infra-controller-profiles/${CLUSTER_KUSTOMIZATION_NAME}"}" local INFRA_CONFIGS_DIR="${7:-"${FLEET_REPO_DIR}/${PROJECT_NAME}/infra-config-profiles/${CLUSTER_KUSTOMIZATION_NAME}"}" local MANAGED_RESOURCES_DIR="${8:-"${FLEET_REPO_DIR}/${PROJECT_NAME}/managed-resources/${CLUSTER_KUSTOMIZATION_NAME}"}" - local MGMT_CLUSTER_DIR="${9:-"${FLEET_REPO_DIR}/${PROJECT_NAME}/managed-resources/${MGMT_CLUSTER_DIR}"}" - local APPS_DIR="${10:-"${FLEET_REPO_DIR}/${PROJECT_NAME}/app-profiles/${CLUSTER_KUSTOMIZATION_NAME}"}" - local CLUSTER_DIR="${11:-"${FLEET_REPO_DIR}/clusters/${CLUSTER_KUSTOMIZATION_NAME}"}" + local APPS_DIR="${9:-"${FLEET_REPO_DIR}/${PROJECT_NAME}/app-profiles/${CLUSTER_KUSTOMIZATION_NAME}"}" + local CLUSTER_DIR="${10:-"${FLEET_REPO_DIR}/clusters/${CLUSTER_KUSTOMIZATION_NAME}"}" # Optional input: Do I need a purge operation first? - local PURGE="${12:-"false"}" - + local PURGE="${11:-"false"}" # Perform the purge if needed if [[ "${PURGE,,}" == "true" ]]; then @@ -1030,9 +1028,13 @@ function delete_remote_cluster() { rm -rf "${INFRA_CONTROLLERS_DIR}" rm -rf "${INFRA_CONFIGS_DIR}" rm -rf "${MANAGED_RESOURCES_DIR}" - rm -rf "${MGMT_CLUSTER_DIR}" rm -rf "${APPS_DIR}" + if [ -n "${MGMT_CLUSTER_NAME}" ]; then + CLUSTER_DIR_IN_MGMT_CLUSTER="${9:-"${FLEET_REPO_DIR}/${PROJECT_NAME}/managed-resources/${MGMT_CLUSTER_DIR}/${CLUSTER_KUSTOMIZATION_NAME}"}" + rm -rf "${CLUSTER_DIR_IN_MGMT_CLUSTER}" + fi + # Delete base cluster Kustomizations rm -rf "${CLUSTER_DIR}" -- 2.25.1