Skip to content

fix: Correctly create volumeMounts for each container in GetPodSpec* functions #2819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
festeveira wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: Correctly create volumeMounts for each container in GetPodSpec* functions #2819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
137d4de
for GetPodSpecFor* fix containers sharing the same volumeMounts slice
festeveira Nov 21, 2025
b2b19b0
for GetPodSpecFor* fix init containers sharing the same volumeMounts …
festeveira Nov 21, 2025
811e015
Merge branch 'aquasecurity:main' into fix-duplicate-volume-mounts
festeveira Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions pkg/plugins/trivy/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ func GetPodSpecForStandaloneFSMode(ctx trivyoperator.PluginContext, config Confi
volumes = append(volumes, *volume)
volumeMounts = append(volumeMounts, *volumeMount)
}

initContainerCopyBinaryVolumeMounts := make([]corev1.VolumeMount, len(volumeMounts))
copy(initContainerCopyBinaryVolumeMounts, volumeMounts)
initContainerCopyBinary := corev1.Container{
Name: p.idGenerator.GenerateID(),
Image: trivyImageRef,
Expand All @@ -117,9 +120,11 @@ func GetPodSpecForStandaloneFSMode(ctx trivyoperator.PluginContext, config Confi
},
Resources: requirements,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
VolumeMounts: initContainerCopyBinaryVolumeMounts,
}

initContainerDBVolumeMounts := make([]corev1.VolumeMount, len(volumeMounts))
copy(initContainerDBVolumeMounts, volumeMounts)
initContainerDB := corev1.Container{
Name: p.idGenerator.GenerateID(),
Image: trivyImageRef,
Expand All @@ -139,7 +144,7 @@ func GetPodSpecForStandaloneFSMode(ctx trivyoperator.PluginContext, config Confi
},
Resources: requirements,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
VolumeMounts: initContainerDBVolumeMounts,
}

containers := make([]corev1.Container, 0)
Expand All @@ -157,6 +162,9 @@ func GetPodSpecForStandaloneFSMode(ctx trivyoperator.PluginContext, config Confi
}

for _, c := range getContainers(spec) {
containerVolumeMounts := make([]corev1.VolumeMount, len(volumeMounts))
copy(containerVolumeMounts, volumeMounts)

env := []corev1.EnvVar{
constructEnvVarSourceFromConfigMap("TRIVY_SEVERITY", trivyConfigName, KeyTrivySeverity),
ConfigWorkloadAnnotationEnvVars(workload, SkipFilesAnnotation, "TRIVY_SKIP_FILES", trivyConfigName, keyTrivySkipFiles),
Expand Down Expand Up @@ -232,7 +240,7 @@ func GetPodSpecForStandaloneFSMode(ctx trivyoperator.PluginContext, config Confi
secrets = append(secrets, &secret)
fileName := fmt.Sprintf("%s.json", secretName)
mountPath := fmt.Sprintf("/sbom-%s", c.Name)
CreateVolumeSbomFiles(&volumeMounts, &volumes, &secretName, fileName, mountPath, c.Name)
CreateVolumeSbomFiles(&containerVolumeMounts, &volumes, &secretName, fileName, mountPath, c.Name)
fscommand, args = GetSbomFSScanningArgs(ctx, Standalone, "", fmt.Sprintf("%s/%s", mountPath, fileName))
}
}
Expand All @@ -246,7 +254,7 @@ func GetPodSpecForStandaloneFSMode(ctx trivyoperator.PluginContext, config Confi
Args: args,
Resources: resourceRequirements,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
VolumeMounts: containerVolumeMounts,
})
}

Expand Down Expand Up @@ -328,6 +336,8 @@ func GetPodSpecForClientServerFSMode(ctx trivyoperator.PluginContext, config Con
},
}

initContainerCopyBinaryVolumeMounts := make([]corev1.VolumeMount, len(volumeMounts))
copy(initContainerCopyBinaryVolumeMounts, volumeMounts)
initContainerCopyBinary := corev1.Container{
Name: p.idGenerator.GenerateID(),
Image: trivyImageRef,
Expand All @@ -341,7 +351,7 @@ func GetPodSpecForClientServerFSMode(ctx trivyoperator.PluginContext, config Con
},
Resources: requirements,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
VolumeMounts: initContainerCopyBinaryVolumeMounts,
}

containers := make([]corev1.Container, 0)
Expand Down Expand Up @@ -381,6 +391,9 @@ func GetPodSpecForClientServerFSMode(ctx trivyoperator.PluginContext, config Con
}

for _, c := range getContainers(spec) {
containerVolumeMounts := make([]corev1.VolumeMount, len(volumeMounts))
copy(containerVolumeMounts, volumeMounts)

if ExcludeImage(ctx.GetTrivyOperatorConfig().ExcludeImages(), c.Image) {
continue
}
Expand Down Expand Up @@ -462,7 +475,7 @@ func GetPodSpecForClientServerFSMode(ctx trivyoperator.PluginContext, config Con
secrets = append(secrets, &secret)
fileName := fmt.Sprintf("%s.json", secretName)
mountPath := fmt.Sprintf("/sbom-%s", c.Name)
CreateVolumeSbomFiles(&volumeMounts, &volumes, &secretName, fileName, mountPath, c.Name)
CreateVolumeSbomFiles(&containerVolumeMounts, &volumes, &secretName, fileName, mountPath, c.Name)
fscommand, args = GetSbomFSScanningArgs(ctx, ClientServer, encodedTrivyServerURL.String(), fmt.Sprintf("%s/%s", mountPath, fileName))
}
}
Expand All @@ -476,7 +489,7 @@ func GetPodSpecForClientServerFSMode(ctx trivyoperator.PluginContext, config Con
Args: args,
Resources: resourceRequirements,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
VolumeMounts: containerVolumeMounts,
})
}

Expand Down
28 changes: 19 additions & 9 deletions pkg/plugins/trivy/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@
args = append(args, "--config", configFileMountPath)
}

initContainerDownloadDbVolumeMounts := make([]corev1.VolumeMount, len(volumeMounts))
copy(initContainerDownloadDbVolumeMounts, volumeMounts)
initContainers = append(initContainers, corev1.Container{
Name: p.idGenerator.GenerateID(),
Image: trivyImageRef,
Expand All @@ -152,7 +154,7 @@
Args: args,
Resources: requirements,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
VolumeMounts: initContainerDownloadDbVolumeMounts,
})

if !config.GetSkipJavaDBUpdate() && config.TrivyDBRepositoryCredentialsSet() {
Expand All @@ -168,6 +170,8 @@
argsDBUpdater = append(argsDBUpdater, "--config", configFileMountPath)
}

initContainerDownloadJavaDbVolumeMounts := make([]corev1.VolumeMount, len(volumeMounts))
copy(initContainerDownloadJavaDbVolumeMounts, volumeMounts)
initContainers = append(initContainers, corev1.Container{
Name: p.idGenerator.GenerateID(),
Image: trivyImageRef,
Expand All @@ -180,7 +184,7 @@
Args: argsDBUpdater,
Resources: requirements,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
VolumeMounts: initContainerDownloadJavaDbVolumeMounts,
})
}

Expand All @@ -200,7 +204,10 @@
}

for _, c := range containersSpec {
if ExcludeImage(ctx.GetTrivyOperatorConfig().ExcludeImages(), c.Image) {
containerVolumeMounts := make([]corev1.VolumeMount, len(volumeMounts))
copy(containerVolumeMounts, volumeMounts)

Check failure on line 209 in pkg/plugins/trivy/image.go

View workflow job for this annotation

GitHub Actions / Verify code 

File is not properly formatted (gci)
if ExcludeImage(ctx.GetTrivyOperatorConfig().ExcludeImages(), c.Image){
continue
}
env := []corev1.EnvVar{
Expand Down Expand Up @@ -254,7 +261,7 @@
secretName := secret.Name
if CheckGcpCrOrPrivateRegistry(c.Image) &&
ctx.GetTrivyOperatorConfig().GetScanJobUseGCRServiceAccount() {
createEnvandVolumeForGcr(&env, &volumeMounts, &volumes, &registryPasswordKey, &secretName)
createEnvandVolumeForGcr(&env, &containerVolumeMounts, &volumes, &registryPasswordKey, &secretName)
} else {
env = append(env, corev1.EnvVar{
Name: "TRIVY_USERNAME",
Expand Down Expand Up @@ -312,7 +319,7 @@
secrets = append(secrets, &secret)
fileName := fmt.Sprintf("%s.json", secretName)
mountPath := fmt.Sprintf("/sbom-%s", c.Name)
CreateVolumeSbomFiles(&volumeMounts, &volumes, &secretName, fileName, mountPath, c.Name)
CreateVolumeSbomFiles(&containerVolumeMounts, &volumes, &secretName, fileName, mountPath, c.Name)
cmd, args = GetSbomScanCommandAndArgs(ctx, Standalone, fmt.Sprintf("%s/%s", mountPath, fileName), "", resultFileName)
}
}
Expand All @@ -326,7 +333,7 @@
Args: args,
Resources: resourceRequirements,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
VolumeMounts: containerVolumeMounts,
})
}

Expand Down Expand Up @@ -433,6 +440,9 @@
}

for _, container := range containersSpec {
containerVolumeMounts := make([]corev1.VolumeMount, len(volumeMounts))
copy(containerVolumeMounts, volumeMounts)

if ExcludeImage(ctx.GetTrivyOperatorConfig().ExcludeImages(), container.Image) {
continue
}
Expand Down Expand Up @@ -481,7 +491,7 @@
if auth, ok := containersCredentials[container.Name]; ok && secret != nil {
if CheckGcpCrOrPrivateRegistry(container.Image) && auth.Username == "_json_key" {
registryServiceAccountAuthKey := fmt.Sprintf("%s.password", container.Name)
createEnvandVolumeForGcr(&env, &volumeMounts, &volumes, &registryServiceAccountAuthKey, &secret.Name)
createEnvandVolumeForGcr(&env, &containerVolumeMounts, &volumes, &registryServiceAccountAuthKey, &secret.Name)
} else {
registryUsernameKey := fmt.Sprintf("%s.username", container.Name)
registryPasswordKey := fmt.Sprintf("%s.password", container.Name)
Expand Down Expand Up @@ -556,7 +566,7 @@
secrets = append(secrets, &secret)
fileName := fmt.Sprintf("%s.json", secretName)
mountPath := fmt.Sprintf("/sbom-%s", container.Name)
CreateVolumeSbomFiles(&volumeMounts, &volumes, &secretName, fileName, mountPath, container.Name)
CreateVolumeSbomFiles(&containerVolumeMounts, &volumes, &secretName, fileName, mountPath, container.Name)
cmd, args = GetSbomScanCommandAndArgs(ctx, ClientServer, fmt.Sprintf("%s/%s", mountPath, fileName), encodedTrivyServerURL.String(), resultFileName)
}
}
Expand All @@ -570,7 +580,7 @@
Args: args,
Resources: requirements,
SecurityContext: securityContext,
VolumeMounts: volumeMounts,
VolumeMounts: containerVolumeMounts,
})
}

Expand Down
Loading