From 7818712d35d3374ff7fcc8b00b9140bebe9e95eb Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Wed, 21 Oct 2026 08:40:49 +0200 Subject: [PATCH] fix(run): warn about ignored uid/gid/mode for a run target scaled to zero run forces the scale of its target to one, since a container is created whatever the project says, but the warning looked the service up again in the project and skipped it when declared with `scale: 0` or `deploy.replicas: 0`. The per-service check now takes the service itself, and run hands it the copy it actually creates the container from. create and up keep skipping services scaled to zero. Signed-off-by: Nicolas De Loof --- pkg/compose/run.go | 6 ++++-- pkg/compose/secrets.go | 19 +++++++++++++------ pkg/compose/secrets_test.go | 10 ++++++++++ .../compose.yaml | 9 +++++++++ pkg/e2e/unsupported_attributes_test.go | 8 ++++++-- 5 files changed, 42 insertions(+), 10 deletions(-) diff --git a/pkg/compose/run.go b/pkg/compose/run.go index 06e327286..06e87e326 100644 --- a/pkg/compose/run.go +++ b/pkg/compose/run.go @@ -202,8 +202,10 @@ func (s *composeService) doPrepareRun(ctx context.Context, project *types.Projec return prepareRunResult{}, err } - // the run target is created here, not by create(), which only handles its dependencies - warnIgnoredFileReferences(project, []string{service.Name}) + // the run target is created here, not by create(), which only handles its + // dependencies; warn from the local copy, whose scale is forced to one: the + // project entry may be scaled to zero, which `run` does not honor + warnServiceFileReferences(project, service) created, err := s.createContainer(ctx, project, service, service.ContainerName, -1, createOpts) if err != nil { diff --git a/pkg/compose/secrets.go b/pkg/compose/secrets.go index 258f7b644..a839c79dc 100644 --- a/pkg/compose/secrets.go +++ b/pkg/compose/secrets.go @@ -97,12 +97,19 @@ func warnIgnoredFileReferences(project *types.Project, services []string) { if !ok || service.GetScale() == 0 { continue } - for _, ref := range service.Configs { - warnIgnoredFileReference(name, "configs", types.FileReferenceConfig(ref), types.FileObjectConfig(project.Configs[ref.Source])) - } - for _, ref := range service.Secrets { - warnIgnoredFileReference(name, "secrets", types.FileReferenceConfig(ref), types.FileObjectConfig(project.Secrets[ref.Source])) - } + warnServiceFileReferences(project, service) + } +} + +// warnServiceFileReferences is warnIgnoredFileReferences for a service that is +// known to get a container, whatever its scale in the project: `run` creates +// its target from a copy forced to a scale of one. +func warnServiceFileReferences(project *types.Project, service types.ServiceConfig) { + for _, ref := range service.Configs { + warnIgnoredFileReference(service.Name, "configs", types.FileReferenceConfig(ref), types.FileObjectConfig(project.Configs[ref.Source])) + } + for _, ref := range service.Secrets { + warnIgnoredFileReference(service.Name, "secrets", types.FileReferenceConfig(ref), types.FileObjectConfig(project.Secrets[ref.Source])) } } diff --git a/pkg/compose/secrets_test.go b/pkg/compose/secrets_test.go index c2e4af2a5..0b3991897 100644 --- a/pkg/compose/secrets_test.go +++ b/pkg/compose/secrets_test.go @@ -96,6 +96,16 @@ func TestWarnIgnoredFileReferences(t *testing.T) { `service "web": secrets.file-secret.uid: uid` + ignored, }) + // a run target scaled to zero in the project still gets a container, built + // from a copy with a scale of one: it is reported when handed over as such. + runTarget := project.Services["scaled-down"] + one := 1 + runTarget.Scale = &one + hook := logrustest.NewGlobal() + defer hook.Reset() + warnServiceFileReferences(project, runTarget) + assert.Equal(t, len(hook.AllEntries()), 3) + // services outside the requested set are not reported. assert.Equal(t, len(collect([]string{"other"})), 3) assert.Equal(t, len(collect([]string{"unknown"})), 0) diff --git a/pkg/e2e/testdata/TestFileReferenceOverridesWarning/compose.yaml b/pkg/e2e/testdata/TestFileReferenceOverridesWarning/compose.yaml index 235472815..4f0f74db4 100644 --- a/pkg/e2e/testdata/TestFileReferenceOverridesWarning/compose.yaml +++ b/pkg/e2e/testdata/TestFileReferenceOverridesWarning/compose.yaml @@ -25,6 +25,15 @@ services: uid: "1000" mode: 0o440 + # run-only: scaled to zero, so create/up skip it, yet `run` creates a container. + run-only: + image: alpine + scale: 0 + configs: + - source: fileconfig + uid: "1000" + mode: 0o440 + configs: fileconfig: file: ./myconfig.txt diff --git a/pkg/e2e/unsupported_attributes_test.go b/pkg/e2e/unsupported_attributes_test.go index e2f8bf5e2..66ad0ac53 100644 --- a/pkg/e2e/unsupported_attributes_test.go +++ b/pkg/e2e/unsupported_attributes_test.go @@ -75,8 +75,12 @@ func TestFileReferenceOverridesWarning(t *testing.T) { OutputContains(`service \"file-refs\": secrets.filesecret.uid`), OutputContains(`service \"file-refs\": secrets.filesecret.mode`), OutputNotContains(`secrets.filesecret.gid`), - OutputNotContains(`service \"inline-refs\"`)). + OutputNotContains(`service \"inline-refs\"`), + OutputNotContains(`service \"run-only\"`)). Step("running the service reports them too, since its container is not created by create", ComposeCmd("run", "--rm", "file-refs", "true"), - OutputContains(`service \"file-refs\": configs.fileconfig.uid`)) + OutputContains(`service \"file-refs\": configs.fileconfig.uid`)). + Step("running a service scaled to zero reports them too, since run creates its container anyway", + ComposeCmd("run", "--rm", "run-only", "true"), + OutputContains(`service \"run-only\": configs.fileconfig.uid`)) }