Skip to content
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.

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

NETOBSERV-764 followup monolith & distributed modes #454

Merged
merged 2 commits into from
Oct 19, 2023

Conversation

jpinsonneau
Copy link
Contributor

@jpinsonneau jpinsonneau commented Oct 9, 2023

Description

This PR add monolith & distributed loki modes.

It also automate hack on v1beta2 storage version. You will need up to date yq to make it work correctly (as same as CI). I'm using 4.35.2.

Dependencies

#329

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 labelled 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).

OlivierCazade
OlivierCazade previously approved these changes Oct 11, 2023
Copy link
Contributor

@OlivierCazade OlivierCazade left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM, thanks!

@jpinsonneau
Copy link
Contributor Author

@OlivierCazade I just rebased since the previous PR was merged

@jpinsonneau
Copy link
Contributor Author

@nathan-weinberg this is the PR adding the missing modes. Feel free to test when you have time since it's a non blocker one.
The monolith mode (single loki url for all components) will be usefull for you if you use zero-click install in some of your tests.

@jpinsonneau jpinsonneau added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Oct 16, 2023
@codecov
Copy link

codecov bot commented Oct 16, 2023

Codecov Report

Attention: 33 lines in your changes are missing coverage. Please review.

Comparison is base (9a13f78) 55.07% compared to head (981c20d) 54.95%.
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #454      +/-   ##
==========================================
- Coverage   55.07%   54.95%   -0.13%     
==========================================
  Files          47       47              
  Lines        6395     6460      +65     
==========================================
+ Hits         3522     3550      +28     
- Misses       2633     2669      +36     
- Partials      240      241       +1     
Flag Coverage Δ
unittests 54.95% <50.00%> (-0.13%) ⬇️

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

Files Coverage Δ
api/v1beta2/flowcollector_types.go 100.00% <ø> (ø)
api/v1beta1/zz_generated.conversion.go 0.23% <0.00%> (-0.01%) ⬇️
pkg/helper/flowcollector.go 80.84% <88.46%> (+0.94%) ⬆️
api/v1beta1/flowcollector_webhook.go 0.00% <0.00%> (ø)
api/v1beta2/zz_generated.deepcopy.go 50.28% <33.33%> (-1.04%) ⬇️

... and 2 files with indirect coverage changes

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

@github-actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:241b86a
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-241b86a
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-241b86a

They will expire after two weeks.

To deploy this build:

# Direct deployment, from operator repo
IMAGE=quay.io/netobserv/network-observability-operator:241b86a make deploy

# Or using operator-sdk
operator-sdk run bundle quay.io/netobserv/network-observability-operator-bundle:v0.0.0-241b86a

Or as a Catalog Source:

apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
  name: netobserv-dev
  namespace: openshift-marketplace
spec:
  sourceType: grpc
  image: quay.io/netobserv/network-observability-operator-catalog:v0.0.0-241b86a
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@github-actions github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Oct 16, 2023
@nathan-weinberg
Copy link
Contributor

Ack @jpinsonneau thanks for the ping!

Since we've already merged the other modes I would be fine merging this if it looks good to the Dev team, since all modes will be tested as part of the same ticket. Also fine to let this sit for a bit and we can pre-merge test it later once other priorities such as 1.4.1 and DAST are done.

@jpinsonneau
Copy link
Contributor Author

@OlivierCazade @jotak do you want to double check before merging ?
QE will do the testings post merge 😉

@openshift-ci
Copy link

openshift-ci bot commented Oct 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

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

The pull request process is described 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

@openshift-ci openshift-ci bot merged commit ee1bf51 into netobserv:main Oct 19, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants