chore: add target pod name for backup job (#7525)

apecloud · Jun 13, 2024 · 3f405b3 · 3f405b3
1 parent 1af1219
commit 3f405b3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/dataprotection/backup/request.go b/pkg/dataprotection/backup/request.go
@@ -312,7 +312,8 @@ func (r *Request) BuildJobActionPodSpec(targetPod *corev1.Pod,
 	// and envs from actionSet. Latter will override former for the same name.
 	// env from backupMethod has the highest priority.
 	buildEnv := func() []corev1.EnvVar {
-		envVars := []corev1.EnvVar{
+		envVars := targetPod.Spec.Containers[0].Env
+		envVars = append(envVars, []corev1.EnvVar{
 			{
 				Name:  dptypes.DPBackupName,
 				Value: r.Backup.Name,
@@ -342,7 +343,7 @@ func (r *Request) BuildJobActionPodSpec(targetPod *corev1.Pod,
 				Name:  dptypes.DPTTL,
 				Value: r.Spec.RetentionPeriod.String(),
 			},
-		}
+		}...)
 		envVars = append(envVars, utils.BuildEnvByCredential(targetPod, r.Target.ConnectionCredential)...)
 		if r.ActionSet != nil {
 			envVars = append(envVars, r.ActionSet.Spec.Env...)
@@ -402,6 +403,7 @@ func (r *Request) BuildJobActionPodSpec(targetPod *corev1.Pod,
 		Image:           common.Expand(job.Image, common.MappingFuncFor(utils.CovertEnvToMap(env))),
 		Command:         job.Command,
 		Env:             env,
+		EnvFrom:         targetPod.Spec.Containers[0].EnvFrom,
 		VolumeMounts:    buildVolumeMounts(),
 		ImagePullPolicy: corev1.PullPolicy(viper.GetString(constant.KBImagePullPolicy)),
 		SecurityContext: &corev1.SecurityContext{