Skip to content

ROX-33247: fix a thinko#19172

Merged
rhacs-bot merged 2 commits intomasterfrom
porridge/ROX-33247-fix
Feb 25, 2026
Merged

ROX-33247: fix a thinko#19172
rhacs-bot merged 2 commits intomasterfrom
porridge/ROX-33247-fix

Conversation

@porridge
Copy link
Contributor

@porridge porridge commented Feb 25, 2026 •
edited
Loading

Description

Noticed in review of backport PR, now fixing this in master too.

User-facing documentation

Testing and quality

  • the change is production ready: the change is GA, or otherwise the functionality is gated by a feature flag
  • CI results are inspected

Automated testing

  • not modified existing tests

How I validated my change

CI is enough.

@openshift-ci
Copy link

openshift-ci bot commented Feb 25, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@porridge
Copy link
Contributor Author

porridge commented Feb 25, 2026

/fixxx

@porridge porridge requested a review from mclasmeier February 25, 2026 05:25
@rhacs-bot
Running scripts/fixxxers/operator/20-generate.sh
71e187a 
make: Entering directory '/__w/stackrox/stackrox/operator'
[[ ${ROX_OPERATOR_SKIP_PROTO_GENERATED_SRCS:-false} = true ]] || make -C .. proto-generated-srcs
make[1]: Entering directory '/__w/stackrox/stackrox'
+ /__w/stackrox/stackrox/.proto/protoc-linux-x86_64-32.1/bin/protoc
make[2]: Entering directory '/__w/stackrox/stackrox'
+ /__w/stackrox/stackrox/.proto/.downloads
+ /__w/stackrox/stackrox/.proto/.downloads/protoc-32.1-linux-x86_64.zip
make[2]: Leaving directory '/__w/stackrox/stackrox'
+ protoc-gen-go
+ /__w/stackrox/stackrox/generated/api/integrations/splunk_service.pb.go
+ /__w/stackrox/stackrox/generated/api/common/extended_rpc_status.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/network_policy_service.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/compliance_results_service.pb.go
+ /__w/stackrox/stackrox/generated/storage/base_image_repository.pb.go
+ /__w/stackrox/stackrox/generated/tools/local-sensor/message.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/wrapper/splunk_alert.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/compliance/compliance_data.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/virtualmachine/v1/index_report.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/scanner/v4/matcher_service.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/sensor/collector.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/process_listening_on_ports_update.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/v1/token_service.pb.go
+ /__w/stackrox/stackrox/generated/test/test.pb.go
+ protoc-gen-go-vtproto
+ /__w/stackrox/stackrox/generated/api/integrations/splunk_service_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/api/common/extended_rpc_status_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/network_policy_service_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/report_service_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/compliance_results_service_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/vuln_state_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/storage/base_image_repository_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/storage/operation_status_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/tools/local-sensor/message_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/wrapper/splunk_alert_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/compliance/compliance_data_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/virtualmachine/v1/index_report_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/scanner/v4/matcher_service_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/sensor/collector_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/sensor/network_enums_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/sensor/sfa_iservice_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/process_listening_on_ports_update_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/v1/token_service_vtproto.pb.go
+ /__w/stackrox/stackrox/generated/test/test_vtproto.pb.go
+ protoc-gen-go-grpc
+ /__w/stackrox/stackrox/generated/api/integrations/splunk_service_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/common/extended_rpc_status_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/network_policy_service_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/common_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/empty_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/notifications_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/pagination_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/sbom_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/traits_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/signal_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v1/audit_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/compliance_results_service_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/common_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/vuln_state_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/compliance_common_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/pagination_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/user_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/search_query_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/scan_component_grpc.pb.go
+ /__w/stackrox/stackrox/generated/api/v2/vulnerability_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/base_image_repository_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/taints_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/vuln_requests_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/network_policy_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/labels_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/operation_status_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/sensor_upgrade_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/rbac_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/node_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/version_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/base_image_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/process_baseline_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/hash_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/system_info_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/cluster_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/mitre_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/image_integration_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/node_integration_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/alert_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/file_access_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/policy_category_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/common_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/namespace_metadata_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/telemetry_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/container_runtime_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/external_backup_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/test_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/image_v2_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/service_account_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/resource_collection_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/risk_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/network_flow_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/api_token_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/blob_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/installation_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/notification_schedule_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/compliance_operator_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/helm_cluster_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/config_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/process_indicator_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/orchestrator_integration_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/administration_usage_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/declarative_config_health_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/deployment_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/node_component_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/compliance_integration_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/report_snapshot_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/kube_event_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/user_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/administration_event_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/network_graph_config_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/notifier_enc_config_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/traits_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/schedule_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/signature_integration_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/service_identity_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/notifier_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/process_listening_on_port_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/auth_machine_to_machine_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/virtual_machine_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/network_baseline_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/compliance_operator_v2_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/role_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/delegated_registry_config_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/integration_health_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/auth_provider_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/scope_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/http_endpoint_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/secret_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/cloud_source_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/discovered_cluster_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/policy_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/image_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/compliance_config_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/group_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/compliance_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/report_configuration_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/image_component_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/log_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/cluster_init_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/vulnerability_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/relations_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/report_notifier_configuration_grpc.pb.go
+ /__w/stackrox/stackrox/generated/storage/cve_grpc.pb.go
+ /__w/stackrox/stackrox/generated/tools/local-sensor/message_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/wrapper/splunk_alert_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/compliance/compliance_data_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/virtualmachine/v1/index_report_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/virtualmachine/v1/virtual_machine_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/scanner/v4/matcher_service_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/scanner/v4/index_report_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/scanner/v4/common_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/scanner/v4/vulnerability_report_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/sensor/collector_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/sensor/admission_control_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/sensor/sfa_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/sensor/network_enums_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/sensor/network_connection_info_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/process_listening_on_ports_update_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/cluster_config_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/sensor_upgrade_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/telemetry_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/local_scanner_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/network_flow_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/cluster_metrics_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/auth_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/deployment_enhancement_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/compliance_operator_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/sensor_events_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/baseline_sync_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/secured_cluster_cert_refresh_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/v1/token_service_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/policy_sync_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/hello_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/delegated_registry_config_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/cluster_status_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/image_grpc.pb.go
+ /__w/stackrox/stackrox/generated/internalapi/central/network_baseline_sync_grpc.pb.go
+ /__w/stackrox/stackrox/generated/test/test_grpc.pb.go
+ protoc-gen-grpc-gateway
+ /__w/stackrox/stackrox/generated/api/integrations/splunk_service.pb.gw.go
+ /__w/stackrox/stackrox/generated/api/v1/network_policy_service.pb.gw.go
+ /__w/stackrox/stackrox/generated/api/v2/compliance_results_service.pb.gw.go
+ /__w/stackrox/stackrox/generated/internalapi/scanner/v4/matcher_service.pb.gw.go
+ /__w/stackrox/stackrox/generated/internalapi/scanner/v4/indexer_service.pb.gw.go
+ /__w/stackrox/stackrox/generated/internalapi/central/development_service.pb.gw.go
+ /__w/stackrox/stackrox/generated/internalapi/central/v1/token_service.pb.gw.go
+ protoc-gen-openapiv2
+ /__w/stackrox/stackrox/generated/api/v1/network_policy_service.swagger.json
+ /__w/stackrox/stackrox/generated/api/v2/compliance_results_service.swagger.json
+ protoc-go-inject-tag
+ inject-proto-tags
+ cleanup-swagger-json-gotags
+ proto-generated-srcs
make[2]: Entering directory '/__w/stackrox/stackrox'
+ clean-obsolete-protos
/__w/stackrox/stackrox/tools/clean_autogen_protos.py --protos /__w/stackrox/stackrox/proto --generated /__w/stackrox/stackrox/generated
make[2]: Leaving directory '/__w/stackrox/stackrox'
make[1]: Leaving directory '/__w/stackrox/stackrox'
+ controller-gen
/__w/stackrox/stackrox/operator/.gotools/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
# The generated source files might not comply with the current go formatting, so format them explicitly.
go fmt ./api/...
make: Leaving directory '/__w/stackrox/stackrox/operator'
@porridge
Copy link
Contributor Author

