Skip to content

Commit c9af718

Browse files
authored
ROX-19024: Remove RHCOS FF (#1245)
1 parent 123aac5 commit c9af718

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

api/v1/nodescan/service.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/stackrox/scanner/ext/versionfmt"
2222
v1 "github.com/stackrox/scanner/generated/scanner/api/v1"
2323
k8scache "github.com/stackrox/scanner/k8s/cache"
24-
featureFlags "github.com/stackrox/scanner/pkg/features"
2524
"github.com/stackrox/scanner/pkg/repo2cpe"
2625
"github.com/stackrox/scanner/pkg/version"
2726
"github.com/stackrox/scanner/pkg/wellknownnamespaces"
@@ -242,7 +241,7 @@ func (s *serviceImpl) getRuntimeVulns(containerRuntime *v1.GetNodeVulnerabilitie
242241

243242
func (s *serviceImpl) GetNodeVulnerabilities(ctx context.Context, req *v1.GetNodeVulnerabilitiesRequest) (*v1.GetNodeVulnerabilitiesResponse, error) {
244243
// If NodeInventory is empty `req.GetComponents() == nil` then fallback to v1 scanning
245-
if req.GetComponents() == nil || !featureFlags.RHCOSNodeScanning.Enabled() {
244+
if req.GetComponents() == nil {
246245
return s.getNodeVulnerabilitiesLegacy(ctx, req)
247246
}
248247

chart/templates/deployment.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ spec:
2828
fieldPath: metadata.name
2929
- name: ROX_SKIP_PEER_VALIDATION
3030
value: "true"
31-
- name: ROX_RHCOS_NODE_SCANNING
32-
value: "true"
3331
- name: ROX_ACTIVE_VULN_MGMT
3432
value: "true"
3533
resources:

pkg/features/list.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@ var (
55
ContinueUnknownOS = registerFeature("Enable continuation upon detecting unknown OS", "ROX_CONTINUE_UNKNOWN_OS", true)
66
// RHEL9Scanning enables support for scanning RHEL9-based images.
77
RHEL9Scanning = registerFeature("Enable support for scanning RHEL9 images", "ROX_RHEL9_SCANNING", true)
8-
9-
// RHCOSNodeScanning enables phase 1 functions of "Full host level vulnerability scanning for RHCOS nodes" (ROX-10818)
10-
RHCOSNodeScanning = registerFeature("Enabling Full host level vulnerability scanning for RHCOS nodes", "ROX_RHCOS_NODE_SCANNING", true)
118
)

0 commit comments

Comments
 (0)