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.

Sign up for GitHub

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

Jump to bottom

feat(core): Admin GUI integration #11131

Merged
merged 1 commit into from
Jul 17, 2023
Merged

feat(core): Admin GUI integration #11131

merged 1 commit into from
Jul 17, 2023

Conversation

nekolab
Copy link
Contributor

@nekolab nekolab commented Jun 27, 2023 •
edited by jira bot
Loading

Serve static assets from Kong Manager OSS

Changes include:

  • new nginx config template for static file serving
  • new configuration items under the admin_gui_* namespace
  • bundle GUI assets during the build stage
  • more CORS support for Admin API
  • tests and more tests

Summary

Checklist

Full changelog

  • [Implement ...]

Issue reference

KAG-1940

raoxiaoyan
raoxiaoyan reviewed Jun 29, 2023
View reviewed changes
.requirements Outdated Show resolved Hide resolved
raoxiaoyan
raoxiaoyan reviewed Jun 29, 2023
View reviewed changes
kong/admin_gui/init.lua Outdated Show resolved Hide resolved
@nekolab nekolab force-pushed the feat/admin-gui branch 3 times, most recently from b20f5f6 to f31037a Compare June 30, 2023 03:36
raoxiaoyan
raoxiaoyan reviewed Jul 4, 2023
View reviewed changes
kong/init.lua Outdated Show resolved Hide resolved
@nekolab nekolab force-pushed the feat/admin-gui branch 5 times, most recently from b507e27 to e70c56c Compare July 10, 2023 10:04
@Leopoldthecoder Leopoldthecoder mentioned this pull request Jul 11, 2023
Merged
@nekolab nekolab force-pushed the feat/admin-gui branch 2 times, most recently from 693d1d4 to 0b8251d Compare July 11, 2023 07:53
fffonion
fffonion reviewed Jul 12, 2023
View reviewed changes
.requirements Outdated Show resolved Hide resolved
@nekolab nekolab marked this pull request as ready for review July 13, 2023 02:00
@oowl oowl self-requested a review July 13, 2023 09:57
fffonion
fffonion approved these changes Jul 14, 2023
View reviewed changes
Copy link
Contributor

@fffonion fffonion left a comment

Choose a reason for hiding this comment

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

leaving a conditional approval: due to the size of this PR, another pair of eyes are necessary
to merge this in

oowl
oowl approved these changes Jul 14, 2023
View reviewed changes
Copy link
Member

@oowl oowl left a comment

Choose a reason for hiding this comment

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

Mostly LGTM, just need some minor adjustments.

build/repositories.bzl Outdated Show resolved Hide resolved
kong/admin_gui/init.lua Show resolved Hide resolved
@RobSerafini RobSerafini added this to the 3.4.0 milestone Jul 14, 2023
@nekolab nekolab force-pushed the feat/admin-gui branch 2 times, most recently from 27120bd to b5b6fe1 Compare July 15, 2023 08:15
@github-actions github-actions bot added the chore Not part of the core functionality of kong, but still needed label Jul 16, 2023
@nekolab nekolab force-pushed the feat/admin-gui branch 7 times, most recently from abe6d15 to 4deab44 Compare July 16, 2023 09:37
@nekolab
feat(core): Admin GUI integration
b1f8411 
Serve static assets from Canopy project

Changes include:
* new nginx config template for static file serving
* new configuration items under admin_gui_* namespace
* bundle canopy assets during the build stage
* more CORS support for Admin API
* tests and more tests
windmgc
windmgc reviewed Jul 17, 2023
View reviewed changes
kong/init.lua
@@ -1665,6 +1664,20 @@ function Kong.admin_header_filter()
--ctx.KONG_ADMIN_HEADER_FILTER_TIME = ctx.KONG_ADMIN_HEADER_FILTER_ENDED_AT - ctx.KONG_ADMIN_HEADER_FILTER_START
end

function Kong.admin_gui_kconfig_content()
local content, err = kong.cache:get(
Copy link
Member

@windmgc windmgc Jul 17, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I'm a bit concerned about this part that the kconfig.js cache will not get updated after actions like Nginx reload, if the configuration changes before reload happening, it may cause some runtime configuration error. @nekolab Could you please check this part?

Copy link
Member

Choose a reason for hiding this comment

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

Discussed offline with @nekolab and we agreed to merge this in advance to catch up with feature freeze time.

windmgc
windmgc approved these changes Jul 17, 2023
View reviewed changes
Copy link
Member

@windmgc windmgc left a comment

Choose a reason for hiding this comment

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

Please note that this needs to be carefully cherry-picked to EE since it contains lots of minor code re-arrangements and refactors.

@windmgc windmgc merged commit 892238e into master Jul 17, 2023
@windmgc windmgc deleted the feat/admin-gui branch July 17, 2023 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@raoxiaoyan raoxiaoyan raoxiaoyan left review comments

@sumimakito sumimakito sumimakito left review comments

@oowl oowl oowl approved these changes

@windmgc windmgc windmgc approved these changes

@fffonion fffonion fffonion approved these changes

Assignees

@nekolab nekolab

Labels
build/bazel changelog chore Not part of the core functionality of kong, but still needed core/admin-api core/cli core/configuration core/templates size/XXL
Projects
None yet
Milestone
3.4.0
Development

Successfully merging this pull request may close these issues.
7 participants
@nekolab @fffonion @windmgc @sumimakito @raoxiaoyan @oowl @RobSerafini