Skip to content

Commit 954c0f9

Browse files
authored
Add OpenShift Optional category (#1436)
* Add OpenShift Optional category * regen fbc
1 parent 6495f86 commit 954c0f9

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

catalog/unreleased/downstream-test-fbc/bundle.yaml

+16-16
Original file line numberDiff line numberDiff line change
@@ -459,22 +459,22 @@ properties:
459459
}
460460
]
461461
capabilities: Seamless Upgrades
462-
categories: Monitoring, Networking
462+
categories: Monitoring, Networking, OpenShift Optional
463463
console.openshift.io/plugins: '["netobserv-plugin"]'
464464
containerImage: ''
465-
createdAt: '2025-03-12T15:17:35Z'
465+
createdAt: 2025-05-05T07:17:03
466466
description: Network flows collector and monitoring solution
467-
features.operators.openshift.io/cnf: 'false'
468-
features.operators.openshift.io/cni: 'false'
469-
features.operators.openshift.io/csi: 'false'
470-
features.operators.openshift.io/disconnected: 'true'
471-
features.operators.openshift.io/fips-compliant: 'true'
472-
features.operators.openshift.io/proxy-aware: 'false'
473-
features.operators.openshift.io/tls-profiles: 'false'
474-
features.operators.openshift.io/token-auth-aws: 'false'
475-
features.operators.openshift.io/token-auth-azure: 'false'
476-
features.operators.openshift.io/token-auth-gcp: 'false'
477-
operatorframework.io/cluster-monitoring: 'true'
467+
features.operators.openshift.io/cnf: "false"
468+
features.operators.openshift.io/cni: "false"
469+
features.operators.openshift.io/csi: "false"
470+
features.operators.openshift.io/disconnected: "true"
471+
features.operators.openshift.io/fips-compliant: "true"
472+
features.operators.openshift.io/proxy-aware: "false"
473+
features.operators.openshift.io/tls-profiles: "false"
474+
features.operators.openshift.io/token-auth-aws: "false"
475+
features.operators.openshift.io/token-auth-azure: "false"
476+
features.operators.openshift.io/token-auth-gcp: "false"
477+
operatorframework.io/cluster-monitoring: "true"
478478
operatorframework.io/initialization-resource: '{"apiVersion":"flows.netobserv.io/v1beta2",
479479
"kind":"FlowCollector","metadata":{"name":"cluster"},"spec": {}}'
480480
operatorframework.io/suggested-namespace: openshift-netobserv-operator
@@ -922,7 +922,7 @@ properties:
922922
923923
## Configuration
924924
925-
The `FlowCollector` resource is used to configure the operator and its managed components. A comprehensive documentation is [available here](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/config/samples/flows_v1beta2_flowcollector.yaml).
925+
The `FlowCollector` resource is used to configure the operator and its managed components. A comprehensive documentation is [available here](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/docs/FlowCollector.md), and a full sample file [there](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/config/samples/flows_v1beta2_flowcollector.yaml).
926926
927927
To edit configuration in cluster, run:
928928
@@ -938,7 +938,7 @@ properties:
938938
939939
- Loki (`spec.loki`): configure here how to reach Loki. The default values match the Loki quick install paths mentioned above, but you might have to configure differently if you used another installation method. Make sure to disable it (`spec.loki.enable`) if you don't want to use Loki.
940940
941-
- Quick filters (`spec.consolePlugin.quickFilters`): configure preset filters to be displayed in the Console plugin. They offer a way to quickly switch from filters to others, such as showing / hiding pods network, or infrastructure network, or application network, etc. They can be tuned to reflect the different workloads running on your cluster. For a list of available filters, [check this page](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/docs/QuickFilters.md).
941+
- Quick filters (`spec.consolePlugin.quickFilters`): configure preset filters to be displayed in the Console plugin. They offer a way to quickly switch from filters to others, such as showing / hiding pods network, or infrastructure network, or application network, etc. They can be tuned to reflect the different workloads running on your cluster. For a list of available filters, [check this page](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/docs/QuickFilters.md).
942942
943943
- Kafka (`spec.deploymentModel: KAFKA` and `spec.kafka`): when enabled, integrates the flow collection pipeline with Kafka, by splitting ingestion from transformation (kube enrichment, derived metrics, ...). Kafka can provide better scalability, resiliency and high availability ([view more details](https://www.redhat.com/en/topics/integration/what-is-apache-kafka)). Assumes Kafka is already deployed and a topic is created.
944944
@@ -974,7 +974,7 @@ properties:
974974
This documentation includes:
975975
976976
- An [overview](https://github.com/netobserv/network-observability-operator#openshift-console) of the features, with screenshots
977-
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.6.1-community/docs/Metrics.md).
977+
- More information on [configuring metrics](https://github.com/netobserv/network-observability-operator/blob/1.8.2-community/docs/Metrics.md).
978978
- A [performance](https://github.com/netobserv/network-observability-operator#performance-fine-tuning) section, for fine-tuning
979979
- A [security](https://github.com/netobserv/network-observability-operator#securing-data-and-communications) section
980980
- An [F.A.Q.](https://github.com/netobserv/network-observability-operator#faq--troubleshooting) section

hack/patch_csv.py

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ def dump_manifest(pathn, manifest):
4747
csv['metadata']['annotations']['features.operators.openshift.io/cni'] = 'false'
4848
csv['metadata']['annotations']['features.operators.openshift.io/csi'] = 'false'
4949

50+
# Add OpenShift Optional category
51+
csv['metadata']['annotations']['categories'] += ', OpenShift Optional'
52+
5053
# inject bundle creation date in pods annotations
5154
podMeta = csv['spec']['install']['spec']['deployments'][0]['spec']['template']['metadata']
5255
if 'annotations' in podMeta:

0 commit comments

Comments
 (0)