8000 Adjust logs for container auto-discovery by BorisShek · Pull Request #2932 · secureCodeBox/secureCodeBox · GitHub
[go: up one dir, main page]
Skip to content

Adjust logs for container auto-discovery #2932

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

Merged
J12934 merged 1 commit into from
Mar 6, 2025
Merged

Adjust logs for container auto-discovery #2932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions auto-discovery/kubernetes/controllers/container_scan_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ func podNotReady(pod corev1.Pod) bool {
func (r *ContainerScanReconciler) checkIfNewScansNeedToBeCreated(ctx context.Context, pod corev1.Pod) {
r.Log.V(8).Info("Pod is running", "pod", pod.Name, "namespace", pod.Namespace)
nonScannedImageIDs := r.getNonScannedImageIDs(ctx, pod)
//log if there are any unscanned containers
if len(nonScannedImageIDs) > 0 {
r.Log.Info("Discovered one or more new unscanned containers; scanning them now", "pod", pod.Name, "namespace", pod.Namespace)
}
r.createScheduledScans(ctx, pod, nonScannedImageIDs)
}

Expand Down Expand Up @@ -413,6 +417,10 @@ func (r *ContainerScanReconciler) checkIfScansNeedToBeDeleted(ctx context.Contex
r.Log.V(8).Info("Pod will be deleted", "pod", pod.Name, "namespace", pod.Namespace, "timestamp", pod.DeletionTimestamp)
allImageIDs := getImageIDsForPod(pod)
imageIDsToBeDeleted := r.getOrphanedScanImageIDs(ctx, pod, allImageIDs)
//log if there are any orphaned scans
if len(imageIDsToBeDeleted) > 0 {
r.Log.Info("Discovered one or more 'Trivy' scans related to a non-active container; deleting them now", "pod", pod.Name, "namespace", pod.Namespace)
}
r.deleteScans(ctx, pod, imageIDsToBeDeleted)
}

Expand All @@ -428,9 +436,7 @@ func (r *ContainerScanReconciler) getOrphanedScanImageIDs(ctx context.Context, p
var scan executionv1.ScheduledScan
err := r.Client.Get(ctx, types.NamespacedName{Name: scanName, Namespace: pod.Namespace}, &scan)
if err != nil {
if k8sErrors.IsNotFound(err) {
r.Log.Info("Scan was already deleted, nothing to do", "name", scanName)
} else {
if !k8sErrors.IsNotFound(err) {
r.Log.Error(err, "Unable to fetch scan", "name", scanName)
}
} else if !r.containerIDInUse(ctx, pod, imageID) {
Expand Down
Loading
Oops, something went wrong.
0