kong icon indicating copy to clipboard operation
kong copied to clipboard

fix(cmd): lack of necessary nginx directives in kong cli nginx.conf

Open catbro666 opened this issue 2 years ago • 1 comments

Summary

This is an alternative of #10675. The primary logic keeps the same, but the inject logic is further moved forward from kong/cmd/init.lua to bin/kong so that the execution flow won't enter kong/cmd/init.lua twice.

We still keep the bin/kong a resty script because many files such as kong.conf_loader, kong.cmd.utils.process_secrets rely on ngx. If we change bin/kong into a pure lua or other language script, we need to rewrite the conf_loader and compile part logic.

FTI-4937

Checklist

  • [x] The Pull Request has tests
  • [x] There's an entry in the CHANGELOG

catbro666 avatar Jun 27 '23 08:06 catbro666

detach the "drop luasocket in cli" part to a separate PR so that this PR is easier to review. Also because these two PRs are relatively logically independent.

catbro666 avatar Jul 05 '23 09:07 catbro666

Is this needed for 3.4 (it's in the milestone)?

kikito avatar Jul 11 '23 17:07 kikito

Is this needed for 3.4 (it's in the milestone)?

@kikito Yes, I think so. it was moved from 3.3 to 3.4 because of pursuing a more generic approach.

We, @kikito, @jschmid1, and @bungle, decided to move this to 3.4. This is a rather generic problem, and we would like to pursue different approaches before committing to this. Approaches that might work in more generic fashion are:

catbro666 avatar Jul 12 '23 02:07 catbro666

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-11127-to-release/3.3.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 8a1ebba055d28f940cc19774cf5edf35f71dd149
# Push it to GitHub
git push --set-upstream origin backport-11127-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-11127-to-release/3.3.x.

team-gateway-bot avatar Sep 25 '23 13:09 team-gateway-bot

Backporting this to 3.3 since it seems this is needed in https://github.com/Kong/kong/pull/11210 (failing test complains about missing inject_confs file)

kikito avatar Sep 25 '23 13:09 kikito