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

Add nil-check for loki.enable #385

Merged
merged 2 commits into from
Jun 29, 2023

Conversation

jotak
Copy link
Member

@jotak jotak commented Jun 29, 2023

No description provided.

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

codecov bot commented Jun 29, 2023

Codecov Report

Merging #385 (5ce7106) into main (0985c36) will increase coverage by 0.20%.
The diff coverage is 57.28%.

@@            Coverage Diff             @@
##             main     #385      +/-   ##
==========================================
+ Coverage   53.58%   53.79%   +0.20%     
==========================================
  Files          45       45              
  Lines        5488     5515      +27     
==========================================
+ Hits         2941     2967      +26     
- Misses       2337     2340       +3     
+ Partials      210      208       -2     
Flag Coverage Δ
unittests 53.79% <57.28%> (+0.20%) ⬆️

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

Impacted Files Coverage Δ
api/v1alpha1/flowcollector_webhook.go 0.00% <0.00%> (ø)
api/v1alpha1/zz_generated.conversion.go 0.26% <0.00%> (ø)
api/v1beta1/flowcollector_types.go 100.00% <ø> (ø)
...trollers/consoleplugin/consoleplugin_reconciler.go 62.17% <25.00%> (+1.21%) ⬆️
controllers/flowlogspipeline/flp_common_objects.go 86.58% <80.95%> (-0.02%) ⬇️
api/v1beta1/zz_generated.deepcopy.go 52.72% <100.00%> (+1.09%) ⬆️
pkg/helper/flowcollector.go 70.12% <100.00%> (+2.98%) ⬆️

... and 1 file with indirect coverage changes

@github-actions
Copy link

New images:

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

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

@@ -439,7 +439,7 @@ func (b *builder) addTransformStages(stage *config.PipelineBuilderStage) (*corev
})

// loki stage (write) configuration
if *b.desired.Loki.Enable {
if helper.PtrBool(b.desired.Loki.Enable) {
Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not exactly sure when Enable can be nil (upgrade scenario?) - but we should actually consider nil as true, to keep consistency with the default behaviour. So I'll write a new helper method instead

Copy link
Member Author

Choose a reason for hiding this comment

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

(done)

@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 Jun 29, 2023
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.

thanks @jotak !

@jotak
Copy link
Member Author

jotak commented Jun 29, 2023

/approve

@openshift-ci
Copy link

openshift-ci bot commented Jun 29, 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-merge-robot openshift-merge-robot merged commit 57a6951 into netobserv:main Jun 29, 2023
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.

3 participants