From 60d539269c9fe99fcc94ec04f25a61745230d965 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 20 Oct 2022 09:59:21 +0200
Subject: [PATCH] quadlet: Drop the SocketActivated key

This was added in the old quadlet to work around issues with podman
not passing on notify fds and pids. However, these are now fixed with:

https://github.com/containers/podman/pull/11316
https://github.com/openSUSE/catatonit/pull/15

So, remove this key (which was never in a podman release anyway)

Signed-off-by: Alexander Larsson <alexl@redhat.com>
---
 pkg/systemd/quadlet/quadlet.go             | 14 --------------
 test/e2e/quadlet/socketactivated.container |  9 ---------
 test/e2e/quadlet_test.go                   |  1 -
 3 files changed, 24 deletions(-)
 delete mode 100644 test/e2e/quadlet/socketactivated.container

diff --git a/pkg/systemd/quadlet/quadlet.go b/pkg/systemd/quadlet/quadlet.go
index 090118b96e6a..6709797f0aa3 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/socketactivated.container b/test/e2e/quadlet/socketactivated.container
deleted file mode 100644
index f8ed22f69f6f..000000000000
--- a/test/e2e/quadlet/socketactivated.container
+++ /dev/null
@@ -1,9 +0,0 @@
-## assert-podman-args --preserve-fds=1
-## assert-podman-args --env LISTEN_FDS=1
-## assert-podman-args --env LISTEN_PID=2
-## assert-key-is "Service" "Type" "notify"
-## assert-key-is "Service" "NotifyAccess" "all"
-
-[Container]
-Image=localhost/imagename
-SocketActivated=yes
diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go
index eae0b6fd8903..c8e55abaa2de 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("shortname.container", "shortname.container"),
 		Entry("timezone.container", "timezone.container"),
 		Entry("user.container", "user.container"),