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-765 Add CA/Secret config to ServiceMonitor #310

Merged
merged 3 commits into from May 5, 2023

Conversation

jotak
Copy link
Member

@jotak jotak commented Mar 28, 2023

Add missing CA/Secret to the console plugin service monitor

Cf netobserv/network-observability-console-plugin#315

We might also want to add a bearer token config

OlivierCazade
OlivierCazade previously approved these changes Mar 29, 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.

LGTM

@@ -532,7 +532,7 @@ type FlowCollectorConsolePlugin struct {
//+kubebuilder:validation:Minimum=1
//+kubebuilder:validation:Maximum=65535
//+kubebuilder:default:=9001
// port is the plugin service port
// port is the plugin service port. Do not use 9002, which is reserved for metrics.
Copy link
Member Author

Choose a reason for hiding this comment

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

Note: I didn't want to add a new port config to the CRD, I think it brings very little value if any, while bloating the CRD with new configs ...

Copy link
Contributor

Choose a reason for hiding this comment

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

do we need a //+kubebuilder:validation to exclude 9002 ? Maybe using a pattern

Copy link
Contributor

Choose a reason for hiding this comment

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

@jotak while we're at it, do you think it would be good idea to address this: https://issues.redhat.com/browse/NETOBSERV-511 ?

@codecov
Copy link

codecov bot commented Mar 29, 2023

Codecov Report

Merging #310 (736f831) into main (c2c2961) will increase coverage by 0.18%.
The diff coverage is 81.65%.

@@            Coverage Diff             @@
##             main     #310      +/-   ##
==========================================
+ Coverage   51.34%   51.53%   +0.18%     
==========================================
  Files          43       43              
  Lines        5155     5156       +1     
==========================================
+ Hits         2647     2657      +10     
+ Misses       2310     2304       -6     
+ Partials      198      195       -3     
Flag Coverage Δ
unittests 51.53% <81.65%> (+0.18%) ⬆️

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

Impacted Files Coverage Δ
api/v1beta1/flowcollector_types.go 100.00% <ø> (ø)
...trollers/flowlogspipeline/flp_ingest_reconciler.go 65.09% <0.00%> (+1.37%) ⬆️
...ollers/flowlogspipeline/flp_monolith_reconciler.go 66.66% <0.00%> (+1.34%) ⬆️
...rollers/flowlogspipeline/flp_transfo_reconciler.go 61.53% <0.00%> (+0.95%) ⬆️
...trollers/consoleplugin/consoleplugin_reconciler.go 62.98% <40.00%> (-1.76%) ⬇️
...trollers/reconcilers/namespaced_objects_manager.go 77.77% <53.84%> (-4.05%) ⬇️
controllers/flowlogspipeline/flp_common_objects.go 85.57% <88.23%> (+0.31%) ⬆️
controllers/consoleplugin/consoleplugin_objects.go 94.38% <100.00%> (+0.53%) ⬆️
controllers/flowlogspipeline/flp_ingest_objects.go 73.84% <100.00%> (-0.79%) ⬇️
...ntrollers/flowlogspipeline/flp_monolith_objects.go 88.46% <100.00%> (-0.43%) ⬇️
... and 1 more

OlivierCazade
OlivierCazade previously approved these changes Mar 30, 2023
@openshift-ci openshift-ci bot added the lgtm label Mar 30, 2023
jpinsonneau
jpinsonneau previously approved these changes Mar 31, 2023
@memodi
Copy link
Contributor

memodi commented Apr 25, 2023

/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 25, 2023
@github-actions
Copy link

New images:

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

They will expire after two weeks.

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

jotak added 3 commits May 4, 2023 10:39
Add missing CA/Secret to the console plugin service monitor
Some refactoring to normalize services reconciliation
@jotak jotak dismissed stale reviews from jpinsonneau and OlivierCazade via 736f831 May 4, 2023 08:42
@openshift-ci openshift-ci bot removed the lgtm label May 4, 2023
@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 May 4, 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.

LGTM

@openshift-ci openshift-ci bot added the lgtm label May 4, 2023
@jotak jotak added the ok-to-test To set manually when a PR is safe to test. Triggers image build on PR. label May 4, 2023
@github-actions
Copy link

github-actions bot commented May 4, 2023

New images:

  • quay.io/netobserv/network-observability-operator:7fe73cd
  • quay.io/netobserv/network-observability-operator-bundle:v0.0.0-7fe73cd
  • quay.io/netobserv/network-observability-operator-catalog:v0.0.0-7fe73cd

They will expire after two weeks.

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

@jotak
Copy link
Member Author

jotak commented May 5, 2023

/approve

@openshift-ci
Copy link

openshift-ci bot commented May 5, 2023

[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:

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 added the approved label May 5, 2023
@jotak jotak merged commit 09792e8 into netobserv:main May 5, 2023
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm ok-to-test To set manually when a PR is safe to test. Triggers image build on PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants