Skip to content

ROX-37158: rename workload type exclusion to kind #23242

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
clickboo merged 1 commit into from
Oct 5, 2026
Merged

ROX-37158: rename workload type exclusion to kind #23242

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
6 changes: 3 additions & 3 deletions pkg/centralsensor/caps_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ const (
// a new Sensor" from "old Sensor that predates VM telemetry fields."
VirtualMachineTelemetryCap SensorCapability = "VirtualMachineTelemetry"

// WorkloadTypeExclusionCap identifies the capability of Sensor to honor
// Exclusion.exclude_by_type rules. Central strips those rules when syncing
// WorkloadKindExclusionCap identifies the capability of Sensor to honor
// Exclusion.exclude_by_kind rules. Central strips those rules when syncing
// policies to Sensors that lack this capability.
WorkloadTypeExclusionCap SensorCapability = "WorkloadTypeExclusion"
WorkloadKindExclusionCap SensorCapability = "WorkloadKindExclusion"
)
4 changes: 2 additions & 2 deletions pkg/features/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ var (
// EvaluationFilter enables evaluation filtering in policy evaluation.
EvaluationFilter = registerFeature("Enable evaluation filtering in policy evaluation", "ROX_EVALUATION_FILTER", enabled)

// PolicyWorkloadTypeExclusion enables excluding all workloads of selected Kubernetes kinds (Job, CronJob) from a policy.
PolicyWorkloadTypeExclusion = registerFeature("Enable excluding all workloads of a given type from a policy", "ROX_POLICY_WORKLOAD_TYPE_EXCLUSION")
// PolicyWorkloadKindExclusion enables excluding all workloads of selected Kubernetes kinds (Job, CronJob) from a policy.
PolicyWorkloadKindExclusion = registerFeature("Enable excluding all workloads of a given kind from a policy", "ROX_POLICY_WORKLOAD_KIND_EXCLUSION")

// UISecretsPageMigration enables the secrets list page under the Risk section
UISecretsPageMigration = registerFeature("Display secrets list page under Risk section", "ROX_UI_SECRETS_PAGE_MIGRATION")
Expand Down
4 changes: 2 additions & 2 deletions sensor/common/detector/detector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ func (d *detectorImpl) Notify(e common.SensorComponentEvent) {

func (d *detectorImpl) Capabilities() []centralsensor.SensorCapability {
caps := []centralsensor.SensorCapability{centralsensor.SensorDetectionCap}
if features.PolicyWorkloadTypeExclusion.Enabled() {
caps = append(caps, centralsensor.WorkloadTypeExclusionCap)
if features.PolicyWorkloadKindExclusion.Enabled() {
caps = append(caps, centralsensor.WorkloadKindExclusionCap)
}
return caps
}
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/lib-compat.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ collect_feature_flags() {
env_with_default ROX_NODE_VULNERABILITY_REPORTS "true"
env_with_default ROX_TAILORED_PROFILES "true"
env_with_default ROX_INIT_CONTAINER_SUPPORT "true"
env_with_default ROX_POLICY_WORKLOAD_TYPE_EXCLUSION "true"
env_with_default ROX_POLICY_WORKLOAD_KIND_EXCLUSION "true"
env_with_default ROX_VIRTUAL_MACHINES_ENHANCED_DATA_MODEL "true"
env_with_default ROX_LABEL_BASED_POLICY_SCOPING "true"
env_with_default ROX_POLICY_CRITERIA_MODAL "true"
Expand Down
10 changes: 5 additions & 5 deletions tests/e2e/lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ export_test_environment() {
ci_export ROX_NETFLOW_BATCHING "${ROX_NETFLOW_BATCHING:-true}"
ci_export ROX_NETFLOW_CACHE_LIMITING "${ROX_NETFLOW_CACHE_LIMITING:-true}"
ci_export ROX_INIT_CONTAINER_SUPPORT "${ROX_INIT_CONTAINER_SUPPORT:-true}"
ci_export ROX_POLICY_WORKLOAD_TYPE_EXCLUSION "${ROX_POLICY_WORKLOAD_TYPE_EXCLUSION:-true}"
ci_export ROX_POLICY_WORKLOAD_KIND_EXCLUSION "${ROX_POLICY_WORKLOAD_KIND_EXCLUSION:-true}"
ci_export ROX_VIRTUAL_MACHINES_ENHANCED_DATA_MODEL "${ROX_VIRTUAL_MACHINES_ENHANCED_DATA_MODEL:-true}"
ci_export ROX_UI_SECRETS_PAGE_MIGRATION "${ROX_UI_SECRETS_PAGE_MIGRATION:-true}"
ci_export ROX_AI_INTEGRATIONS "${ROX_AI_INTEGRATIONS:-true}"
Expand Down Expand Up @@ -604,7 +604,7 @@ deploy_central_via_operator() {
customize_envVars+=$'\n value: "true"'
customize_envVars+=$'\n - name: ROX_INIT_CONTAINER_SUPPORT'
customize_envVars+=$'\n value: "true"'
customize_envVars+=$'\n - name: ROX_POLICY_WORKLOAD_TYPE_EXCLUSION'
customize_envVars+=$'\n - name: ROX_POLICY_WORKLOAD_KIND_EXCLUSION'
customize_envVars+=$'\n value: "true"'
customize_envVars+=$'\n - name: ROX_VIRTUAL_MACHINES_ENHANCED_DATA_MODEL'
customize_envVars+=$'\n value: "'"${ROX_VIRTUAL_MACHINES_ENHANCED_DATA_MODEL:-true}"'"'
Expand Down Expand Up @@ -757,9 +757,9 @@ deploy_sensor_via_operator() {
customize_envVars+=$'\n - name: ROX_INIT_CONTAINER_SUPPORT'
customize_envVars+=$'\n value: "'"${ROX_INIT_CONTAINER_SUPPORT}"'"'
fi
if [[ -n "${ROX_POLICY_WORKLOAD_TYPE_EXCLUSION:-}" ]]; then
customize_envVars+=$'\n - name: ROX_POLICY_WORKLOAD_TYPE_EXCLUSION'
customize_envVars+=$'\n value: "'"${ROX_POLICY_WORKLOAD_TYPE_EXCLUSION}"'"'
if [[ -n "${ROX_POLICY_WORKLOAD_KIND_EXCLUSION:-}" ]]; then
customize_envVars+=$'\n - name: ROX_POLICY_WORKLOAD_KIND_EXCLUSION'
customize_envVars+=$'\n value: "'"${ROX_POLICY_WORKLOAD_KIND_EXCLUSION}"'"'
fi

local scannerV4DbPersistenceYaml
Expand Down
Loading