Skip to content

#2680 Grant delete permissions for scheduled scans in auto-discovery #2871

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 3 commits into from
Jan 28, 2025
Merged

#2680 Grant delete permissions for scheduled scans in auto-discovery #2871

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
6d3b786
#2680 Grant delete permissions for scheduled scans in auto-discovery
BorisShek Jan 27, 2025
6c9d08a
#2680 Update auto-discovery tests snapshot
BorisShek Jan 27, 2025
ccb82e7
#2680 Handle missing ScheduledScan gracefully by auto-discovery
BorisShek Jan 28, 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
5 changes: 4 additions & 1 deletion auto-discovery/kubernetes/.helmignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ main.go
Makefile
PROJECT
auto-discovery-config.yaml
./tests/
./tests/
docs/
auto-discovery-kubernetes.tar
pull-secret-extractor/
8 changes: 6 additions & 2 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 @@ -47,7 +47,7 @@ type ContainerAutoDiscoveryTemplateArgs struct {
}

// +kubebuilder:rbac:groups="execution.securecodebox.io",resources=scantypes,verbs=get;list;watch
// +kubebuilder:rbac:groups="execution.securecodebox.io",resources=scheduledscans,verbs=get;list;watch;create;update;patch
// +kubebuilder:rbac:groups="execution.securecodebox.io",resources=scheduledscans,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups="execution.securecodebox.io/status",resources=scheduledscans,verbs=get;update;patch
// +kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch
// +kubebuilder:rbac:groups="",resources=services/status,verbs=get
Expand Down Expand Up @@ -427,7 +427,11 @@ 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 {
r.Log.Error(err, "Unable to fetch scan", "name", scanName)
if k8sErrors.IsNotFound(err) {
r.Log.Info("Scan was already deleted, nothing to do", "name", scanName)
} else {
r.Log.Error(err, "Unable to fetch scan", "name", scanName)
}
} else if !r.containerIDInUse(ctx, pod, imageID) {
result[cleanedImageID] = append(result[cleanedImageID], scanConfig)
}
Expand Down
2 changes: 1 addition & 1 deletion auto-discovery/kubernetes/controllers/service_scan_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type ServiceAutoDiscoveryTemplateArgs struct {
const requeueInterval = 5 * time.Second

// +kubebuilder:rbac:groups="execution.securecodebox.io",resources=scantypes,verbs=get;list;watch
// +kubebuilder:rbac:groups="execution.securecodebox.io",resources=scheduledscans,verbs=get;list;watch;create;update;patch
// +kubebuilder:rbac:groups="execution.securecodebox.io",resources=scheduledscans,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups="execution.securecodebox.io/status",resources=scheduledscans,verbs=get;update;patch
// +kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch
// +kubebuilder:rbac:groups="",resources=services/status,verbs=get
Expand Down
1 change: 1 addition & 0 deletions auto-discovery/kubernetes/templates/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ rules:
- scheduledscans
verbs:
- create
- delete
- get
- list
- patch
Expand Down
1 change: 1 addition & 0 deletions auto-discovery/kubernetes/tests/__snapshot__/auto-discovery_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ matches the snapshot:
- scheduledscans
verbs:
- create
- delete
- get
- list
- patch
Expand Down
Loading