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(admin-api): add gateway edition info to the endpoint / #12097

Merged
merged 1 commit into from
Nov 27, 2023
Merged

feat(admin-api): add gateway edition info to the endpoint / #12097

merged 1 commit into from
Nov 27, 2023

Conversation

nekolab
Copy link
Contributor

@nekolab nekolab commented Nov 27, 2023 •
edited
Loading

this commit is the follow-up change to the PR #12045, since the the edition info is still useful to the kong manager, we choose to introduce the gateway edition information in the response of the / endpoint.

Since Kong Manager OSS was first introduced in version 3.4, we need to backport this PR to all versions from 3.4 onwards.

Summary

Checklist

Full changelog

  • [Implement ...]

Issue reference

Fix FTI-5557

@nekolab nekolab marked this pull request as ready for review November 27, 2023 03:43
@sumimakito sumimakito added this to the 3.6.0 milestone Nov 27, 2023
@nekolab
feat(admin-api): add gateway edition info to the endpoint /
16db369 
this commit is the follow-up change to the PR #12045,
since the the edition info is still useful to the kong manager, we choose to
introduce the gateway edition information in the response of the `/` endpoint.
@nekolab nekolab force-pushed the chore/add-edition-info branch from 0550c64 to 16db369 Compare November 27, 2023 06:21
@nekolab nekolab changed the title chore(admin-api): add gateway edition info to the endpoint / feat(admin-api): add gateway edition info to the endpoint / Nov 27, 2023
nekolab added a commit to Kong/kong-manager that referenced this pull request Nov 27, 2023
@nekolab
fix: temporary skip ee tests
4318bdd 
the gateway edition detection was not functional due to PR Kong/kong-ee#7290,
we need disable the ee-related tests until Kong/kong#12097 get merged.
@nekolab nekolab mentioned this pull request Nov 27, 2023
Merged
nekolab added a commit to Kong/kong-manager that referenced this pull request Nov 27, 2023
@nekolab
fix: temporary skip ee tests (#130)
5d3aae3 
the gateway edition detection was not functional due to PR Kong/kong-ee#7290,
we need disable the ee-related tests until Kong/kong#12097 get merged.
@windmgc windmgc merged commit c014727 into master Nov 27, 2023
28 checks passed
@windmgc windmgc deleted the chore/add-edition-info branch November 27, 2023 07:08
@nekolab nekolab added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Dec 25, 2023
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-12097-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-12097-to-master-to-upstream
git checkout -b cherry-pick-12097-to-master-to-upstream
ancref=$(git merge-base 53d50e740badb59caa67ee002edfddb8396fbc24 16db369bd77e866008b7e79f1b4a42dbd386978a)
git cherry-pick -x $ancref..16db369bd77e866008b7e79f1b4a42dbd386978a

@team-gateway-bot
Copy link
Collaborator

Git push to origin failed for release/3.4.x with exitcode 1

@team-gateway-bot team-gateway-bot mentioned this pull request Dec 26, 2023
Closed
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-12097-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-12097-to-master-to-upstream
git checkout -b cherry-pick-12097-to-master-to-upstream
ancref=$(git merge-base 53d50e740badb59caa67ee002edfddb8396fbc24 16db369bd77e866008b7e79f1b4a42dbd386978a)
git cherry-pick -x $ancref..16db369bd77e866008b7e79f1b4a42dbd386978a

github-actions bot pushed a commit that referenced this pull request Dec 26, 2023
@nekolab @github-actions
feat(admin-api): add gateway edition info to the endpoint / (#12097)
70aada9 
This commit is the follow-up change to the PR #12045,
since the the edition info is still useful to the kong manager, we choose to
introduce the gateway edition information in the response of the `/` endpoint.

Fix FTI-5557

(cherry picked from commit c014727)
@team-gateway-bot
Copy link
Collaborator

Successfully created backport PR for release/3.4.x:

@team-gateway-bot team-gateway-bot mentioned this pull request Dec 26, 2023
Merged
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-12097-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-12097-to-master-to-upstream
git checkout -b cherry-pick-12097-to-master-to-upstream
ancref=$(git merge-base 53d50e740badb59caa67ee002edfddb8396fbc24 16db369bd77e866008b7e79f1b4a42dbd386978a)
git cherry-pick -x $ancref..16db369bd77e866008b7e79f1b4a42dbd386978a

@team-gateway-bot
Copy link
Collaborator

Git push to origin failed for release/3.5.x with exitcode 1

github-actions bot pushed a commit that referenced this pull request Dec 26, 2023
@nekolab @github-actions
feat(admin-api): add gateway edition info to the endpoint / (#12097)
55daa46 
This commit is the follow-up change to the PR #12045,
since the the edition info is still useful to the kong manager, we choose to
introduce the gateway edition information in the response of the `/` endpoint.

Fix FTI-5557

(cherry picked from commit c014727)
@team-gateway-bot
Copy link
Collaborator

Successfully created backport PR for release/3.5.x:

windmgc pushed a commit that referenced this pull request Dec 29, 2023
@nekolab @windmgc
feat(admin-api): add gateway edition info to the endpoint / (#12097)
a130dc0 
This commit is the follow-up change to the PR #12045,
since the the edition info is still useful to the kong manager, we choose to
introduce the gateway edition information in the response of the `/` endpoint.

Fix FTI-5557

(cherry picked from commit c014727)
@raoxiaoyan raoxiaoyan mentioned this pull request Dec 29, 2023
Merged
raoxiaoyan pushed a commit that referenced this pull request Dec 29, 2023
@nekolab @raoxiaoyan
feat(admin-api): add gateway edition info to the endpoint / (#12097)
3be9fb2 
This commit is the follow-up change to the PR #12045,
since the the edition info is still useful to the kong manager, we choose to
introduce the gateway edition information in the response of the `/` endpoint.

Fix FTI-5557
AndyZhang0707 pushed a commit that referenced this pull request Jan 2, 2024
@nekolab @AndyZhang0707
feat(admin-api): add gateway edition info to the endpoint / (#12097)
a26b670 
This commit is the follow-up change to the PR #12045,
since the the edition info is still useful to the kong manager, we choose to
introduce the gateway edition information in the response of the `/` endpoint.

Fix FTI-5557
This was referenced Jan 24, 2024
Closed
Draft
@Guaris Guaris mentioned this pull request Feb 12, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Leopoldthecoder Leopoldthecoder Leopoldthecoder approved these changes

@sumimakito sumimakito sumimakito approved these changes

@windmgc windmgc windmgc approved these changes

Assignees

@nekolab nekolab

Labels
cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee core/admin-api size/XS
Projects
None yet
Milestone
3.6.0
Development

Successfully merging this pull request may close these issues.
5 participants
@nekolab @team-gateway-bot @windmgc @sumimakito @Leopoldthecoder