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: Replace missing systemd Unit File (2.8) #13778

Merged
merged 1 commit into from
Oct 22, 2024

Conversation

curiositycasualty
Copy link
Contributor

@curiositycasualty curiositycasualty commented Oct 21, 2024

Summary

This PR fixes an issue where the systemd unit file, kong.service, had gone missing from packages produced from the 2.8 branch(es).

Checklist

  • [na] 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
  • [na] There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

Fix #KAG-5648

@curiositycasualty curiositycasualty marked this pull request as draft October 21, 2024 20:34
@curiositycasualty curiositycasualty added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Oct 21, 2024
@curiositycasualty
Copy link
Contributor Author

curiositycasualty commented Oct 21, 2024

Issue first raised (to me) in #13464

The EE cherry pick will need the explain_manifest changes expanded for non-CE platforms of that repo.

@curiositycasualty curiositycasualty marked this pull request as ready for review October 21, 2024 22:39
@team-gateway-bot team-gateway-bot added the author/community PRs from the open-source community (not Kong Inc) label Oct 21, 2024
@curiositycasualty curiositycasualty removed the author/community PRs from the open-source community (not Kong Inc) label Oct 21, 2024
@team-gateway-bot team-gateway-bot added the author/community PRs from the open-source community (not Kong Inc) label Oct 22, 2024
@windmgc windmgc merged commit b609f24 into release/2.8.x Oct 22, 2024
36 checks passed
@windmgc windmgc deleted the fix/2.8-systemd-unit branch October 22, 2024 03:57
@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for release/2.8.x: couldn't find remote ref release/2.8.x.
Please ensure that this Github repo has a branch named release/2.8.x.

@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for release/2.8.x, because it was unable to create a new branch.

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream release/2.8.x
git worktree add -d .worktree/cherry-pick-13778-to-release/2.8.x-to-upstream upstream/release/2.8.x
cd .worktree/cherry-pick-13778-to-release/2.8.x-to-upstream
git checkout -b cherry-pick-13778-to-release/2.8.x-to-upstream
ancref=$(git merge-base 930ca76e3c296fa6816fc9f37e0384b57578ffba e09e3d5cbe9a6e9660060caacb507b71e2298c54)
git cherry-pick -x $ancref..e09e3d5cbe9a6e9660060caacb507b71e2298c54

@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for release/2.8.x, 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 release/2.8.x
git worktree add -d .worktree/cherry-pick-13778-to-release/2.8.x-to-upstream upstream/release/2.8.x
cd .worktree/cherry-pick-13778-to-release/2.8.x-to-upstream
git checkout -b cherry-pick-13778-to-release/2.8.x-to-upstream
ancref=$(git merge-base 930ca76e3c296fa6816fc9f37e0384b57578ffba e09e3d5cbe9a6e9660060caacb507b71e2298c54)
git cherry-pick -x $ancref..e09e3d5cbe9a6e9660060caacb507b71e2298c54

@team-gateway-bot
Copy link
Collaborator

'git push --set-upstream upstream cherry-pick-13778-to-release/2.8.x-to-upstream' failed with exit code 1

@curiositycasualty
Copy link
Contributor Author

Upon further inspection, the systemd unit is named kong-enterprise-edition.service in EE and exists in all the images I tested already, nullifying the need for the EE cherry-pick:

for t in {kong,kong/kong-gateway}:{2.8,3.{8..4}}-ubuntu; do printf '%-50s%s\n' "${t}~" '~' | tr ' ~' '- '; podman run --user=root --platform linux/amd64 -e KONG_DATABASE=off --rm -it $t bash -c 'find / -name "kong*.service"'; done
kong:2.8-ubuntu ----------------------------------
kong:3.8-ubuntu ----------------------------------
/usr/lib/systemd/system/kong.service
kong:3.7-ubuntu ----------------------------------
/usr/lib/systemd/system/kong.service
kong:3.6-ubuntu ----------------------------------
/usr/lib/systemd/system/kong.service
kong:3.5-ubuntu ----------------------------------
/usr/lib/systemd/system/kong.service
kong:3.4-ubuntu ----------------------------------
/usr/lib/systemd/system/kong.service
kong/kong-gateway:2.8-ubuntu ---------------------
/usr/lib/systemd/system/kong-enterprise-edition.service
kong/kong-gateway:3.8-ubuntu ---------------------
/usr/lib/systemd/system/kong-enterprise-edition.service
kong/kong-gateway:3.7-ubuntu ---------------------
/usr/lib/systemd/system/kong-enterprise-edition.service
kong/kong-gateway:3.6-ubuntu ---------------------
/usr/lib/systemd/system/kong-enterprise-edition.service
kong/kong-gateway:3.5-ubuntu ---------------------
/usr/lib/systemd/system/kong-enterprise-edition.service
kong/kong-gateway:3.4-ubuntu ---------------------
/usr/lib/systemd/system/kong-enterprise-edition.service

@gchristidis
Copy link
Contributor

Is there a 2.8,x build expected soon to release this change ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author/community PRs from the open-source community (not Kong Inc) build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants