NETOBSERV-1532: add TLS support to ebpf agent metrics config #602

msherif1234 · 2024-03-25T14:11:32Z

Description

add TLS config support to ebpf agent

Dependencies

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.

openshift-ci-robot · 2024-03-25T14:11:36Z

codecov · 2024-03-25T14:32:02Z

Codecov Report

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

Project coverage is 66.78%. Comparing base (c08b28b) to head (dd62867).
Report is 1 commits behind head on main.

Files	Patch %	Lines
controllers/ebpf/agent_controller.go	25.00%	20 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #602      +/-   ##
==========================================
- Coverage   66.95%   66.78%   -0.17%     
==========================================
  Files          65       65              
  Lines        8116     8139      +23     
==========================================
+ Hits         5434     5436       +2     
- Misses       2334     2354      +20     
- Partials      348      349       +1

Flag	Coverage Δ
unittests	`66.78% <25.00%> (-0.17%)`	⬇️

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.

github-actions · 2024-03-26T12:07:37Z

New images:

quay.io/netobserv/network-observability-operator:97a49ff
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-97a49ff
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-97a49ff

They will expire after two weeks.

To deploy this build:

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

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

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

github-actions · 2024-03-26T15:03:10Z

New images:

quay.io/netobserv/network-observability-operator:05f4ef4
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-05f4ef4
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-05f4ef4

They will expire after two weeks.

To deploy this build:

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

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

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

jotak · 2024-03-26T15:08:30Z

controllers/ebpf/agent_controller.go

+		case flowslatest.ServerTLSDisabled:
+			// nothing to do there
+		}
+		if promTLS != nil {


If I'm correct, it's missing the volume mount for the certificate?
We have a helper to do that:

c.volumes.AddCertificate(promTLS, "prom-certs")

see for instance on FLP: https://github.com/netobserv/network-observability-operator/blob/main/controllers/flp/flp_common_objects.go#L295

msherif1234 · 2024-03-26T16:02:29Z

/ok-to-test

github-actions · 2024-03-26T16:05:49Z

New images:

quay.io/netobserv/network-observability-operator:7351fcc
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-7351fcc
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-7351fcc

They will expire after two weeks.

To deploy this build:

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

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

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

msherif1234 · 2024-03-26T17:11:59Z

/ok-to-test

github-actions · 2024-03-26T17:15:42Z

New images:

quay.io/netobserv/network-observability-operator:61f0bb2
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-61f0bb2
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-61f0bb2

They will expire after two weeks.

To deploy this build:

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

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

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

msherif1234 · 2024-03-26T17:34:12Z

/ok-to-test

github-actions · 2024-03-26T17:37:52Z

New images:

quay.io/netobserv/network-observability-operator:02d87de
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-02d87de
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-02d87de

They will expire after two weeks.

To deploy this build:

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

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

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

msherif1234 · 2024-03-26T17:43:44Z

/ok-to-test

msherif1234 · 2024-03-27T13:15:30Z

/ok-to-test

github-actions · 2024-03-27T13:18:49Z

New images:

quay.io/netobserv/network-observability-operator:459ea48
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-459ea48
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-459ea48

They will expire after two weeks.

To deploy this build:

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

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

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

Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>

msherif1234 · 2024-03-27T20:18:22Z

/ok-to-test

github-actions · 2024-03-27T20:22:37Z

New images:

quay.io/netobserv/network-observability-operator:5bc3c02
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-5bc3c02
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-5bc3c02

They will expire after two weeks.

To deploy this build:

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

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

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

- Fix using TLS with user workload monitoring - Do not set openshift-monitoring annotation on netobserv namespace upstream - Fix tagging DOWNSTREAM DEPLOYMENT on netobserv-privileged namespace

…to pr-602

jotak · 2024-03-28T11:04:40Z

@msherif1234 I've added my fix from #604

github-actions · 2024-03-28T11:11:39Z

New images:

quay.io/netobserv/network-observability-operator:862911c
quay.io/netobserv/network-observability-operator-bundle:v0.0.0-862911c
quay.io/netobserv/network-observability-operator-catalog:v0.0.0-862911c

They will expire after two weeks.

To deploy this build:

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

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

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

msherif1234 · 2024-03-28T12:07:30Z

/test e2e-operator

openshift-ci-robot · 2024-03-28T12:15:23Z

msherif1234 · 2024-03-28T14:36:41Z

/test e2e-operator

memodi · 2024-03-28T15:00:48Z

/label qe-approved

openshift-ci-robot · 2024-03-28T15:00:53Z

jotak · 2024-03-28T15:23:24Z

/lgtm
/approve

openshift-ci · 2024-03-28T15:23:32Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jotak

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:

~~OWNERS~~ [jotak]

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

msherif1234 requested a review from jotak March 25, 2024 14:11

openshift-ci-robot added the jira/valid-reference label Mar 25, 2024

msherif1234 force-pushed the add_tls branch from cb84c2a to dd62867 Compare March 25, 2024 14:18

jotak added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

msherif1234 added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

jotak reviewed Mar 26, 2024

View reviewed changes

msherif1234 force-pushed the add_tls branch from 936f8ce to 44989a3 Compare March 26, 2024 15:59

github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

msherif1234 requested a review from jotak March 26, 2024 16:00

openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

msherif1234 force-pushed the add_tls branch from 44989a3 to b4301ca Compare March 26, 2024 17:11

github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

msherif1234 force-pushed the add_tls branch from b4301ca to de6ad13 Compare March 26, 2024 17:33

github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

msherif1234 force-pushed the add_tls branch from de6ad13 to c3cade3 Compare March 26, 2024 17:42

github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 26, 2024

openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 27, 2024

msherif1234 added 2 commits March 27, 2024 09:41

NETOBSERV-1532: add TLS support to ebpf agent metrics config

29b0656

Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>

update APIs to mark TLS Provided mode as Unsupported

c6354b2

Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>

msherif1234 force-pushed the add_tls branch from 8539730 to c6354b2 Compare March 27, 2024 13:51

github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 27, 2024

openshift-ci bot added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 27, 2024

jotak added 3 commits March 28, 2024 11:36

NETOBSERV-1585: fix issues exposing metrics upstream/downstream

4d9ecfa

- Fix using TLS with user workload monitoring - Do not set openshift-monitoring annotation on netobserv namespace upstream - Fix tagging DOWNSTREAM DEPLOYMENT on netobserv-privileged namespace

Merge remote-tracking branch 'origin/fix-user-workload-monitoring' in…

8cbbe85

…to pr-602

Use helper function for agent servicemonitor TLS

a6df04a

github-actions bot removed the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 28, 2024

jotak added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label Mar 28, 2024

openshift-ci bot added the qe-approved QE has approved this pull request label Mar 28, 2024

openshift-ci bot assigned jotak Mar 28, 2024

openshift-ci bot added the lgtm label Mar 28, 2024

openshift-ci bot added the approved label Mar 28, 2024

openshift-merge-bot bot merged commit fd49392 into netobserv:main Mar 28, 2024
12 checks passed

memodi mentioned this pull request Apr 1, 2024

NETOBSERV-1585: fix issues exposing metrics upstream/downstream #604

Closed

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NETOBSERV-1532: add TLS support to ebpf agent metrics config #602

NETOBSERV-1532: add TLS support to ebpf agent metrics config #602

msherif1234 commented Mar 25, 2024 •

edited

openshift-ci-robot commented Mar 25, 2024 •

edited by openshift-ci bot

Description

Dependencies

Checklist

codecov bot commented Mar 25, 2024 •

edited

github-actions bot commented Mar 26, 2024

github-actions bot commented Mar 26, 2024

jotak Mar 26, 2024

msherif1234 commented Mar 26, 2024

github-actions bot commented Mar 26, 2024

msherif1234 commented Mar 26, 2024

github-actions bot commented Mar 26, 2024

msherif1234 commented Mar 26, 2024

github-actions bot commented Mar 26, 2024

msherif1234 commented Mar 26, 2024

msherif1234 commented Mar 27, 2024

github-actions bot commented Mar 27, 2024

msherif1234 commented Mar 27, 2024

github-actions bot commented Mar 27, 2024

jotak commented Mar 28, 2024

github-actions bot commented Mar 28, 2024

msherif1234 commented Mar 28, 2024

openshift-ci-robot commented Mar 28, 2024 •

edited by openshift-ci bot

Description

Dependencies

Checklist

msherif1234 commented Mar 28, 2024

memodi commented Mar 28, 2024

openshift-ci-robot commented Mar 28, 2024 •

edited by openshift-ci bot

Description

Dependencies

Checklist

jotak commented Mar 28, 2024

openshift-ci bot commented Mar 28, 2024

NETOBSERV-1532: add TLS support to ebpf agent metrics config #602

NETOBSERV-1532: add TLS support to ebpf agent metrics config #602

Conversation

msherif1234 commented Mar 25, 2024 • edited

Description

Dependencies

Checklist

openshift-ci-robot commented Mar 25, 2024 • edited by openshift-ci bot

Description

Dependencies

Checklist

codecov bot commented Mar 25, 2024 • edited

Codecov Report

github-actions bot commented Mar 26, 2024

github-actions bot commented Mar 26, 2024

jotak Mar 26, 2024

Choose a reason for hiding this comment

msherif1234 commented Mar 26, 2024

github-actions bot commented Mar 26, 2024

msherif1234 commented Mar 26, 2024

github-actions bot commented Mar 26, 2024

msherif1234 commented Mar 26, 2024

github-actions bot commented Mar 26, 2024

msherif1234 commented Mar 26, 2024

msherif1234 commented Mar 27, 2024

github-actions bot commented Mar 27, 2024

msherif1234 commented Mar 27, 2024

github-actions bot commented Mar 27, 2024

jotak commented Mar 28, 2024

github-actions bot commented Mar 28, 2024

msherif1234 commented Mar 28, 2024

openshift-ci-robot commented Mar 28, 2024 • edited by openshift-ci bot

Description

Dependencies

Checklist

msherif1234 commented Mar 28, 2024

memodi commented Mar 28, 2024

openshift-ci-robot commented Mar 28, 2024 • edited by openshift-ci bot

Description

Dependencies

Checklist

jotak commented Mar 28, 2024

openshift-ci bot commented Mar 28, 2024

msherif1234 commented Mar 25, 2024 •

edited

openshift-ci-robot commented Mar 25, 2024 •

edited by openshift-ci bot

codecov bot commented Mar 25, 2024 •

edited

openshift-ci-robot commented Mar 28, 2024 •

edited by openshift-ci bot

openshift-ci-robot commented Mar 28, 2024 •

edited by openshift-ci bot