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.

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

Jump to bottom

NETOBSERV-1606: Add PODs tolerations config to ebpf agent, flp and console plugin #618

Merged
merged 1 commit into from
Apr 16, 2024
Merged

NETOBSERV-1606: Add PODs tolerations config to ebpf agent, flp and console plugin #618

merged 1 commit into from
Apr 16, 2024

Conversation

msherif1234
Copy link
Contributor

Description

there is recent ask to add tolerations config to the different no components

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

@msherif1234 msherif1234 changed the title Add tolerations config to ebpf agent, flp and console plugin Add PODs tolerations config to ebpf agent, flp and console plugin Apr 15, 2024
jpinsonneau
jpinsonneau requested changes Apr 16, 2024
View reviewed changes
Copy link
Contributor

@jpinsonneau jpinsonneau left a comment

Choose a reason for hiding this comment

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

You need to update the GetAdvancedAgentConfig, GetAdvancedProcessorConfig & GetAdvancedPluginConfig functions from network-observability-operator/pkg/helper/flowcollector.go file.

These helpers manages default values and advanced config specified (not nil)

jpinsonneau
jpinsonneau reviewed Apr 16, 2024
View reviewed changes
controllers/ebpf/agent_controller.go Outdated
Comment on lines 297 to 301
tolerations := advancedConfig.Tolerations
if len(tolerations) == 0 {
// Allows deploying an instance in the master node
tolerations = []corev1.Toleration{{Operator: corev1.TolerationOpExists}}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Move these defaults to the helper

@msherif1234 msherif1234 force-pushed the add-toleration branch 3 times, most recently from 5217038 to c87d645 Compare April 16, 2024 13:00
@msherif1234 msherif1234 changed the title Add PODs tolerations config to ebpf agent, flp and console plugin NETOBSERV-1606: Add PODs tolerations config to ebpf agent, flp and console plugin Apr 16, 2024
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Apr 16, 2024 •
edited by openshift-ci bot

@msherif1234: This pull request references NETOBSERV-1606 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

Description

there is recent ask to add tolerations config to the different no components

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

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 openshift-eng/jira-lifecycle-plugin repository.

@msherif1234
Copy link
Contributor Author

/ok-to-test

@openshift-ci openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Apr 16, 2024
@github-actions GitHub Actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:22a4c91
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-22a4c91
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-22a4c91

They will expire after two weeks.

To deploy this build:

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

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

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-22a4c91
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@msherif1234
Add tolerations config to ebpf agent, flp and console plugin
77b1884 
Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
@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 Apr 16, 2024
jpinsonneau
jpinsonneau approved these changes Apr 16, 2024
View reviewed changes
Copy link
Contributor

@jpinsonneau jpinsonneau left a comment

Choose a reason for hiding this comment

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

Code looks good, thanks @msherif1234 !

The Scheduling section is a good idea and I feel we can go forward with it since none of these fields been released in 1.5.

@openshift-ci openshift-ci bot added the lgtm label Apr 16, 2024
@msherif1234
Copy link
Contributor Author

/ok-to-test

@openshift-ci openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Apr 16, 2024
@github-actions GitHub Actions
Copy link

New images:

  • quay.io/netobserv/network-observability-operator:172b209
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-172b209
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-172b209

They will expire after two weeks.

To deploy this build:

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

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

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-172b209
  displayName: NetObserv development catalog
  publisher: Me
  updateStrategy:
    registryPoll:
      interval: 1m

@codecov-commenter
Copy link

codecov-commenter commented Apr 16, 2024 •
edited

Codecov Report

Attention: Patch coverage is 62.28070% with 43 lines in your changes are missing coverage. Please review.

Project coverage is 66.39%. Comparing base (dcaf464) to head (77b1884).
Report is 7 commits behind head on main.

Files Patch % Lines
...pis/flowcollector/v1beta2/zz_generated.deepcopy.go 0.00% 28 Missing and 3 partials ⚠️
pkg/helper/flowcollector.go 76.00% 6 Missing and 6 partials ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #618      +/-   ##
==========================================
+ Coverage   65.70%   66.39%   +0.69%     
==========================================
  Files          65       65              
  Lines        8509     7357    -1152     
==========================================
- Hits         5591     4885     -706     
+ Misses       2559     2115     -444     
+ Partials      359      357       -2
Flag Coverage Δ
unittests 66.39% <62.28%> (+0.69%) ⬆️

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

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

@Amoghrd
Copy link
Contributor

Amoghrd commented Apr 16, 2024

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved QE has approved this pull request label Apr 16, 2024
@openshift-ci-robot
Copy link
Collaborator

openshift-ci-robot commented Apr 16, 2024 •
edited by openshift-ci bot

@msherif1234: This pull request references NETOBSERV-1606 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

Description

there is recent ask to add tolerations config to the different no components

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

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 openshift-eng/jira-lifecycle-plugin repository.

@msherif1234
Copy link
Contributor Author

/approve

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msherif1234

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-merge-bot openshift-merge-bot bot merged commit e6d3c52 into netobserv:main Apr 16, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jpinsonneau jpinsonneau jpinsonneau approved these changes

@jotak jotak Awaiting requested review from jotak

@OlivierCazade OlivierCazade Awaiting requested review from OlivierCazade

Assignees

@jpinsonneau jpinsonneau

Labels
approved jira/valid-reference lgtm ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. qe-approved QE has approved this pull request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@msherif1234 @openshift-ci-robot @codecov-commenter @Amoghrd @jpinsonneau