3206: import serviceAccountName as an envVar

Signed-off-by: russellcain <[email protected]>
kubevirt · Sep 19, 2024 · 4b97bf6 · 4b97bf6
1 parent a87f77d
commit 4b97bf6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pkg/controller/import-controller.go b/pkg/controller/import-controller.go
@@ -102,6 +102,7 @@ type importPodEnvVar struct {
 	extraHeaders       []string
 	secretExtraHeaders []string
 	cacheMode          string
+	serviceAccountName string
 }
 
 type importerPodArgs struct {
@@ -1263,6 +1264,10 @@ func makeImportEnv(podEnvVar *importPodEnvVar, uid types.UID) []corev1.EnvVar {
 			Name:  common.CacheMode,
 			Value: podEnvVar.cacheMode,
 		},
+		{
+			Name:  common.ImporterServiceAccountName,
+			Value: podEnvVar.serviceAccountName,
+		},
 	}
 	if podEnvVar.secretName != "" && podEnvVar.source != cc.SourceGCS {
 		env = append(env, corev1.EnvVar{

diff --git a/pkg/controller/import-controller_test.go b/pkg/controller/import-controller_test.go
@@ -962,7 +962,8 @@ var _ = Describe("Import test env", func() {
 			currentCheckpoint:  "",
 			previousCheckpoint: "",
 			finalCheckpoint:    "",
-			preallocation:      false}
+			preallocation:      false,
+			serviceAccountName: ""}
 		Expect(reflect.DeepEqual(makeImportEnv(testEnvVar, mockUID), createImportTestEnv(testEnvVar, mockUID))).To(BeTrue())
 	})
 })
@@ -1245,6 +1246,10 @@ func createImportTestEnv(podEnvVar *importPodEnvVar, uid string) []corev1.EnvVar
 			Name:  common.CacheMode,
 			Value: podEnvVar.cacheMode,
 		},
+		{
+			Name:  common.ImporterServiceAccountName,
+			Value: podEnvVar.serviceAccountName,
+		},
 	}
 
 	if podEnvVar.secretName != "" {