Skip to content

assume host mode for postgres short ports #1445

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
merged 7 commits into from
Sep 23, 2025
+146 −34
Merged

assume host mode for postgres short ports #1445

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7f751a2
assume host mode for postgres short ports
jordanstephens Sep 18, 2025
b7dedb5
include redis
jordanstephens Sep 18, 2025
b3a3043
avoid replacing app_protocol
jordanstephens Sep 19, 2025
0255976
fixup project before validate
jordanstephens Sep 19, 2025
58dcbee
fixupPort after managed service fixups
jordanstephens Sep 23, 2025
7d9d3a8
fixup mongo too; fix ingress warnings
lionello Sep 23, 2025
2366000
Merge branch 'main' into jordan/postgres-ports-default-host-mode
jordanstephens Sep 23, 2025
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
15 changes: 6 additions & 9 deletions src/pkg/cli/compose/fixup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ func FixupServices(ctx context.Context, provider client.Provider, project *compo
slices.Sort(config.Names) // sort for binary search

// Fixup ports first (which affects service name replacement by ReplaceServiceNameWithDNS)
for _, svccfg := range project.Services {
for i, port := range svccfg.Ports {
svccfg.Ports[i] = fixupPort(port)
}
}

// Fixup any pseudo services (this might create port configs, which will affect service name replacement by ReplaceServiceNameWithDNS)
for _, svccfg := range project.Services {
Expand Down Expand Up @@ -67,6 +62,10 @@ func FixupServices(ctx context.Context, provider client.Provider, project *compo
fixupLLM(&svccfg)
}

for i, port := range svccfg.Ports {
svccfg.Ports[i] = fixupPort(port)
}

// update the concrete service with the fixed up object
project.Services[svccfg.Name] = svccfg
}
Expand Down Expand Up @@ -245,8 +244,7 @@ func fixupPostgresService(svccfg *composeTypes.ServiceConfig, provider client.Pr
for i, port := range svccfg.Ports {
if port.Mode == Mode_INGRESS || port.Mode == "" {
svccfg.Ports[i].Mode = Mode_HOST
svccfg.Ports[i].Published = "" // ignore published port in host mode
svccfg.Ports[i].AppProtocol = "" // ignore app protocol in host mode
svccfg.Ports[i].Published = "" // ignore published port in host mode
}
}
}
Expand Down Expand Up @@ -315,8 +313,7 @@ func fixupRedisService(svccfg *composeTypes.ServiceConfig, provider client.Provi
for i, port := range svccfg.Ports {
if port.Mode == Mode_INGRESS || port.Mode == "" {
svccfg.Ports[i].Mode = Mode_HOST
svccfg.Ports[i].Published = "" // ignore published port in host mode
svccfg.Ports[i].AppProtocol = "" // ignore app protocol in host mode
svccfg.Ports[i].Published = "" // ignore published port in host mode
}
}
}
Expand Down
Loading