porridge commented Feb 25, 2026

/fixxx

@porridge porridge marked this pull request as ready for review February 25, 2026 05:54
@porridge porridge added do-not-merge/work-in-progress auto-merge Auto-merge minor and patch version bumps auto-retest PRs with this label will be automatically retested if prow checks fails labels Feb 25, 2026
@rhacs-bot
Copy link
Contributor

rhacs-bot commented Feb 25, 2026 •
edited
Loading

Images are ready for the commit at 71e187a.

To use with deploy scripts, first export MAIN_IMAGE_TAG=4.11.x-171-g71e187a0b1.

@codecov
Copy link

codecov bot commented Feb 25, 2026 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 49.54%. Comparing base (5f9e5e6) to head (71e187a).
⚠️ Report is 11 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master   #19172   +/-   ##
=======================================
  Coverage   49.54%   49.54%           
=======================================
  Files        2674     2674           
  Lines      201755   201755           
=======================================
+ Hits        99952    99955    +3     
+ Misses      94343    94341    -2     
+ Partials     7460     7459    -1
Flag Coverage Δ
go-unit-tests 49.54% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@rhacs-bot
Copy link
Contributor

rhacs-bot commented Feb 25, 2026

/retest

1 similar comment
@rhacs-bot
Copy link
Contributor

rhacs-bot commented Feb 25, 2026

/retest

@rhacs-bot rhacs-bot merged commit 02aadd3 into master Feb 25, 2026
112 checks passed
@rhacs-bot rhacs-bot deleted the porridge/ROX-33247-fix branch February 25, 2026 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mclasmeier mclasmeier mclasmeier approved these changes

Assignees

No one assigned

Labels

auto-merge Auto-merge minor and patch version bumps auto-retest PRs with this label will be automatically retested if prow checks fails

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@porridge @rhacs-bot @mclasmeier