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

fix(kconfig): remove kong version and edition from kconfig.js #12045

Merged
merged 1 commit into from
Nov 21, 2023

Conversation

raoxiaoyan
Copy link
Contributor

@raoxiaoyan raoxiaoyan commented Nov 16, 2023

Summary

Remove the Kong version and edition from kconfig.js
The pr of kong-manager-oss was merged.

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Full changelog

  • [Implement ...]

Issue reference

FTI-5557

Copy link
Contributor

@nekolab nekolab left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@sumimakito sumimakito left a comment

Choose a reason for hiding this comment

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

Please hold off merging this PR until the corresponding part is available in Kong Manager OSS.

@windmgc windmgc merged commit aed8c05 into master Nov 21, 2023
31 of 32 checks passed
@windmgc windmgc deleted the fix/FTI-5557 branch November 21, 2023 03:25
nekolab added a commit that referenced this pull request Nov 27, 2023
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.
windmgc pushed a commit that referenced this pull request Nov 27, 2023
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
@team-gateway-bot
Copy link
Collaborator

The backport to release/3.4.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.4.x release/3.4.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.4.x
# Create a new branch
git switch --create backport-12045-to-release/3.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 aed8c0572b064e7f0e26879f8adff7b2c355cdac
# Push it to GitHub
git push --set-upstream origin backport-12045-to-release/3.4.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.4.x

Then, create a pull request where the base branch is release/3.4.x and the compare/head branch is backport-12045-to-release/3.4.x.

@team-gateway-bot
Copy link
Collaborator

The backport to release/3.2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.2.x release/3.2.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.2.x
# Create a new branch
git switch --create backport-12045-to-release/3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 aed8c0572b064e7f0e26879f8adff7b2c355cdac
# Push it to GitHub
git push --set-upstream origin backport-12045-to-release/3.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.2.x

Then, create a pull request where the base branch is release/3.2.x and the compare/head branch is backport-12045-to-release/3.2.x.

@team-gateway-bot
Copy link
Collaborator

The backport to release/3.3.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.3.x release/3.3.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.3.x
# Create a new branch
git switch --create backport-12045-to-release/3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 aed8c0572b064e7f0e26879f8adff7b2c355cdac
# Push it to GitHub
git push --set-upstream origin backport-12045-to-release/3.3.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.3.x

Then, create a pull request where the base branch is release/3.3.x and the compare/head branch is backport-12045-to-release/3.3.x.

raoxiaoyan added a commit that referenced this pull request Dec 7, 2023
raoxiaoyan added a commit that referenced this pull request Dec 25, 2023
windmgc pushed a commit that referenced this pull request Dec 25, 2023
github-actions bot pushed a commit that referenced this pull request Dec 26, 2023
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)
github-actions bot pushed a commit that referenced this pull request Dec 26, 2023
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)
windmgc pushed a commit that referenced this pull request Dec 29, 2023
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 pushed a commit that referenced this pull request Dec 29, 2023
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
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants