Fix a bug in the code where we merge actionset and bp labels/annotati…

…ons (#3097)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

pkg/function/backup_data_stats.go

@@ -191,7 +191,8 @@ func (b *BackupDataStatsFunc) Exec(ctx context.Context, tp param.TemplateParams,
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/checkRepository.go

@@ -171,7 +171,8 @@ func (c *CheckRepositoryFunc) Exec(ctx context.Context, tp param.TemplateParams,
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/copy_volume_data.go

@@ -226,7 +226,8 @@ func (c *copyVolumeDataFunc) Exec(ctx context.Context, tp param.TemplateParams,
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/delete_data.go

@@ -257,7 +257,8 @@ func (d *deleteDataFunc) Exec(ctx context.Context, tp param.TemplateParams, args
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/delete_data_all.go

@@ -103,7 +103,8 @@ func (d *deleteDataAllFunc) Exec(ctx context.Context, tp param.TemplateParams, a
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/delete_data_using_kopia_server.go

@@ -120,7 +120,8 @@ func (d *deleteDataUsingKopiaServerFunc) Exec(ctx context.Context, tp param.Temp
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/export_rds_snapshot_location.go

@@ -232,7 +232,8 @@ func (e *exportRDSSnapshotToLocationFunc) Exec(ctx context.Context, tp param.Tem
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/kube_task.go

@@ -143,7 +143,8 @@ func (ktf *kubeTaskFunc) Exec(ctx context.Context, tp param.TemplateParams, args
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/prepare_data.go

@@ -196,7 +196,8 @@ func (p *prepareDataFunc) Exec(ctx context.Context, tp param.TemplateParams, arg
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/restore_data.go

@@ -246,7 +246,8 @@ func (r *restoreDataFunc) Exec(ctx context.Context, tp param.TemplateParams, arg
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/restore_data_all.go

@@ -137,7 +137,8 @@ func (r *restoreDataAllFunc) Exec(ctx context.Context, tp param.TemplateParams,
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/restore_data_using_kopia_server.go

@@ -129,7 +129,8 @@ func (r *restoreDataUsingKopiaServerFunc) Exec(ctx context.Context, tp param.Tem
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/function/restore_rds_snapshot.go

@@ -155,7 +155,8 @@ func (r *restoreRDSSnapshotFunc) Exec(ctx context.Context, tp param.TemplatePara
 		return nil, err
 	}
 
-	var labels, annotations map[string]string
+	annotations := bpAnnotations
+	labels := bpLabels
 	if tp.PodAnnotations != nil {
 		// merge the actionset annotations with blueprint annotations
 		var actionSetAnn ActionSetAnnotations = tp.PodAnnotations

pkg/testing/e2e_test.go

@@ -411,7 +411,7 @@ func (s *E2ESuite) TestPodLabelsAndAnnotations(c *C) {
 	c.Assert(err, IsNil)
 
 	// 4. scenario where labels/annotations are only provided via blueprint
-	asThree := backupActionsetWihtPodLabelsAndAnnotations(s.namespace, bp.Name, map[string]string{}, map[string]string{})
+	asThree := backupActionsetWihtPodLabelsAndAnnotations(s.namespace, bp.Name, nil, nil)
 	asCreatedThree, err := s.crCli.ActionSets(s.namespace).Create(context.Background(), asThree, metav1.CreateOptions{})
 	c.Assert(err, IsNil)