Set EnvVars only if non-nil (#1737)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
kanisterio · Nov 16, 2022 · d8e475c · d8e475c
1 parent 53ec5b8
commit d8e475c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkg/kube/pod.go b/pkg/kube/pod.go
@@ -110,7 +110,6 @@ func GetPodObjectFromPodOptions(cli kubernetes.Interface, opts *PodOptions) (*v1
 				ImagePullPolicy: v1.PullPolicy(v1.PullIfNotPresent),
 				VolumeMounts:    volumeMounts,
 				Resources:       opts.Resources,
-				Env:             opts.EnvironmentVariables,
 			},
 		},
 		// RestartPolicy dictates when the containers of the pod should be
@@ -122,6 +121,10 @@ func GetPodObjectFromPodOptions(cli kubernetes.Interface, opts *PodOptions) (*v1
 		ServiceAccountName: sa,
 	}
 
+	if opts.EnvironmentVariables != nil && len(opts.EnvironmentVariables) > 0 {
+		defaultSpecs.Containers[0].Env = opts.EnvironmentVariables
+	}
+
 	// Patch default Pod Specs if needed
 	patchedSpecs, err := patchDefaultPodSpecs(defaultSpecs, opts.PodOverride)
 	if err != nil {