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

Enhance Antrea-Octant-Plugin #913

Merged
merged 1 commit into from
Jul 24, 2020
Merged

Enhance Antrea-Octant-Plugin #913

merged 1 commit into from
Jul 24, 2020

Conversation

ZhangYW18
Copy link
Contributor

@ZhangYW18 ZhangYW18 commented Jul 6, 2020

  1. Enhance Traceflow graph color theme.
    Before:
    netpol
    discon

After:
netpol
discon

  1. Merge Antrea plugins into one plugin: Antrea Octant Plugin
  • Add two tabs in the Overview page of the plugin;
  • Move the original traceflow plugin page into the folder "Antrea".

image

  1. Change the layout of Antrea Overview page
    Before: Put all tabs together and show them in Overview page
    image

After: Put all CRD forms in one page (this format fits with the default Octant Homepage)
image

@antrea-bot
Copy link
Collaborator

Thanks for your PR.
Unit tests and code linters are run automatically every time the PR is updated.
E2e, conformance and network policy tests can only be triggered by a member of the vmware-tanzu organization. Regular contributors to the project should join the org.

The following commands are available:

  • /test-e2e: to trigger e2e tests.
  • /skip-e2e: to skip e2e tests.
  • /test-conformance: to trigger conformance tests.
  • /skip-conformance: to skip conformance tests.
  • /test-whole-conformance: to trigger all conformance tests on linux.
  • /skip-whole-conformance: to skip all conformance tests on linux.
  • /test-networkpolicy: to trigger networkpolicy tests.
  • /skip-networkpolicy: to skip networkpolicy tests.
  • /test-windows-conformance: to trigger windows conformance tests.
  • /skip-windows-conformance: to skip windows conformance tests.
  • /test-all: to trigger all tests (except whole conformance).
  • /skip-all: to skip all tests (except whole conformance).

These commands can only be run by members of the vmware-tanzu organization.

@mengdie-song
Copy link
Contributor

I like this simple color theme. For the dropped case, I actually prefer a red one and it is more like orange to me. But others may comment your preference.

@ZhangYW18
Copy link
Contributor Author

I like this simple color theme. For the dropped case, I actually prefer a red one and it is more like orange to me. But others may comment your preference.

If I change the colors in recent days, it may not correspond to the screenshots I provide to others, which will be used in seminars. Will this cause a problem?

@mengdie-song
Copy link
Contributor

I like this simple color theme. For the dropped case, I actually prefer a red one and it is more like orange to me. But others may comment your preference.

If I change the colors in recent days, it may not correspond to the screenshots I provide to others, which will be used in seminars. Will this cause a problem?

I don't think it will be a big problem. But I think we can get more opinions on both the layout and color theme. @tnqn @jianjuns @antoninbas

@jianjuns
Copy link
Contributor

To be frank I am not good at colors at all. But if you really like my opinion, I do prefer the latter version you have (simpler colors).

@antoninbas
Copy link
Contributor

@ZhangYW18 don't worry about making adjustments if needed (e.g. making the drop case redder).
The new color theme looks good!

@ZhangYW18 ZhangYW18 force-pushed the traceflow branch 2 times, most recently from 0eb8fed to 9a12b43 Compare July 13, 2020 02:15
@ZhangYW18
Copy link
Contributor Author

Changed the color of drop case to pink. @mengdie-song @tnqn

@mengdie-song
Copy link
Contributor

mengdie-song commented Jul 13, 2020

@ZhangYW18 Thanks for addressing my comment. Let's change the drop rectangle edge color to red as we discussed.

A problem I have noticed is that the focus will always be the last tab which is "Trace List". Unlike Controller or Agent, we may not have traceflow CRDs at start. I am not sure if we can change the focus to the first tab ("Controller") so that we will never get a blank list. Could you please also investigate this?

I see you put all the tabs on the navigation bar "Overview". It looks good for now because we only have four sub tabs at this time, but we may need to think more on the layout if we want to add more functions later.

@ZhangYW18 ZhangYW18 force-pushed the traceflow branch 2 times, most recently from 6ff407e to 053c012 Compare July 13, 2020 09:17
@ZhangYW18
Copy link
Contributor Author

@ZhangYW18 Thanks for addressing my comment. Let's change the drop rectangle edge color to red as we discussed.

A problem I have noticed is that the focus will always be the last tab which is "Trace List". Unlike Controller or Agent, we may not have traceflow CRDs at start. I am not sure if we can change the focus to the first tab ("Controller") so that we will never get a blank list. Could you please also investigate this?

I see you put all the tabs on the navigation bar "Overview". It looks good for now because we only have four sub tabs at this time, but we may need to think more on the layout if we want to add more functions later.

I have changed the focus of "Overview" page to the first tab.

For the second issue, could we show all Antrea information in one tab in a unified Antrea Overview page, just like the Octant Cluster Overview page?

@mengdie-song
Copy link
Contributor

@ZhangYW18 You can try the one tab way you mentioned here and we can see if it looks better. Anyway, the current layout seems fine since we only have four tabs now. I have added some other minor comments, please take a look.

@ZhangYW18 ZhangYW18 force-pushed the traceflow branch 3 times, most recently from b730e4f to cbd4d61 Compare July 14, 2020 05:34
@ZhangYW18
Copy link
Contributor Author

ZhangYW18 commented Jul 15, 2020

Here are two possible layouts of the Overview page for Antrea Octant Plugin:

  1. Put all tabs together and show them in Overview page:
    image
    But we cannot always put all tabs together considering there may be more pages to show in the future.
    Therefore, we are thinking about a new format:

  2. Put all CRD forms in one page (this format fits with the default Octant Homepage) :

screenshot

I'm not sure which one is better. Could I get your opinion?
@mengdie-song

@mengdie-song
Copy link
Contributor

@ZhangYW18 Thanks for addressing my comments and listing these two options!
I prefer the second one which puts all CRD forms in one page since it fits with the default Octant Homepage and we can always get the traceflow UI from navigation bar on the left.
The first option which puts all the tabs on the overview page looks a little bit redundant to me since we have already put them on the left column. Also, we may add more features on UI in the future and we cannot put each of them as a tab on overview page.

@jianjuns @antoninbas @tnqn Could you share your opinions on these two overview page design?

@ZhangYW18
Copy link
Contributor Author

@ZhangYW18 Thanks for addressing my comments and listing these two options!
I prefer the second one which puts all CRD forms in one page since it fits with the default Octant Homepage and we can always get the traceflow UI from navigation bar on the left.
The first option which puts all the tabs on the overview page looks a little bit redundant to me since we have already put them on the left column. Also, we may add more features on UI in the future and we cannot put each of them as a tab on overview page.

@jianjuns @antoninbas @tnqn Could you share your opinions on these two overview page design?

Actually the two cases share the same navigation bar and the navigation bar can be folded. I have updated the images.

mengdie-song
mengdie-song previously approved these changes Jul 20, 2020
@jianjuns
Copy link
Contributor

/test-all

I assume this PR is ready to be merged?

@jianjuns
Copy link
Contributor

/test-all

@ZhangYW18
Copy link
Contributor Author

/test-all

I assume this PR is ready to be merged?

Yes, it is.

@tnqn
Copy link
Member

tnqn commented Jul 22, 2020

I noticed there are some differences in tab title and link.
the name of the plugin should be "Antrea" instead of "Antrea Information";
the name of the overview page should be "Overview" instead of "Antrea Overview";
the title of the overview page should be "Antrea" instead of "Antrea Overview", but this is minor.
By clicking the plugin, the overview page should be displayed instead of an empty page.

@ZhangYW18
Copy link
Contributor Author

I noticed there are some differences in tab title and link.
the name of the plugin should be "Antrea" instead of "Antrea Information";
the name of the overview page should be "Overview" instead of "Antrea Overview";
the title of the overview page should be "Antrea" instead of "Antrea Overview", but this is minor.
By clicking the plugin, the overview page should be displayed instead of an empty page.

All fixed. Updated the image in the description as well.

log.Printf("Failed to generate content from CRD, lastTfName %v, err: %s", a.lastTfName, err)
return component.ContentResponse{}, nil
log.Printf("Failed to get latest CRD, last traceflow name: %s, err: %s", lastTf.Name, err)
log.Printf("Using traceflow results cache, traceflow name: %s", lastTf.Name)
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe we can merge these two logs into one.
@tnqn We change the logic here to handle the case that Traceflow CRD is cleaned up. But I am not sure what we want to show in this case, a blank graph or a previous traceflow graph. Could you also share your opinion here?

Copy link
Member

Choose a reason for hiding this comment

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

I don't have preference on this, both work for me.

Copy link
Contributor

Choose a reason for hiding this comment

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

OK, then we can keep the logic here for now to show the previous trace graph if we can not successfully get the CRD.

@mengdie-song
Copy link
Contributor

You can also remove target "antrea-traceflow-plugin" from Makefile in this patch.

@tnqn
Copy link
Member

tnqn commented Jul 22, 2020

The name of the Traceflow tab (the pop up window that has 4 links) should be "Traceflow" instead of "Traceflow Info".

@ZhangYW18 ZhangYW18 force-pushed the traceflow branch 2 times, most recently from 0a2caa7 to ff76dd0 Compare July 22, 2020 09:21
@ZhangYW18
Copy link
Contributor Author

The name of the Traceflow tab (the pop up window that has 4 links) should be "Traceflow" instead of "Traceflow Info".

Updated.

@ZhangYW18
Copy link
Contributor Author

You can also remove target "antrea-traceflow-plugin" from Makefile in this patch.

Updated.

@jianjuns
Copy link
Contributor

/test-all

Copy link
Contributor

@mengdie-song mengdie-song left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM, will merge after all verification done

@tnqn
Copy link
Member

tnqn commented Jul 24, 2020

/skip-windows-networkpolicy
/skip-windows-conformance

@tnqn tnqn merged commit 8088caf into antrea-io:master Jul 24, 2020
GraysonWu pushed a commit to GraysonWu/antrea that referenced this pull request Sep 22, 2020
GraysonWu pushed a commit to GraysonWu/antrea that referenced this pull request Sep 23, 2020
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.

6 participants