Skip to content

Conversation

ranatrk
Copy link
Contributor

@ranatrk ranatrk commented Aug 16, 2022

Issue

Fixes #1165

Description

  • Add infrstructure ref kind to cluster responce and UI
  • Add cluster icons to clusters list
    Example:
    Screenshot from 2022-08-25 15-45-31

Screenshot from 2022-08-22 10-59-23

@ranatrk ranatrk added enhancement New feature or request area/ui labels Aug 16, 2022
@ranatrk ranatrk removed the area/ui label Aug 17, 2022
@ranatrk ranatrk requested a review from a team August 17, 2022 14:25
Copy link
Contributor

@jmickey jmickey left a comment

Choose a reason for hiding this comment

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

LGTM! Looks like there might be an unintentional whitespace change in the TS imports, but otherwise it looks great!

@foot
Copy link
Collaborator

foot commented Aug 17, 2022

WRT Icons!

Copy link
Collaborator

@foot foot left a comment

Choose a reason for hiding this comment

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

This is wicked very nicely done 🙌 .

We also use prettier to do all the autoformatting, (like gofmt for go). So if using vscode you can install the prettier extension and turn on format-on-save.

@ranatrk
Copy link
Contributor Author

ranatrk commented Aug 22, 2022

@bia the changes for using the existing icons in the clusters list are added here

@foot
Copy link
Collaborator

foot commented Aug 22, 2022

cc @bia do we have an alternative icon for k8s? https://fontawesome.com/icons/steering-wheel?s=solid ?

@foot
Copy link
Collaborator

foot commented Aug 22, 2022

Let's use an unaltered version of the k8s logo.

@foot
Copy link
Collaborator

foot commented Aug 22, 2022

On the GitopsCluster object:

weave.works/cluster-kind: [`DockerCluster` | `AWSCluster` ]

Notes:

@foot
Copy link
Collaborator

foot commented Aug 22, 2022

@bia
Copy link
Contributor

bia commented Aug 22, 2022

Could we combine the infrastructure icons with the Type column somehow?

What does the bottle mean this time?

20220822cluster-table

@ranatrk
Copy link
Contributor Author

ranatrk commented Aug 22, 2022

Could we combine the infrastructure icons with the Type column somehow?

In the case of capi there will be different possible icons depending on the cluster infra ref kind. Could that be confusing to have the same type with different icons? @foot , @bia wdyt?

What does the bottle mean this time?

if the capi cluster infrstructure ref kind is DockerCluster

@foot
Copy link
Collaborator

foot commented Aug 23, 2022

Could that be confusing to have the same type with different icons?

Yes! capi/other is not that useful. So we could change the type column to show the infraRef/explict-annotation value instead. The column could be just an icon with a `title="type: DockerCluster" so we can see more on hover..

What does the bottle mean this time?

image

@bia
Copy link
Contributor

bia commented Aug 23, 2022

Let’s do it! I’m sketching this.

@bia
Copy link
Contributor

bia commented Aug 23, 2022

I'm still waiting on an answer from [email protected] to confirm that we can use a grey k8s logo, but here is my proposal, does it make sense?
20220823cluster-table

I'm using the fa6 wine bottle, which I think matches material a bit better. Is there a licencing issue with that?

@ranatrk
Copy link
Contributor Author

ranatrk commented Aug 24, 2022

Currently the kind icon is updated with the new bottle, and the icons are moved to the type column with the grey color for all. (Including the k8s logo until we receive an answer regarding the license)

@ranatrk
Copy link
Contributor Author

ranatrk commented Aug 25, 2022

The following are the icons for EKS, GKE, Kubernetes, and Kind used:
Screenshot from 2022-08-25 15-29-51
Screenshot from 2022-08-25 15-25-34
Screenshot from 2022-08-25 15-07-30
Screenshot from 2022-08-25 15-56-43

@ranatrk ranatrk requested a review from foot August 25, 2022 14:09
Copy link
Collaborator

@foot foot left a comment

Choose a reason for hiding this comment

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

Wicked! ⭐ , looking great.

@ranatrk
Copy link
Contributor Author

ranatrk commented Aug 28, 2022

Icons with tooltip showing the cluster kind
Screenshot from 2022-08-28 16-09-45
Screenshot from 2022-08-28 16-09-43

Copy link
Collaborator

@foot foot left a comment

Choose a reason for hiding this comment

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

Beaut! ✨ , this looks great!

@ranatrk ranatrk merged commit f129a7c into main Aug 30, 2022
@ranatrk ranatrk deleted the 1165-add-infraref-kind branch August 30, 2022 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[UI, BE] As a User, I can see the infra provider of the cluster in the GUI so that I have a visual cue where the cluster is provisioned
4 participants