chore: delete old prebackup pods if there are any

uselagoon · Dec 2, 2022 · 47c1194 · 47c1194
1 parent b627ce3
commit 47c1194
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/internal/templating/backups/template_prebackuppod.go b/internal/templating/backups/template_prebackuppod.go
@@ -133,7 +133,7 @@ func GeneratePreBackupPod(
 						APIVersion: k8upv1.GroupVersion.String(),
 					},
 					ObjectMeta: metav1.ObjectMeta{
-						Name: serviceValues.Name,
+						Name: fmt.Sprintf("%s-prebackuppod", serviceValues.Name),
 					},
 					Spec: k8upv1.PreBackupPodSpec{},
 				}
@@ -204,7 +204,7 @@ func GeneratePreBackupPod(
 func RemoveYAML(a []byte) ([]byte, error) {
 	tmpMap := map[string]interface{}{}
 	yaml.Unmarshal(a, &tmpMap)
-	if _, ok := tmpMap["spec"].(map[string]interface{})["pod"].(map[string]interface{})["metadata"]; ok {
+	if _, ok := tmpMap["spec"].(map[string]interface{})["pod"].(map[string]interface{})["metadata"].(map[string]interface{})["creationTimestamp"]; ok {
 		delete(tmpMap["spec"].(map[string]interface{})["pod"].(map[string]interface{})["metadata"].(map[string]interface{}), "creationTimestamp")
 		b, _ := yaml.Marshal(tmpMap)
 		return b, nil

diff --git a/internal/templating/backups/test-resources/result-prebackuppod6.yaml b/internal/templating/backups/test-resources/result-prebackuppod6.yaml
@@ -13,7 +13,7 @@ metadata:
     lagoon.sh/environmentType: production
     lagoon.sh/project: example-project
     prebackuppod: opensearch
-  name: opensearch
+  name: opensearch-prebackuppod
 spec:
   backupCommand: /bin/sh -c "tar -cf - -C /var/storage/path ."
   fileExtension: .opensearch.tar

diff --git a/legacy/build-deploy-docker-compose.sh b/legacy/build-deploy-docker-compose.sh
@@ -1080,6 +1080,9 @@ if [[ "${CAPABILITIES[@]}" =~ "k8up.io/v1/Schedule" ]]; then
     if kubectl --insecure-skip-tls-verify -n ${NAMESPACE} get schedules.backup.appuio.ch k8up-lagoon-backup-schedule &> /dev/null; then
       kubectl --insecure-skip-tls-verify -n ${NAMESPACE} delete schedules.backup.appuio.ch k8up-lagoon-backup-schedule
     fi
+    if kubectl --insecure-skip-tls-verify -n ${NAMESPACE} get prebackuppods.backup.appuio.ch &> /dev/null; then
+      kubectl --insecure-skip-tls-verify -n ${NAMESPACE} delete prebackuppods.backup.appuio.ch --all
+    fi
   fi
   K8UP_VERSION="v2"
 fi