Fix check gcr service account

This address the pull requested merged aquasecurity#2108. but the check was getting the default value where the propery was missing
vadimceb · Jul 26, 2024 · d641e9e · d641e9e
1 parent c4de896
commit d641e9e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/plugins/trivy/image.go b/pkg/plugins/trivy/image.go
@@ -210,7 +210,7 @@ func GetPodSpecForStandaloneMode(ctx trivyoperator.PluginContext,
 			registryPasswordKey := fmt.Sprintf("%s.password", c.Name)
 			secretName := secret.Name
 			if CheckGcpCrOrPrivateRegistry(c.Image) &&
-				trivyoperator.GetDefaultConfig().GetScanJobUseGCRServiceAccount() {
+				ctx.GetTrivyOperatorConfig().GetScanJobUseGCRServiceAccount() {
 				createEnvandVolumeForGcr(&env, &volumeMounts, &volumes, &registryPasswordKey, &secretName)
 			} else {
 				env = append(env, corev1.EnvVar{

diff --git a/pkg/trivyoperator/config.go b/pkg/trivyoperator/config.go
@@ -68,7 +68,7 @@ const (
 	KeyNodeCollectorVolumeMounts         = "nodeCollector.volumeMounts"
 	KeyScanJobCustomVolumesMount         = "scanJob.customVolumesMount"
 	KeyScanJobCustomVolumes              = "scanJob.customVolumes"
-	KeyScanJobUseGCRServiceAccount       = "scanJob.UseGCRServiceAccount"
+	KeyScanJobUseGCRServiceAccount       = "scanJob.useGCRServiceAccount"
 
 	keyScanJobNodeSelector = "scanJob.nodeSelector"
 	keyScanJobAnnotations  = "scanJob.annotations"