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 Theia related files #4048

Merged
merged 2 commits into from
Jul 29, 2022
Merged

Conversation

dreamtalen
Copy link
Contributor

@dreamtalen dreamtalen commented Jul 21, 2022

This PR removes Theia related files, including Grafana Flow Collector,
ClickHouse monitor, manifests, CI jobs and scripts.

Retain a small manifest flow-visibility-e2e.yml for the Kind e2e test of Flow Aggregator.

Signed-off-by: Yongming Ding dyongming@vmware.com

@codecov
Copy link

codecov bot commented Jul 21, 2022

Codecov Report

Merging #4048 (cbaf5c7) into main (9f76f8e) will increase coverage by 5.68%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4048      +/-   ##
==========================================
+ Coverage   61.53%   67.21%   +5.68%     
==========================================
  Files         293      297       +4     
  Lines       43686    45200    +1514     
==========================================
+ Hits        26882    30381    +3499     
+ Misses      14567    12457    -2110     
- Partials     2237     2362     +125     
Flag Coverage Δ *Carryforward flag
e2e-tests 41.22% <ø> (?) Carriedforward from 9d4ecaa
integration-tests 35.97% <ø> (?)
kind-e2e-tests 49.74% <ø> (+5.09%) ⬆️
unit-tests 44.22% <ø> (+0.05%) ⬆️

*This pull request uses carry forward flags. Click here to find out more.

Impacted Files Coverage Δ
...s/multicluster/memberclusterannounce_controller.go 56.64% <0.00%> (-15.16%) ⬇️
pkg/agent/multicast/mcast_controller.go 44.92% <0.00%> (-7.02%) ⬇️
pkg/util/k8s/node.go 80.90% <0.00%> (-6.72%) ⬇️
pkg/agent/multicast/mcast_discovery.go 56.44% <0.00%> (-5.17%) ⬇️
pkg/controller/networkpolicy/tier.go 50.00% <0.00%> (-5.00%) ⬇️
pkg/controller/networkpolicy/status_controller.go 68.54% <0.00%> (-3.23%) ⬇️
...icluster/cmd/multicluster-controller/controller.go 7.86% <0.00%> (-0.78%) ⬇️
...luster-controller/memberclusterannounce_webhook.go 55.00% <0.00%> (-0.56%) ⬇️
pkg/agent/openflow/multicast.go 0.00% <0.00%> (ø)
pkg/agent/flowexporter/exporter/exporter.go 77.97% <0.00%> (ø)
... and 82 more

This PR removes Theia related files, including Grafana Flow Collector,
ClickHouse monitor, manifests, CI jobs and scripts.

Signed-off-by: Yongming Ding <dyongming@vmware.com>
antoninbas
antoninbas previously approved these changes Jul 22, 2022
Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

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

LGTM, I love code cleanups :)

@@ -0,0 +1,158 @@
apiVersion: v1
data:
create_table.sh: "#!/usr/bin/env bash\n\n# Copyright 2022 Antrea Authors.\n#\n#
Copy link
Contributor

Choose a reason for hiding this comment

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

hopefully this does not change too often as it's a bit messy to update. BTW, is there any way to use a "raw" string here, so that the data is easier to read / troubleshoot / update. Something like this:

--- 
apiVersion: v1
data: 
  create_table.sh: |
      # line 1
      # line 2
      echo "hello"
end: true

The alternative is to auto-generate this file, which may be the case (maybe there is a script in Theia?), in which case ignore this comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks Antonin, this file doesn't need to be modified unless we change the fields of flow records exported by Flow Aggregator.
I also thought about auto-generate this file in Theia and downloading it during the e2e test. But I could imagine that when we want to change fields of flow records in the future, we need to change flow-visibility-e2e.yml on the Theia side first to let our tests on the Antrea side pass. Not sure whether this is a good approach, may I ask your suggestion pls?

Copy link
Contributor

Choose a reason for hiding this comment

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

I assume that you have a way to auto-generate it manually with a script though, right? based on some files in the theia repo. If the answer is yes, then it's good enough for me and there is no need to change anything.

Copy link
Contributor

Choose a reason for hiding this comment

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

Auto-generate this file from Theia repo sounds good to me. Just to add, create_table.sh content can be formatted well when we using Helm to generate this file as in Theia repo.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, we have a script in Theia to generate this manifest.
Although I made some changes to delete the clickhouse monitor in the generated manifest for now, we will have an update on the script in Theia to generate one exactly same manifest.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @antoninbas, we have updated this manifest with a better format and comments about how to generate it, please take a look again, thanks!

@dreamtalen
Copy link
Contributor Author

/test-all
/test-e2e

antoninbas
antoninbas previously approved these changes Jul 28, 2022
@@ -0,0 +1,335 @@
# This manifest is used in the E2E test to check Flow Aggregator exporting flow records
# to ClickHouse database. It is autogenerated by scripts in the Theia, please refer to
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# to ClickHouse database. It is autogenerated by scripts in the Theia, please refer to
# to ClickHouse database. It is autogenerated by scripts in Theia, please refer to

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, addressed.

Signed-off-by: Yongming Ding <dyongming@vmware.com>
@salv-orlando salv-orlando merged commit 36622c8 into antrea-io:main Jul 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants