Skip to content

Commit

Permalink
NETOBSERV-1731: hide metrics enable setting from form (#692)
Browse files Browse the repository at this point in the history
This is to avoid confusion, since nillable bools are not managed properly in OLM forms
They can be access from YAML

A longer-term solution will be to replace all our nillable bools with
enums in a next API version
  • Loading branch information
jotak committed Jul 16, 2024
1 parent 044d197 commit 332125e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
10 changes: 6 additions & 4 deletions bundle/manifests/netobserv-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,9 @@ spec:
- path: agent.ebpf.flowFilter
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
- path: agent.ebpf.metrics.enable
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
- description: to use Kafka as a broker as part of the flow collection pipeline.
displayName: Kafka configuration
path: kafka
Expand Down Expand Up @@ -603,6 +606,9 @@ spec:
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldDependency:deploymentModel:Kafka
- urn:alm:descriptor:com.tectonic.ui:advanced
- path: processor.subnetLabels.openShiftAutoDetect
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
- displayName: Log level
path: processor.logLevel
x-descriptors:
Expand Down Expand Up @@ -732,8 +738,6 @@ spec:
path: agent.ebpf.metrics
- displayName: Disable alerts
path: agent.ebpf.metrics.disableAlerts
- displayName: Enable
path: agent.ebpf.metrics.enable
- displayName: Server
path: agent.ebpf.metrics.server
- displayName: Port
Expand Down Expand Up @@ -788,8 +792,6 @@ spec:
path: processor.subnetLabels
- displayName: Custom labels
path: processor.subnetLabels.customLabels
- displayName: Open shift auto detect
path: processor.subnetLabels.openShiftAutoDetect
- displayName: Prometheus
path: prometheus
- displayName: Querier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ spec:
name: flowcollectors.flows.netobserv.io
version: v1beta2
specDescriptors:
# Reference: https://github.com/openshift/console/blob/master/frontend/packages/operator-lifecycle-manager/src/components/descriptors/reference/reference.md
# ROOT
- description: defines the desired type of deployment for flow processing.
path: deploymentModel
Expand Down Expand Up @@ -88,6 +89,9 @@ spec:
- path: agent.ebpf.flowFilter
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
- path: agent.ebpf.metrics.enable
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
# KAFKA
- description: to use Kafka as a broker as part of the flow collection pipeline.
displayName: Kafka configuration
Expand Down Expand Up @@ -170,6 +174,9 @@ spec:
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:fieldDependency:deploymentModel:Kafka
- urn:alm:descriptor:com.tectonic.ui:advanced
- path: processor.subnetLabels.openShiftAutoDetect
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:hidden
- path: processor.logLevel
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:advanced
Expand Down

0 comments on commit 332125e

Please sign in to comment.