Skip to content

fix(functions): reload kong after edge runtime restart #4990

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

Merged
jgoux merged 3 commits into from
Mar 25, 2026
+20 −1
Merged

fix(functions): reload kong after edge runtime restart #4990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebc3bd7
fix(functions): reload kong after edge runtime restart
okedeji Mar 25, 2026
c641720
Merge branch 'develop' into fix/kong-dns-stale-edge-runtime
okedeji Mar 25, 2026
6352d9a
Merge branch 'develop' into fix/kong-dns-stale-edge-runtime
jgoux Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion internal/functions/serve/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,14 @@ func restartEdgeRuntime(ctx context.Context, envFilePath string, noVerifyJWT *bo
dbUrl := fmt.Sprintf("postgresql://postgres:postgres@%s:5432/postgres", utils.DbAliases[0])
// 3. Serve and log to console
fmt.Fprintln(os.Stderr, "Setting up Edge Functions runtime...")
return ServeFunctions(ctx, envFilePath, noVerifyJWT, importMapPath, dbUrl, runtimeOption, fsys)
if err := ServeFunctions(ctx, envFilePath, noVerifyJWT, importMapPath, dbUrl, runtimeOption, fsys); err != nil {
return err
}
// 4. Reload Kong to refresh DNS cache for the new Edge Runtime container IP.
if err := utils.DockerExecOnceWithStream(ctx, utils.KongId, "", nil, []string{"kong", "reload"}, os.Stderr, os.Stderr); err != nil {
fmt.Fprintln(os.Stderr, "Warning: failed to reload Kong:", err)
}
return nil
}

func ServeFunctions(ctx context.Context, envFilePath string, noVerifyJWT *bool, importMapPath string, dbUrl string, runtimeOption RuntimeOption, fsys afero.Fs) error {
Expand Down
12 changes: 12 additions & 0 deletions internal/functions/serve/serve_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,18 @@ func TestServeCommand(t *testing.T) {
Reply(http.StatusOK)
apitest.MockDockerStart(utils.Docker, utils.GetRegistryImageUrl(utils.Config.EdgeRuntime.Image), containerId)
require.NoError(t, apitest.MockDockerLogsStream(utils.Docker, containerId, 1, strings.NewReader("failed")))
// Mock kong reload after edge runtime restart
gock.New(utils.Docker.DaemonHost()).
Post("/v" + utils.Docker.ClientVersion() + "/containers/supabase_kong_test/exec").
Reply(http.StatusOK).
JSON(container.ExecCreateResponse{ID: "kong-reload"})
gock.New(utils.Docker.DaemonHost()).
Post("/v" + utils.Docker.ClientVersion() + "/exec/kong-reload/start").
Reply(http.StatusOK)
gock.New(utils.Docker.DaemonHost()).
Get("/v" + utils.Docker.ClientVersion() + "/exec/kong-reload/json").
Reply(http.StatusOK).
JSON(container.ExecInspect{ExitCode: 0})
// Run test with timeout context
err := Run(context.Background(), "", nil, "", RuntimeOption{}, fsys)
// Check error
Expand Down
Loading