fix: remove unused metadata on prebackuppod

uselagoon · Oct 3, 2023 · f3c6aa5 · f3c6aa5
1 parent c8606f1
commit f3c6aa5
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 72 deletions.
diff --git a/internal/templating/backups/template_prebackuppod.go b/internal/templating/backups/template_prebackuppod.go
@@ -71,6 +71,7 @@ func GeneratePreBackupPod(
 
 				prebackuppod.ObjectMeta.Labels = labels
 				prebackuppod.ObjectMeta.Annotations = annotations
+				prebackuppod.ObjectMeta.Labels["prebackuppod"] = serviceValues.Name
 
 				var pbp bytes.Buffer
 				tmpl, _ := template.New("").Funcs(funcMap).Parse(preBackupPodSpecs[serviceValues.Type])
@@ -84,10 +85,6 @@ func GeneratePreBackupPod(
 					return nil, err
 				}
 
-				k8upPBPSpec.Pod.ObjectMeta = metav1.ObjectMeta{
-					Labels: labels,
-				}
-				k8upPBPSpec.Pod.ObjectMeta.Labels["prebackuppod"] = serviceValues.Name
 				prebackuppod.Spec = k8upPBPSpec
 
 				if prebackuppod.Spec.Pod.Spec.Containers[0].EnvFrom == nil {
@@ -155,6 +152,7 @@ func GeneratePreBackupPod(
 
 				prebackuppod.ObjectMeta.Labels = labels
 				prebackuppod.ObjectMeta.Annotations = annotations
+				prebackuppod.ObjectMeta.Labels["prebackuppod"] = serviceValues.Name
 
 				var pbp bytes.Buffer
 				tmpl, _ := template.New("").Funcs(funcMap).Parse(preBackupPodSpecs[serviceValues.Type])
@@ -168,10 +166,6 @@ func GeneratePreBackupPod(
 					return nil, err
 				}
 
-				k8upPBPSpec.Pod.ObjectMeta = metav1.ObjectMeta{
-					Labels: labels,
-				}
-				k8upPBPSpec.Pod.ObjectMeta.Labels["prebackuppod"] = serviceValues.Name
 				prebackuppod.Spec = k8upPBPSpec
 
 				if prebackuppod.Spec.Pod.Spec.Containers[0].EnvFrom == nil && serviceValues.DBaasReadReplica {

diff --git a/internal/templating/backups/test-resources/result-prebackuppod1.yaml b/internal/templating/backups/test-resources/result-prebackuppod1.yaml
@@ -25,14 +25,7 @@ spec:
     $BACKUP_DB_DATABASE >> $dump && cat $dump && rm $dump"
   fileExtension: .mariadb-database.sql
   pod:
-    metadata:
-      labels:
-        app.kubernetes.io/managed-by: build-deploy-tool
-        lagoon.sh/buildType: branch
-        lagoon.sh/environment: environment-with-really-really-reall-3fdb
-        lagoon.sh/environmentType: production
-        lagoon.sh/project: example-project
-        prebackuppod: mariadb-database
+    metadata: {}
     spec:
       containers:
       - args:

diff --git a/internal/templating/backups/test-resources/result-prebackuppod2.yaml b/internal/templating/backups/test-resources/result-prebackuppod2.yaml
@@ -21,14 +21,7 @@ spec:
     --username=$BACKUP_DB_USERNAME --format=t -w"
   fileExtension: .postgres-database.tar
   pod:
-    metadata:
-      labels:
-        app.kubernetes.io/managed-by: build-deploy-tool
-        lagoon.sh/buildType: branch
-        lagoon.sh/environment: environment-with-really-really-reall-3fdb
-        lagoon.sh/environmentType: production
-        lagoon.sh/project: example-project
-        prebackuppod: postgres-database
+    metadata: {}
     spec:
       containers:
       - args:

diff --git a/internal/templating/backups/test-resources/result-prebackuppod3.yaml b/internal/templating/backups/test-resources/result-prebackuppod3.yaml
@@ -19,14 +19,7 @@ spec:
     --archive"
   fileExtension: .mongodb-database.bson
   pod:
-    metadata:
-      labels:
-        app.kubernetes.io/managed-by: build-deploy-tool
-        lagoon.sh/buildType: branch
-        lagoon.sh/environment: environment-with-really-really-reall-3fdb
-        lagoon.sh/environmentType: production
-        lagoon.sh/project: example-project
-        prebackuppod: mongodb-database
+    metadata: {}
     spec:
       containers:
       - args:

diff --git a/internal/templating/backups/test-resources/result-prebackuppod4.yaml b/internal/templating/backups/test-resources/result-prebackuppod4.yaml
@@ -18,14 +18,7 @@ spec:
   backupCommand: /bin/sh -c "tar -cf - -C /var/storage/path ."
   fileExtension: .elasticsearch.tar
   pod:
-    metadata:
-      labels:
-        app.kubernetes.io/managed-by: build-deploy-tool
-        lagoon.sh/buildType: branch
-        lagoon.sh/environment: environment-with-really-really-reall-3fdb
-        lagoon.sh/environmentType: production
-        lagoon.sh/project: example-project
-        prebackuppod: elasticsearch
+    metadata: {}
     spec:
       containers:
       - args:

diff --git a/internal/templating/backups/test-resources/result-prebackuppod5.yaml b/internal/templating/backups/test-resources/result-prebackuppod5.yaml
@@ -18,14 +18,7 @@ spec:
   backupCommand: /bin/sh -c "tar -cf - -C /var/storage/path ."
   fileExtension: .opensearch.tar
   pod:
-    metadata:
-      labels:
-        app.kubernetes.io/managed-by: build-deploy-tool
-        lagoon.sh/buildType: branch
-        lagoon.sh/environment: environment-with-really-really-reall-3fdb
-        lagoon.sh/environmentType: production
-        lagoon.sh/project: example-project
-        prebackuppod: opensearch
+    metadata: {}
     spec:
       containers:
       - args:

diff --git a/internal/templating/backups/test-resources/result-prebackuppod6.yaml b/internal/templating/backups/test-resources/result-prebackuppod6.yaml
@@ -18,14 +18,7 @@ spec:
   backupCommand: /bin/sh -c "tar -cf - -C /var/storage/path ."
   fileExtension: .opensearch.tar
   pod:
-    metadata:
-      labels:
-        app.kubernetes.io/managed-by: build-deploy-tool
-        lagoon.sh/buildType: branch
-        lagoon.sh/environment: environment-with-really-really-reall-3fdb
-        lagoon.sh/environmentType: production
-        lagoon.sh/project: example-project
-        prebackuppod: opensearch
+    metadata: {}
     spec:
       containers:
       - args:

diff --git a/test-resources/template-backups/test1-results/prebackuppods.yaml b/test-resources/template-backups/test1-results/prebackuppods.yaml
@@ -25,14 +25,7 @@ spec:
     $BACKUP_DB_DATABASE >> $dump && cat $dump && rm $dump"
   fileExtension: .mariadb.sql
   pod:
-    metadata:
-      labels:
-        app.kubernetes.io/managed-by: build-deploy-tool
-        lagoon.sh/buildType: branch
-        lagoon.sh/environment: main
-        lagoon.sh/environmentType: production
-        lagoon.sh/project: example-project
-        prebackuppod: mariadb
+    metadata: {}
     spec:
       containers:
       - args:
@@ -88,14 +81,7 @@ spec:
   backupCommand: /bin/sh -c "tar -cf - -C /usr/share/elasticsearch/data ."
   fileExtension: .elasticsearch.tar
   pod:
-    metadata:
-      labels:
-        app.kubernetes.io/managed-by: build-deploy-tool
-        lagoon.sh/buildType: branch
-        lagoon.sh/environment: main
-        lagoon.sh/environmentType: production
-        lagoon.sh/project: example-project
-        prebackuppod: elasticsearch
+    metadata: {}
     spec:
       containers:
       - args: