Skip to content

Conversation

@luisjira
Copy link
Member

Description

Fixes the grammar mistake found in #2187

Dependencies

n/a

Checklist

If you are not familiar with our processes or don't know what to answer in the list below, let us know in a comment: the maintainers will take care of that.

  • Is this PR backed with a JIRA ticket? If so, make sure it is written as a title prefix (in general, PRs affecting the NetObserv/Network Observability product should be backed with a JIRA ticket - especially if they bring user facing changes).
  • Does this PR require product documentation?
    • If so, make sure the JIRA epic is labeled with "documentation" and provides a description relevant for doc writers, such as use cases or scenarios. Any required step to activate or configure the feature should be documented there, such as new CRD knobs.
  • Does this PR require a product release notes entry?
    • If so, fill in "Release Note Text" in the JIRA.
  • Is there anything else the QE team should know before testing? E.g: configuration changes, environment setup, etc.
    • If so, make sure it is described in the JIRA ticket.
  • QE requirements (check 1 from the list):
    • Standard QE validation, with pre-merge tests unless stated otherwise.
    • Regression tests only (e.g. refactoring with no user-facing change).
    • No QE (e.g. trivial change with high reviewer's confidence, or per agreement with the QE team).

@openshift-ci
Copy link

openshift-ci bot commented Nov 25, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign msherif1234 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@luisjira
Copy link
Member Author

/cherry-pick release-1.10

@openshift-cherrypick-robot

@luisjira: only netobserv org members may request cherry picks. If you are already part of the org, make sure to change your membership to public. Otherwise you can still do the cherry-pick manually.

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@luisjira
Copy link
Member Author

/cherry-pick release-1.10

@openshift-cherrypick-robot

@luisjira: once the present PR merges, I will cherry-pick it on top of release-1.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@luisjira luisjira mentioned this pull request Nov 25, 2025
10 tasks
@codecov
Copy link

codecov bot commented Nov 25, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 73.35%. Comparing base (453127f) to head (008815e).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2189      +/-   ##
==========================================
- Coverage   73.43%   73.35%   -0.08%     
==========================================
  Files          80       80              
  Lines        9180     9180              
==========================================
- Hits         6741     6734       -7     
- Misses       2028     2032       +4     
- Partials      411      414       +3     
Flag Coverage Δ
unittests 73.35% <ø> (-0.08%) ⬇️

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

Files with missing lines Coverage Δ
api/flowcollector/v1beta2/flowcollector_types.go 100.00% <ø> (ø)

... and 4 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@luisjira luisjira merged commit 1dd06ce into netobserv:main Nov 25, 2025
15 of 16 checks passed
@luisjira luisjira deleted the docs-grammar-fix branch November 25, 2025 12:08
@openshift-cherrypick-robot

@luisjira: #2189 failed to apply on top of branch "release-1.10":

Applying: fix grammar in flowcollector API docs
Applying: update-bundle
Using index info to reconstruct a base tree...
M	bundle/manifests/flows.netobserv.io_flowcollectors.yaml
M	bundle/manifests/netobserv-operator.clusterserviceversion.yaml
M	config/crd/bases/flows.netobserv.io_flowcollectors.yaml
M	docs/FlowCollector.md
M	helm/crds/flows.netobserv.io_flowcollectors.yaml
Falling back to patching base and 3-way merge...
Auto-merging helm/crds/flows.netobserv.io_flowcollectors.yaml
Auto-merging docs/FlowCollector.md
Auto-merging config/crd/bases/flows.netobserv.io_flowcollectors.yaml
Auto-merging bundle/manifests/netobserv-operator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/netobserv-operator.clusterserviceversion.yaml
Auto-merging bundle/manifests/flows.netobserv.io_flowcollectors.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0002 update-bundle

In response to this:

/cherry-pick release-1.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

luisjira added a commit to luisjira/network-observability-operator that referenced this pull request Nov 25, 2025
* fix grammar in flowcollector API docs

* update-bundle
@Amoghrd
Copy link
Member

Amoghrd commented Nov 25, 2025

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved QE has approved this pull request label Nov 25, 2025
luisjira added a commit that referenced this pull request Nov 25, 2025
* fix grammar in flowcollector API docs

* update-bundle
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm qe-approved QE has approved this pull request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants