Skip to content

ROX-19024: Remove RHCOS FF #1245

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
merged 1 commit into from
Aug 23, 2023
Merged

ROX-19024: Remove RHCOS FF #1245

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions api/v1/nodescan/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"github.com/stackrox/scanner/ext/versionfmt"
v1 "github.com/stackrox/scanner/generated/scanner/api/v1"
k8scache "github.com/stackrox/scanner/k8s/cache"
featureFlags "github.com/stackrox/scanner/pkg/features"
"github.com/stackrox/scanner/pkg/repo2cpe"
"github.com/stackrox/scanner/pkg/version"
"github.com/stackrox/scanner/pkg/wellknownnamespaces"
Expand Down Expand Up @@ -242,7 +241,7 @@ func (s *serviceImpl) getRuntimeVulns(containerRuntime *v1.GetNodeVulnerabilitie

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

Expand Down
2 changes: 0 additions & 2 deletions chart/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ spec:
fieldPath: metadata.name
- name: ROX_SKIP_PEER_VALIDATION
value: "true"
- name: ROX_RHCOS_NODE_SCANNING
value: "true"
- name: ROX_ACTIVE_VULN_MGMT
value: "true"
resources:
Expand Down
3 changes: 0 additions & 3 deletions pkg/features/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,4 @@ var (
ContinueUnknownOS = registerFeature("Enable continuation upon detecting unknown OS", "ROX_CONTINUE_UNKNOWN_OS", true)
// RHEL9Scanning enables support for scanning RHEL9-based images.
RHEL9Scanning = registerFeature("Enable support for scanning RHEL9 images", "ROX_RHEL9_SCANNING", true)

// RHCOSNodeScanning enables phase 1 functions of "Full host level vulnerability scanning for RHCOS nodes" (ROX-10818)
RHCOSNodeScanning = registerFeature("Enabling Full host level vulnerability scanning for RHCOS nodes", "ROX_RHCOS_NODE_SCANNING", true)
)