X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=servicemanager%2Fdeploy%2Fsrc%2Fdelete-from-k8s.sh;fp=servicemanager%2Fdeploy%2Fsrc%2Fdelete-from-k8s.sh;h=f86af1f2914662e9f3b7837e88f0e3af6ee1faad;hb=0558c62d57835be1025dc192eff40bac3fe35492;hp=fd5289c63689a73beb615ae0693f2604254926df;hpb=40b608da2929aa753b3e87733fd0900b8e3dcbc4;p=nonrtric%2Fplt%2Fsme.git

diff --git a/servicemanager/deploy/src/delete-from-k8s.sh b/servicemanager/deploy/src/delete-from-k8s.sh
index fd5289c..f86af1f 100755
--- a/servicemanager/deploy/src/delete-from-k8s.sh
+++ b/servicemanager/deploy/src/delete-from-k8s.sh
@@ -20,16 +20,24 @@
 echo $(date -u) "delete-from-k8s started"
 
 # Delete R1-SME-Manager with Capifcore
+echo "Warning - deleting Kong routes and services for ServiceManager"
+SERVICEMANAGER_POD=$(kubectl get pods -o custom-columns=NAME:.metadata.name -l app=servicemanager --no-headers -n servicemanager)
+if [[ -n $SERVICEMANAGER_POD ]]; then
+    kubectl exec $SERVICEMANAGER_POD -n servicemanager -- ./kongclearup
+else
+    echo "Error - Servicemanager pod not found, didn't delete Kong routes and services for ServiceManager"
+fi
+
 kubectl delete -f ../manifests/servicemanager.yaml
 kubectl delete configmap env-configmap -n servicemanager
 kubectl delete -f ../manifests/capifcore.yaml
+
 kubectl delete ns servicemanager
 
 # Delete Kong
-go run ../../internal/kongclearup.go
 helm uninstall kong -n kong
 helm repo remove kong
-kubectl wait deploy/kong-kong --for=delete --timeout=-300s -n kong 
+kubectl wait deploy/kong-kong --for=delete --timeout=-300s -n kong
 
 # Delete storage for the Postgres used by Kong
 kubectl delete -f ../manifests/kong-postgres-pvc.yaml