Skip to content
This repository was archived by the owner on Feb 8, 2024. It is now read-only.

simplify deploy/un-deploy cleanup #255

Merged
merged 2 commits into from
May 20, 2022
Merged

simplify deploy/un-deploy cleanup #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78919f2
simplify deploy/un-deploy cleanup
keithpine May 19, 2022
308f274
Merge branch 'integration' into cleanup-fix
keithpine May 20, 2022
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
21 changes: 6 additions & 15 deletions k8_cortx_cloud/deploy-cortx-cloud.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1051,21 +1051,12 @@ function deployCortxClient()

function cleanup()
{
#################################################################
# Delete files that contain disk partitions on the worker nodes
# and the node info
#################################################################
find "$(pwd)/cortx-cloud-helm-pkg/cortx-data" -name "secret-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-server" -name "secret-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-ha" -name "secret-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-client" -name "secret-*" -delete

rm -rf "${cfgmap_path}/auto-gen-secret-${namespace}"

find "$(pwd)/cortx-cloud-helm-pkg/cortx-data-blk-data" -name "mnt-blk-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-data-blk-data" -name "node-list-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-data" -name "mnt-blk-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-data" -name "node-list-*" -delete
# Delete files that contain disk partitions on the worker nodes and the node info
# and left-over secret data
find "$(pwd)/cortx-cloud-helm-pkg" -type f \( -name 'mnt-blk-*' -o -name 'node-list-*' -o -name secret-info.txt \) -delete

# Delete left-over machine IDs and any other auto-gen data
rm -rf "${cfgmap_path}"
}

# Extract storage provisioner path from the "solution.yaml" file
Expand Down
6 changes: 1 addition & 5 deletions k8_cortx_cloud/destroy-cortx-cloud.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,7 @@ function deleteSecrets()
secret_name=$(echo "${secret_name}" | cut -f2 -d'>')
kubectl delete secret "${secret_name}" --namespace="${namespace}" --ignore-not-found=true

find "$(pwd)/cortx-cloud-helm-pkg/cortx-control" -name "secret-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-data" -name "secret-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-server" -name "secret-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-ha" -name "secret-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg/cortx-client" -name "secret-*" -delete
find "$(pwd)/cortx-cloud-helm-pkg" -name "secret-info.txt" -delete
fi
}

Expand Down