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

Remove ConfigOrSecret API, replaced with the newer FileReference #411

Merged
merged 1 commit into from
Sep 8, 2023

Conversation

jotak
Copy link
Member

@jotak jotak commented Sep 8, 2023

Description

This PR is based on #379 (not merged yet), cc @OlivierCazade

Remove ConfigOrSecret API, replaced with the newer FileReference
This only impacts SASL config which is not supported product-wise

If a user was using SASL despite its unsupported status, for migration, it is necessary to adapt the FlowCollector config, as per new CRD documentation.

E.g. This old config:

    sasl:
      type: PLAIN
      reference:
        type: secret
        name: flp-kafka-sasl
      clientIDKey: clientId
      clientSecretKey: clientSecret

should be changed into:

    sasl:
      type: PLAIN
      clientIDReference:
        type: secret
        name: flp-kafka-sasl
        file: clientId
      clientSecretReference:
        type: secret
        name: flp-kafka-sasl
        file: clientSecret

Dependencies

n/a

Checklist

Unsupported feature product-wise, so no QE/doc involved

@jotak jotak added no-qe This PR doesn't necessitate QE approval no-doc This PR doesn't require documentation change on the NetObserv operator labels Sep 8, 2023
@codecov
Copy link

codecov bot commented Sep 8, 2023

Codecov Report

Patch coverage: 58.33% and project coverage change: +0.12% 🎉

Comparison is base (7aa9ff7) 55.57% compared to head (6e5391e) 55.70%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #411      +/-   ##
==========================================
+ Coverage   55.57%   55.70%   +0.12%     
==========================================
  Files          46       46              
  Lines        5954     5960       +6     
==========================================
+ Hits         3309     3320      +11     
+ Misses       2417     2410       -7     
- Partials      228      230       +2     
Flag Coverage Δ
unittests 55.70% <58.33%> (+0.12%) ⬆️

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

Files Changed Coverage Δ
api/v1beta1/flowcollector_types.go 100.00% <ø> (ø)
api/v1beta1/zz_generated.deepcopy.go 53.10% <0.00%> (+0.89%) ⬆️
controllers/ebpf/agent_controller.go 73.15% <0.00%> (-0.44%) ⬇️
pkg/watchers/watcher.go 72.03% <40.00%> (-3.43%) ⬇️
controllers/flowlogspipeline/flp_common_objects.go 80.68% <100.00%> (+1.68%) ⬆️
controllers/flowlogspipeline/flp_reconciler.go 69.49% <100.00%> (+1.63%) ⬆️
pkg/volumes/builder.go 100.00% <100.00%> (ø)
pkg/watchers/object_ref.go 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.

📢 Have feedback on the report? Share it here.

This only impacts SASL config which is not supported product-wise
@jotak
Copy link
Member Author

jotak commented Sep 8, 2023

FYI I tested a deployment with this SASL config: verified that ebpf & flp pods are correctly deployed with correct configuration and volumes correctly mounted

@jotak jotak added the breaking-change This pull request has breaking changes. They should be described in PR description. label Sep 8, 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, thanks!

@jotak
Copy link
Member Author

jotak commented Sep 8, 2023

thanks!
/approve

@openshift-ci
Copy link

openshift-ci bot commented Sep 8, 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 Sep 8, 2023
@openshift-merge-robot openshift-merge-robot merged commit 623a3b2 into netobserv:main Sep 8, 2023
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved breaking-change This pull request has breaking changes. They should be described in PR description. lgtm no-doc This PR doesn't require documentation change on the NetObserv operator no-qe This PR doesn't necessitate QE approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants