Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix(project): allow manual updates for updater-disabled services (#4430)
Kyle Mendell2dff9e41a86d
diff --git a/backend/go.mod b/backend/go.modindex 4c3763ca9..7b2a41ac0 100644--- a/backend/go.mod+++ b/backend/go.mod@@ -67,13 +67,13 @@ require (go.getarcane.app/acfs v0.6.2go.getarcane.app/builds v0.4.4go.getarcane.app/docker v0.1.0- go.getarcane.app/docker/compat v0.1.2+ go.getarcane.app/docker/compat v0.1.3go.getarcane.app/docker/convert v0.3.4- go.getarcane.app/kit v0.4.0+ go.getarcane.app/kit v0.4.1go.getarcane.app/streams v0.4.5go.getarcane.app/sys/cgroup v0.2.4go.getarcane.app/sys/crypto v0.3.0- go.getarcane.app/updater v0.11.6+ go.getarcane.app/updater v0.11.7go.opentelemetry.io/contrib/bridges/otelslog v0.21.0go.opentelemetry.io/contrib/exporters/autoexport v0.72.0go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.72.0diff --git a/backend/go.sum b/backend/go.sumindex 0a49d3841..f56b925e5 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -759,20 +759,20 @@ go.getarcane.app/builds v0.4.4 h1:r9e97gmG2vic6kZB1UfTp9vSpqb1nPYA6CBlbaCvH64=go.getarcane.app/builds v0.4.4/go.mod h1:8B6z4dKZqE36Y+Rpudx7AIL3BXeIoqsMgrJQepRKeds=go.getarcane.app/docker v0.1.0 h1:iUhl7amZsdAE4p2efVRd0i1tw1Vl9i1VgFqdBAf90S8=go.getarcane.app/docker v0.1.0/go.mod h1:uGxT363iZM6n2WLXCz2T0ejCP/8xInuJNzXnySLe+pc=-go.getarcane.app/docker/compat v0.1.2 h1:B1xx0iU4J+BKlrK+QVO0+axXfDBzK/tUPUDQtRtDcuY=-go.getarcane.app/docker/compat v0.1.2/go.mod h1:vDKmRqX9ktTFDeR7M+IPxNNPtIgo02x2h5WMxlFv5LE=+go.getarcane.app/docker/compat v0.1.3 h1:agAdsk22BYDMjJ5mNNAC88wK9GjdrphL6NXeCgr4nWI=+go.getarcane.app/docker/compat v0.1.3/go.mod h1:4vCz2r5A2pci3mRJYFS9ZWLASTO50KE9mBKKK7ezSyY=go.getarcane.app/docker/convert v0.3.4 h1:S5lph5rskjv+DAEdvJ03TNuFh6DOgcH6Lb5xbH2xRBE=go.getarcane.app/docker/convert v0.3.4/go.mod h1:QuGCXstmM/3cPVZse0sPe3RSZ/Hkj6M7zV3UDpWdxJo=-go.getarcane.app/kit v0.4.0 h1:3PqyAmBfp07ZOK1ztCwS6vuOzQKFtXeMbk+P0oxhIK4=-go.getarcane.app/kit v0.4.0/go.mod h1:KTjbXTEeC3i9e1QxZowDJWjFyABlD6UF3ISVtoIZs10=+go.getarcane.app/kit v0.4.1 h1:WJJJQwd5bHlEPiHqCK00Ca2CrXuPLGkKpN1CGXDTd3I=+go.getarcane.app/kit v0.4.1/go.mod h1:8mwoqd7J3vV2FzAZyBdMQ8y0qVTGIebmGxMHHsg2Mg0=go.getarcane.app/streams v0.4.5 h1:F4h+yYqICn6GmW1yeBoxHFNkDGcWg6/0XGWPMmp5yBU=go.getarcane.app/streams v0.4.5/go.mod h1:Og1Zb9NlWoNX2EYfEheneoKnJaONoCJtFE5j3KHtL7w=go.getarcane.app/sys/cgroup v0.2.4 h1:8gwVZENjddDZmWU2LxTFEZnxHYC9pY0YZhk8f3Woup0=go.getarcane.app/sys/cgroup v0.2.4/go.mod h1:hJyCjpx04VcaaSvkRsMvZl5OLUlAQ60K5gEy1ctuU4U=go.getarcane.app/sys/crypto v0.3.0 h1:vuPTlS7yIkXsfEfJcQ6jzoWoMEQ97DP/fmCZ3Pom73U=go.getarcane.app/sys/crypto v0.3.0/go.mod h1:Rxnq1pb5HVSoJ4VKmL6LZGCrztMONaypXKc8Zg0BMhE=-go.getarcane.app/updater v0.11.6 h1:FihBTpi2fJDkO+coPn3HtIXnUQ/dMZop15tneNN7UEQ=-go.getarcane.app/updater v0.11.6/go.mod h1:sgPhG9mVT63NHgmO1exR9vN6B/7L7sgNr3PrER1RLeQ=+go.getarcane.app/updater v0.11.7 h1:LbpdGpMA+66poomi+yxVst71WKjVv7mWR+VZTFG+pnM=+go.getarcane.app/updater v0.11.7/go.mod h1:Ufwp9O3RoRuEQmYrOI9Bt4NjQpj9NQhDf55By8g8d30=go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=diff --git a/backend/internal/project/children/update/service.go b/backend/internal/project/children/update/service.goindex c8bda4e06..8863c1926 100644--- a/backend/internal/project/children/update/service.go+++ b/backend/internal/project/children/update/service.go@@ -552,8 +552,6 @@ func (s *Service) ImageChanges(ctx context.Context, effective *types.Project, gicontinue}switch {- case policy.IsUpdateDisabled(service.Labels):- return nil, fmt.Errorf("updates are disabled for service %s", service.Name)case service.Build != nil:return nil, fmt.Errorf("tag discovery is unsupported for locally built service %s", service.Name)case gitOpsManaged:diff --git a/backend/internal/project/service_test.go b/backend/internal/project/service_test.goindex 6c5bf898a..c7a920ec7 100644--- a/backend/internal/project/service_test.go+++ b/backend/internal/project/service_test.go@@ -9042,7 +9042,6 @@ func TestProjectServiceManualUpdateRejectsUnsafeTagPolicies(t *testing.T) {name stringchange func(*types.ServiceConfig)}{- {name: "disabled", change: func(s *types.ServiceConfig) { s.Labels[labels.LabelUpdater] = "false" }},{name: "invalid constraint", change: func(s *types.ServiceConfig) { s.Labels[labels.LabelUpdateConstraint] = "not semver" }},{name: "local build", change: func(s *types.ServiceConfig) { s.Build = &types.BuildConfig{Context: "."} }},{name: "digest pin", change: func(s *types.ServiceConfig) { s.Image = "app@sha256:" + strings.Repeat("a", 64) }},diff --git a/backend/internal/updater/service.go b/backend/internal/updater/service.goindex f93d2a769..fd8a2eca2 100644--- a/backend/internal/updater/service.go+++ b/backend/internal/updater/service.go@@ -524,8 +524,8 @@ func (s *UpdaterService) runSingleContainerUpdate(ctx context.Context, containerreturn out, ctxErr}- // The caller picked this container, so the autoUpdateExcludedContainers setting does not- // apply here; labels and immutable references still do.+ // The caller picked this container, so the autoUpdateExcludedContainers setting and the+ // updater opt-out label do not apply here; immutable references still do.moduleResult, err := s.engine.UpdateContainer(ctx, containerID, updater.Options{IgnoreSettingsExclusions: true})if moduleResult != nil {out = resultFromModule(moduleResult)diff --git a/cli/go.mod b/cli/go.modindex 6fdf7a52f..f0f9961a8 100644--- a/cli/go.mod+++ b/cli/go.mod@@ -29,7 +29,7 @@ require (go.getarcane.app/acfs v0.6.2go.getarcane.app/builds v0.4.4go.getarcane.app/docker v0.1.0- go.getarcane.app/kit v0.4.0+ go.getarcane.app/kit v0.4.1go.yaml.in/yaml/v4 v4.0.0-rc.6google.golang.org/protobuf v1.36.12)diff --git a/cli/go.sum b/cli/go.sumindex ea61c2707..f67f65f58 100644--- a/cli/go.sum+++ b/cli/go.sum@@ -409,8 +409,8 @@ go.getarcane.app/builds v0.4.4 h1:r9e97gmG2vic6kZB1UfTp9vSpqb1nPYA6CBlbaCvH64=go.getarcane.app/builds v0.4.4/go.mod h1:8B6z4dKZqE36Y+Rpudx7AIL3BXeIoqsMgrJQepRKeds=go.getarcane.app/docker v0.1.0 h1:iUhl7amZsdAE4p2efVRd0i1tw1Vl9i1VgFqdBAf90S8=go.getarcane.app/docker v0.1.0/go.mod h1:uGxT363iZM6n2WLXCz2T0ejCP/8xInuJNzXnySLe+pc=-go.getarcane.app/kit v0.4.0 h1:3PqyAmBfp07ZOK1ztCwS6vuOzQKFtXeMbk+P0oxhIK4=-go.getarcane.app/kit v0.4.0/go.mod h1:KTjbXTEeC3i9e1QxZowDJWjFyABlD6UF3ISVtoIZs10=+go.getarcane.app/kit v0.4.1 h1:WJJJQwd5bHlEPiHqCK00Ca2CrXuPLGkKpN1CGXDTd3I=+go.getarcane.app/kit v0.4.1/go.mod h1:8mwoqd7J3vV2FzAZyBdMQ8y0qVTGIebmGxMHHsg2Mg0=go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.71.0 h1:B2h3uqicet1CT2N5TOFhS+Gq++9i0/CLmaxvhmhtP5s=