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

cmd: Remove deprecated --config-file flag #1498

Merged
merged 1 commit into from
Sep 21, 2023
Merged

cmd: Remove deprecated --config-file flag #1498

merged 1 commit into from
Sep 21, 2023

Conversation

lambdanis
Copy link
Contributor

According to the code comments the --config-file flag should have been removed in the v0.11 release, but it hasn't been. Let's remove it before the next release.

Ref #651

@lambdanis lambdanis added area/userspace Related to userspace Tetragon logic release-note/minor This PR introduces a minor user-visible change labels Sep 20, 2023
@lambdanis lambdanis requested a review from a team as a code owner September 20, 2023 16:03
@lambdanis lambdanis requested a review from tpapagian September 20, 2023 16:03
@lambdanis
Copy link
Contributor Author

lambdanis commented Sep 21, 2023 •
edited
Loading

The podinfo integration tests failed on three attempts with "Condition never satisfied":

=== RUN   TestControllerSuite/TestPodInfoCreateAndDelete
    podinfo_controller_suite_test.go:61: 
        	Error Trace:	/home/runner/work/tetragon/tetragon/operator/podinfo/podinfo_controller_suite_test.go:61
        	Error:      	Condition never satisfied
        	Test:       	TestControllerSuite/TestPodInfoCreateAndDelete
=== RUN   TestControllerSuite/TestPodInfoUpdate
    podinfo_controller_suite_test.go:91: 
        	Error Trace:	/home/runner/work/tetragon/tetragon/operator/podinfo/podinfo_controller_suite_test.go:91
        	Error:      	Condition never satisfied
        	Test:       	TestControllerSuite/TestPodInfoUpdate
    podinfo_controller_suite_test.go:104: 
        	Error Trace:	/home/runner/work/tetragon/tetragon/operator/podinfo/podinfo_controller_suite_test.go:104
        	Error:      	Condition never satisfied
        	Test:       	TestControllerSuite/TestPodInfoUpdate
--- FAIL: TestControllerSuite (68.05s)
    --- FAIL: TestControllerSuite/TestPodInfoCreateAndDelete ([26](https://github.com/cilium/tetragon/actions/runs/6251180410/job/17008658195?pr=1498#step:7:27).02s)
    --- FAIL: TestControllerSuite/TestPodInfoUpdate (42.01s)

but locally they pass, and this PR shouldn't affect them. I'll retry once again, maybe we need to increase the timeout.

UPDATE: ok, I just had to rebase with main and it's all green now.

@netlify
Copy link

netlify bot commented Sep 21, 2023 •
edited
Loading

✅ Deploy Preview for tetragon ready!

Name Link
🔨 Latest commit 239f57a
🔍 Latest deploy log https://app.netlify.com/sites/tetragon/deploys/650c8a9a8ad116000860c068
😎 Deploy Preview https://deploy-preview-1498--tetragon.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@lambdanis lambdanis force-pushed the pr/lambdanis/remove-deprecated branch 4 times, most recently from 68a204a to 4d1d16c Compare September 21, 2023 17:53
@lambdanis
cmd: Remove deprecated --config-file flag
239f57a 
Signed-off-by: Anna Kapuscinska <anna@isovalent.com>
@lambdanis lambdanis force-pushed the pr/lambdanis/remove-deprecated branch from 4d1d16c to 239f57a Compare September 21, 2023 18:25
@lambdanis lambdanis self-assigned this Sep 21, 2023
@jrfastab
Copy link
Contributor

I'm sort of attached to that flag but ok away it goes.

@jrfastab jrfastab merged commit 771e78a into cilium:main Sep 21, 2023
mtardy
mtardy reviewed Sep 22, 2023
View reviewed changes
cmd/tetragon/flags.go
log.Warnf("Flag --%s has been deprecated, please use --%s instead", keyConfigFile, keyTracingPolicy)
option.Config.TracingPolicy = viper.GetString(keyConfigFile)
}
// if both --config-file and --tracing-policy are set, the latter takes priority
if viper.IsSet(keyTracingPolicy) {
Copy link
Member

Choose a reason for hiding this comment

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

We could have removed this (now useless) check

@p-linnane p-linnane mentioned this pull request Nov 1, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mtardy mtardy mtardy left review comments

@tpapagian tpapagian Awaiting requested review from tpapagian tpapagian is a code owner automatically assigned from cilium/tetragon

Assignees

@lambdanis lambdanis

Labels
area/userspace Related to userspace Tetragon logic release-note/minor This PR introduces a minor user-visible change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lambdanis @jrfastab @mtardy