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

extended flux runtime ui as runtime ui to also include other gitops controllers #3742

Merged
merged 4 commits into from
Dec 29, 2023

Conversation

enekofb
Copy link
Contributor

@enekofb enekofb commented Dec 22, 2023

Closes #3741

What changed?

  • Imported runtime from wego oss
  • Duplicated runtime component in ee (as we did)
  • configured runtime behaviour out of feature flag WEAVE_GITOPS_FEATURE_GITOPS_RUNTIME

Why was this change made?

  • to extend current runtime experience beyond flux to includes other oss components like policy or tf-controllers

How was this change implemented?

  • Duplicated api endpoints
  • Duplicated ui components
  • Added feature flag to control the behaviour

How did you validate the change?

  • UI

We could see some WGE controllers in the UI

Screenshot 2023-12-22 at 17 20 09

Release notes

Documentation Changes

  • Added via helm chart reference annotations and updated documentation

Follow up

@enekofb enekofb added the enhancement New feature or request label Dec 22, 2023
@@ -48,6 +48,8 @@ extraEnvVars:
# un-comment when running under weave-gitops-enterprise under a subpath e.g /weave-gitops-enterprise
# - name: ROUTE_PREFIX
# value: /weave-gitops-enterprise
- name: WEAVE_GITOPS_FEATURE_GITOPS_RUNTIME
Copy link
Contributor Author

Choose a reason for hiding this comment

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

opted-in for internal feedback

@enekofb enekofb requested a review from a team December 22, 2023 16:51
@enekofb enekofb marked this pull request as ready for review December 22, 2023 17:00
@enekofb
Copy link
Contributor Author

enekofb commented Dec 27, 2023

controllers https://github.com/weaveworks/weave-gitops-enterprise/tree/main/docs/architecture#kubernetes-controllers

Flux is the core component for delivery gitops applications.

Flagger is the component within the Flux Ecosystem for providing advance deployment strategies or progressive delivery.

Terraform Controller is the controller that provides capabilities to manage terraform infrastructure within WGE.

Cluster Controller: provides the capability to integrate Kubernetes clusters for Weave GitOps Enterprise.

Cluster Bootstrap Controller: responsible for bootstrapping Kubernetes clusters joining Weave GitOps Enterprise with baseline capabilities like flux.

GitopsSet Controller: provides the capability to have a single definition for an application for multiple environments and a fleet of clusters.

Pipeline Controller: provides continuous delivery pipelines capabilities for Weave GitOps Enterprise.

Policy Agent: controller to enforces rego policies by controlling admission of violating resources.

@enekofb enekofb force-pushed the wge-3600-gitops-runtime branch 2 times, most recently from 97115a3 to 03370ec Compare December 27, 2023 09:15
Copy link
Contributor

@opudrovs opudrovs left a comment

Choose a reason for hiding this comment

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

The code LGTM, but I tried testing this branch and saw this error. I saw a similar error once while adding my suggestion for the OSS PR, but I could not reproduce it later. Can try making a clean build on a clean cluster.

Screenshot 2023-12-27 at 14 32 07

charts/mccp/values.yaml Outdated Show resolved Hide resolved
@opudrovs
Copy link
Contributor

Will rebuild node_modules now, maybe it will fix it.

@opudrovs
Copy link
Contributor

Still see a similar error in Chrome and Firefox (to confirm it's not caching) after rebuilding:

Screenshot 2023-12-27 at 15 20 21

Can try with a clean cluster.

@opudrovs
Copy link
Contributor

Yeah, the same error with a fresh cluster created with the reboot script with nothing else added.

@enekofb
Copy link
Contributor Author

enekofb commented Dec 27, 2023

Yeah, the same error with a fresh cluster created with the reboot script with nothing else added.

it should come due to https://github.com/weaveworks/weave-gitops-enterprise/compare/f31ae9c19d0f797bce754075af1a1c3d80195633..97115a319def0284b0ba3b9b6a12832a6b8cfd7b

checking and reverting that change

@enekofb
Copy link
Contributor Author

enekofb commented Dec 27, 2023

Yeah, the same error with a fresh cluster created with the reboot script with nothing else added.

it should come due to https://github.com/weaveworks/weave-gitops-enterprise/compare/f31ae9c19d0f797bce754075af1a1c3d80195633..97115a319def0284b0ba3b9b6a12832a6b8cfd7b

checking and reverting that change

apologies @opudrovs

have pushed the changes that should address it

Screenshot 2023-12-27 at 16 38 57

@opudrovs
Copy link
Contributor

Great, rebulding.

@opudrovs
Copy link
Contributor

opudrovs commented Dec 28, 2023

Tested the UI with the flag on and off, I guess I can see two different views and labels. Not sure why there is one more controller displayed in the Runtime UI, but guess it's expected behavior.

Screenshot 2023-12-28 at 03 28 03

Screenshot 2023-12-28 at 03 22 40

⚠️ There is a minor issue with the UI: the Runtime menu item is not highlighted when the Runtime view is selected (unlike the Flux Runtime menu item which is highlighted as expected). I wonder if the same issue is happening in OSS.

@enekofb
Copy link
Contributor Author

enekofb commented Dec 28, 2023

Tested the UI with the flag on and off, I guess I can see two different views and labels. Not sure why there is one more controller displayed in the Runtime UI, but guess it's expected behavior.

Screenshot 2023-12-28 at 03 28 03

Screenshot 2023-12-28 at 03 22 40

⚠️ There is a minor issue with the UI: the Runtime menu item is not highlighted when the Runtime view is selected (unlike the Flux Runtime menu item which is highlighted as expected). I wonder if the same issue is happening in OSS.

The new controller is the gitops enterprise app which is expected out of the labels. this ticket #3743 is the follow up to add the right labels to the controllers (which is WIP).

@enekofb
Copy link
Contributor Author

enekofb commented Dec 28, 2023

@opudrovs any suggestion on where to look around the menu highlighting issue?

@opudrovs
Copy link
Contributor

any suggestion on where to look around the menu highlighting issue?

@enekofb
I don't remember right now, need to look into it. There should be a check for the route matching somewhere (if it matches the current location, highlight it).

@enekofb
Copy link
Contributor Author

enekofb commented Dec 28, 2023

any suggestion on where to look around the menu highlighting issue?

@enekofb I don't remember right now, need to look into it. There should be a check for the route matching somewhere (if it matches the current location, highlight it).

super, i look around!

@opudrovs
Copy link
Contributor

@enekofb good luck! If this issue is happening in OSS too, I can approve the current PR and we can open a separate issue for nav item highlight.

@enekofb
Copy link
Contributor Author

enekofb commented Dec 28, 2023

Updated to latest main oss 4f785b8

and the error also seems to be fixed

Screenshot 2023-12-28 at 15 11 38

…ond flux

Signed-off-by: Eneko Fernandez <[email protected]>

Signed-off-by: Eneko Fernandez <[email protected]>
Signed-off-by: Eneko Fernandez <[email protected]>
Signed-off-by: Eneko Fernandez <[email protected]>
Co-authored-by: Olga Pudrovska <[email protected]>
Copy link
Contributor

@opudrovs opudrovs left a comment

Choose a reason for hiding this comment

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

Tested it locally and can confirm, that the Runtime item is highlighted as expected:

Screenshot 2023-12-28 at 17 51 23

Great job! ✨

@enekofb enekofb merged commit d4ad57a into main Dec 29, 2023
10 checks passed
@enekofb enekofb deleted the wge-3600-gitops-runtime branch December 29, 2023 12:31
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.

Extend Flux Runtime UI to Weave Gitops Runtime UI #3725 #4174
2 participants