Added pods cleanup

Author: danielm-codefresh

installer/helm/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: csdp-installer
 description: A Helm chart used for installing a CSDP runtime
 type: application
-version: 0.1.12
+version: 0.1.13
 appVersion: v0.0.6

installer/helm/templates/installer/job.yaml

@@ -11,6 +11,7 @@ spec:
   template:
     metadata:
       labels:
+        app: {{ .Chart.Name }}
         {{- include "csdp-installer.selectorLabels" . | nindent 8 }}
     spec:
       serviceAccount: {{ .Values.csdpInstaller.installer.serviceAccount }}

installer/install.sh

@@ -12,6 +12,12 @@ check_required_param() {
     fi
 }
 
+# Clean leftover pods from the csdp-installer job
+clean_failed_pods() {
+    res=$(kubectl get pods -A --sort-by=.status.startTime --label-selector=app==csdp-installer | grep Failed | awk '{print $1}' | tail -n +2 | xargs kubectl delete pods)
+    echo res
+}
+
 # Constants:
 CODEFRESH_SECRET_NAME="codefresh-token"
 CODEFRESH_CM_NAME="codefresh-cm"
@@ -304,6 +310,9 @@ echo "  ingress controller: ${CSDP_INGRESS_CONTROLLER}"
 echo "#######################################"
 echo ""
 
+echo "Cleaning previous job pods"
+clean_failed_pods()
+
 # 1. Check codefresh secret
 echo "Checking secret $CODEFRESH_SECRET_NAME..."
 if kubectl -n "$NAMESPACE" get secret "$CODEFRESH_SECRET_NAME"; then

installer/kustomize/csdp-installer.job.yaml

@@ -7,6 +7,8 @@ spec:
   backoffLimit: 20
   template:
     metadata:
+      labels:
+        app: csdp-installer
       name: csdp-installation-job
     spec:
       serviceAccount: argocd-server