stackrox · dashrews78 · Apr 1, 2026 · Mar 31, 2026 · Mar 31, 2026 · Mar 31, 2026
diff --git a/central/image/datastore/datastore_impl.go b/central/image/datastore/datastore_impl.go
@@ -298,7 +298,7 @@ func (ds *datastoreImpl) DeleteImages(ctx context.Context, ids ...string) error
 			return err
 		}
 	}
-	// removing component risk handled by pruning
+	// Component risks are not stored in the risk datastore (only embedded in components).
 	return errorList.ToError()
 }
 

diff --git a/central/imagev2/datastore/datastore_impl.go b/central/imagev2/datastore/datastore_impl.go
@@ -322,7 +322,7 @@ func (ds *datastoreImpl) DeleteImages(ctx context.Context, ids ...string) error
 			return err
 		}
 	}
-	// removing component risk handled by pruning
+	// Component risks are not stored in the risk datastore (only embedded in components).
 	return errorList.ToError()
 }
 

diff --git a/central/pruning/pruning.go b/central/pruning/pruning.go
@@ -15,7 +15,7 @@ import (
 	deploymentDatastore "github.com/stackrox/rox/central/deployment/datastore"
 	"github.com/stackrox/rox/central/globaldb"
 	imageDatastore "github.com/stackrox/rox/central/image/datastore"
-	imageComponentV2Datastore "github.com/stackrox/rox/central/imagecomponent/v2/datastore"
+
 	imageV2Datastore "github.com/stackrox/rox/central/imagev2/datastore"
 	logimbueDataStore "github.com/stackrox/rox/central/logimbue/store"
 	"github.com/stackrox/rox/central/metrics"
@@ -116,7 +116,6 @@ func newGarbageCollector(alerts alertDatastore.DataStore,
 	processbaseline processBaselineDatastore.DataStore,
 	networkflows networkFlowDatastore.ClusterDataStore,
 	config configDatastore.DataStore,
-	imageComponentsV2 imageComponentV2Datastore.DataStore,
 	risks riskDataStore.DataStore,
 	vulnReqs vulnReqDataStore.DataStore,
 	serviceAccts serviceAccountDataStore.DataStore,
@@ -130,61 +129,59 @@ func newGarbageCollector(alerts alertDatastore.DataStore,
 	roleStore roleDataStore.DataStore,
 ) GarbageCollector {
 	return &garbageCollectorImpl{
-		alerts:            alerts,
-		clusters:          clusters,
-		nodes:             nodes,
-		images:            images,
-		imagesV2:          imagesV2,
-		imageComponentsV2: imageComponentsV2,
-		deployments:       deployments,
-		pods:              pods,
-		processes:         processes,
-		processbaseline:   processbaseline,
-		networkflows:      networkflows,
-		config:            config,
-		risks:             risks,
-		vulnReqs:          vulnReqs,
-		serviceAccts:      serviceAccts,
-		k8sRoles:          k8sRoles,
-		k8sRoleBindings:   k8sRoleBindings,
-		logimbueStore:     logimbueStore,
-		stopper:           concurrency.NewStopper(),
-		postgres:          globaldb.GetPostgres(),
-		reportSnapshot:    reportSnapshotDS,
-		plops:             plops,
-		blobStore:         blobStore,
-		nodeCVEStore:      nodeCVEStore,
-		roleStore:         roleStore,
+		alerts:          alerts,
+		clusters:        clusters,
+		nodes:           nodes,
+		images:          images,
+		imagesV2:        imagesV2,
+		deployments:     deployments,
+		pods:            pods,
+		processes:       processes,
+		processbaseline: processbaseline,
+		networkflows:    networkflows,
+		config:          config,
+		risks:           risks,
+		vulnReqs:        vulnReqs,
+		serviceAccts:    serviceAccts,
+		k8sRoles:        k8sRoles,
+		k8sRoleBindings: k8sRoleBindings,
+		logimbueStore:   logimbueStore,
+		stopper:         concurrency.NewStopper(),
+		postgres:        globaldb.GetPostgres(),
+		reportSnapshot:  reportSnapshotDS,
+		plops:           plops,
+		blobStore:       blobStore,
+		nodeCVEStore:    nodeCVEStore,
+		roleStore:       roleStore,
 	}
 }
 
 type garbageCollectorImpl struct {
 	postgres pgPkg.DB
 
-	alerts            alertDatastore.DataStore
-	clusters          clusterDatastore.DataStore
-	nodes             nodeDatastore.DataStore
-	images            imageDatastore.DataStore
-	imagesV2          imageV2Datastore.DataStore
-	imageComponentsV2 imageComponentV2Datastore.DataStore
-	deployments       deploymentDatastore.DataStore
-	pods              podDatastore.DataStore
-	processes         processDatastore.DataStore
-	processbaseline   processBaselineDatastore.DataStore
-	networkflows      networkFlowDatastore.ClusterDataStore
-	config            configDatastore.DataStore
-	risks             riskDataStore.DataStore
-	vulnReqs          vulnReqDataStore.DataStore
-	serviceAccts      serviceAccountDataStore.DataStore
-	k8sRoles          k8sRoleDataStore.DataStore
-	k8sRoleBindings   roleBindingDataStore.DataStore
-	logimbueStore     logimbueDataStore.Store
-	stopper           concurrency.Stopper
-	reportSnapshot    snapshotDS.DataStore
-	plops             plopDataStore.DataStore
-	blobStore         blobDatastore.Datastore
-	nodeCVEStore      nodeCVEDS.DataStore
-	roleStore         roleDataStore.DataStore
+	alerts          alertDatastore.DataStore
+	clusters        clusterDatastore.DataStore
+	nodes           nodeDatastore.DataStore
+	images          imageDatastore.DataStore
+	imagesV2        imageV2Datastore.DataStore
+	deployments     deploymentDatastore.DataStore
+	pods            podDatastore.DataStore
+	processes       processDatastore.DataStore
+	processbaseline processBaselineDatastore.DataStore
+	networkflows    networkFlowDatastore.ClusterDataStore
+	config          configDatastore.DataStore
+	risks           riskDataStore.DataStore
+	vulnReqs        vulnReqDataStore.DataStore
+	serviceAccts    serviceAccountDataStore.DataStore
+	k8sRoles        k8sRoleDataStore.DataStore
+	k8sRoleBindings roleBindingDataStore.DataStore
+	logimbueStore   logimbueDataStore.Store
+	stopper         concurrency.Stopper
+	reportSnapshot  snapshotDS.DataStore
+	plops           plopDataStore.DataStore
+	blobStore       blobDatastore.Datastore
+	nodeCVEStore    nodeCVEDS.DataStore
+	roleStore       roleDataStore.DataStore
 }
 
 func (g *garbageCollectorImpl) Start() {
@@ -1031,7 +1028,6 @@ func (g *garbageCollectorImpl) getAlertsToPrune(query *v1.Query) ([]string, erro
 func (g *garbageCollectorImpl) removeOrphanedRisks() {
 	g.removeOrphanedDeploymentRisks()
 	g.removeOrphanedImageRisks()
-	g.removeOrphanedImageComponentRisks()
 	g.removeOrphanedNodeRisks()
 }
 
@@ -1069,24 +1065,6 @@ func (g *garbageCollectorImpl) removeOrphanedImageRisks() {
 	g.removeRisks(storage.RiskSubjectType_IMAGE, prunable...)
 }
 
-func (g *garbageCollectorImpl) removeOrphanedImageComponentRisks() {
-	defer metrics.SetPruningDuration(time.Now(), "ImageCompositionRisks")
-	var prunable []string
-	var results []search.Result
-	var err error
-	componentsWithRisk := g.getRisks(storage.RiskSubjectType_IMAGE_COMPONENT)
-
-	results, err = g.imageComponentsV2.Search(pruningCtx, search.EmptyQuery())
-	if err != nil {
-		log.Errorf("[Risk pruning] Searching image components: %v", err)
-		return
-	}
-
-	prunable = componentsWithRisk.Difference(search.ResultsToIDSet(results)).AsSlice()
-	log.Infof("[Risk pruning] Removing %d image component risks", len(prunable))
-	g.removeRisks(storage.RiskSubjectType_IMAGE_COMPONENT, prunable...)
-}
-
 func (g *garbageCollectorImpl) removeOrphanedNodeRisks() {
 	defer metrics.SetPruningDuration(time.Now(), "NodeRisks")
 	nodesWithRisk := g.getRisks(storage.RiskSubjectType_NODE)

diff --git a/central/pruning/pruning_test.go b/central/pruning/pruning_test.go
@@ -573,7 +573,7 @@ func (s *PruningTestSuite) TestImagePruning() {
 			nodes := s.generateNodeDataStructures()
 
 			gc := newGarbageCollector(alerts, nodes, images, imagesV2, nil, deployments, pods,
-				nil, nil, nil, config, nil, nil,
+				nil, nil, nil, config, nil,
 				nil, nil, nil, nil, nil, nil, nil,
 				nil, nil, nil).(*garbageCollectorImpl)
 
@@ -866,7 +866,7 @@ func (s *PruningTestSuite) TestClusterPruning() {
 			}
 
 			gc := newGarbageCollector(nil, nil, nil, nil, clusterDS, deploymentsDS, nil,
-				nil, nil, nil, nil, nil, nil,
+				nil, nil, nil, nil, nil,
 				nil, nil, nil, nil, nil, nil,
 				nil, nil, nil, nil).(*garbageCollectorImpl)
 			gc.collectClusters(c.config)
@@ -993,7 +993,7 @@ func (s *PruningTestSuite) TestClusterPruningCentralCheck() {
 			lastClusterPruneTime = time.Now().Add(-24 * time.Hour)
 
 			gc := newGarbageCollector(nil, nil, nil, nil, clusterDS, deploymentsDS, nil,
-				nil, nil, nil, nil, nil, nil,
+				nil, nil, nil, nil, nil,
 				nil, nil, nil, nil, nil, nil,
 				nil, nil, nil, nil).(*garbageCollectorImpl)
 			gc.collectClusters(getCluserRetentionConfig(60, 90, 72))
@@ -1171,7 +1171,7 @@ func (s *PruningTestSuite) TestAlertPruning() {
 			nodes := s.generateNodeDataStructures()
 
 			gc := newGarbageCollector(alerts, nodes, images, imagesV2, nil, deployments, nil,
-				nil, nil, nil, config, nil, nil,
+				nil, nil, nil, config, nil,
 				nil, nil, nil, nil, nil, nil,
 				nil, nil, nil, nil).(*garbageCollectorImpl)
 

diff --git a/central/pruning/singleton.go b/central/pruning/singleton.go
@@ -8,7 +8,7 @@ import (
 	nodeCVEDS "github.com/stackrox/rox/central/cve/node/datastore"
 	deploymentDatastore "github.com/stackrox/rox/central/deployment/datastore"
 	imagesDatastore "github.com/stackrox/rox/central/image/datastore"
-	imageComponentV2Datastore "github.com/stackrox/rox/central/imagecomponent/v2/datastore"
+
 	imageV2Datastore "github.com/stackrox/rox/central/imagev2/datastore"
 	logimbueStore "github.com/stackrox/rox/central/logimbue/store"
 	networkFlowsDataStore "github.com/stackrox/rox/central/networkgraph/flow/datastore"
@@ -46,7 +46,6 @@ func Singleton() GarbageCollector {
 			processBaselineDatastore.Singleton(),
 			networkFlowsDataStore.Singleton(),
 			configDatastore.Singleton(),
-			imageComponentV2Datastore.Singleton(),
 			riskDataStore.Singleton(),
 			vulnReqDataStore.Singleton(),
 			serviceAccountDataStore.Singleton(),