diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go index 090118b96e..6709797f0a 100644 --- a/pkg/systemd/quadlet/quadlet.go +++ b/pkg/systemd/quadlet/quadlet.go @@ -56,7 +56,6 @@ const ( KeyRemapUIDRanges = "RemapUidRanges" KeyRemapGIDRanges = "RemapGidRanges" KeyNotify = "Notify" - KeySocketActivated = "SocketActivated" KeyExposeHostPort = "ExposeHostPort" KeyPublishPort = "PublishPort" KeyKeepID = "KeepId" @@ -89,7 +88,6 @@ var supportedContainerKeys = map[string]bool{ KeyRemapUIDRanges: true, KeyRemapGIDRanges: true, KeyNotify: true, - KeySocketActivated: true, KeyExposeHostPort: true, KeyPublishPort: true, KeyKeepID: true, @@ -428,18 +426,6 @@ func ConvertContainer(container *parser.UnitFile, isUser bool) (*parser.UnitFile podman.add("--read-only-tmpfs=false") } - socketActivated := container.LookupBoolean(ContainerGroup, KeySocketActivated, false) - if socketActivated { - // TODO: This will not be needed with later podman versions that support activation directly: - // https://github.com/containers/podman/pull/11316 - podman.add("--preserve-fds=1") - podmanEnv["LISTEN_FDS"] = "1" - - // TODO: This will not be 2 when catatonit forwards fds: - // https://github.com/openSUSE/catatonit/pull/15 - podmanEnv["LISTEN_PID"] = "2" - } - defaultContainerUID := uint32(0) defaultContainerGID := uint32(0) diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go index 7b86308d0f..6cd30faa07 100644 --- a/test/e2e/quadlet_test.go +++ b/test/e2e/quadlet_test.go @@ -287,7 +287,6 @@ var _ = Describe("quadlet system generator", func() { Entry("readonly-notmpfs.container", "readonly-notmpfs.container"), Entry("readwrite.container", "readwrite.container"), Entry("readwrite-notmpfs.container", "readwrite-notmpfs.container"), - Entry("socketactivated.container", "socketactivated.container"), Entry("timezone.container", "timezone.container"), Entry("user.container", "user.container"), Entry("user-host.container", "user-host.container"),