Skip to content

UI: Add enterprise suffix to UI version number#18542

Closed
evrowe wants to merge 1 commit intomainfrom
NET-438/add-ent-version-suffix
Closed

UI: Add enterprise suffix to UI version number#18542
evrowe wants to merge 1 commit intomainfrom
NET-438/add-ent-version-suffix

Conversation

@evrowe
Copy link
Contributor

@evrowe evrowe commented Aug 21, 2023

Description

This fix checks the Consul Binary type, and for non-Community (i.e. Enterprise) binary versions, a "+ent" suffix is added to the version number of Consul that is displayed in the UI so that operators viewing the UI can see their enterprise license reflected in the sidebar.

Testing & Reproduction steps

  1. Checkout branch of any previous release (i.e. 1.15.0)
  2. Edit ui/packages/consul-ui/config/environment.js and change line 78 to read:
CONSUL_BINARY_TYPE: env('CONSUL_BINARY_TYPE', 'ent'),
  1. run make ui-docker to build the ui image
  2. run make dev-docker
  3. clone https://github.com/WenInCode/consul-setup
  4. in the consul-setup repo go to the setups/peering directory
  5. run docker-compose up
  6. run yarn setup:peerings
  7. Go to https://localhost:8501/ui
  8. Observe the index page and note the version number in the lower right corner of the UI does not have a "+ent" suffix

Now, check out this branch and repeat the above steps 1-9.

Observe the index page and note the version number in the lower right corner of the UI now shows the version number with the "+ent" suffix appended, i.e. Consul v1.17.0+ent

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

@evrowe evrowe added the theme/ui Anything related to the UI label Aug 21, 2023
@evrowe evrowe force-pushed the NET-438/add-ent-version-suffix branch from 781773d to ef4f441 Compare August 21, 2023 22:49
This fix checks the Consul Binary type, and for non-Community (i.e.
Enterprise) binary versions, a "+ent" suffix is added to the version
number of Consul that is displayed in the UI so that operators viewing
the UI can see their enterprise license reflected in the sidebar.
@WenInCode
Copy link
Contributor

@evrowe forgot to mention this to you before. Can we move this to a branch that has a ui/ prefix. The ci checks for that to determine which tests to run.

Do we want to backport this at all?

@evrowe
Copy link
Contributor Author

evrowe commented Aug 22, 2023

@WenInCode Oh right, totally forgot about that convention! Yes I'll make that change.

I'm fine to backport to 1.16 and 1.15, was holding off on adding those labels until I converted this out of draft phase but I'll add them after I update the branch name

@evrowe
Copy link
Contributor Author

evrowe commented Aug 22, 2023

Closing in favor of #18559

@evrowe evrowe closed this Aug 22, 2023
@github-actions github-actions bot deleted the NET-438/add-ent-version-suffix branch August 29, 2025 06:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

theme/ui Anything related to the UI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants