Skip to content

Commit cd4e7f2

Browse files
authored
Remove the option to revert to overlay2 driver (#6399)
OS Agent will no longer support migrating to the overlay2 driver due to reasons explained in home-assistant/os-agent#245. Remove it from the Docker API as well.
1 parent 5d02b09 commit cd4e7f2

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

supervisor/api/docker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747
SCHEMA_MIGRATE_DOCKER_STORAGE_DRIVER = vol.Schema(
4848
{
49-
vol.Required(ATTR_STORAGE_DRIVER): vol.In(["overlayfs", "overlay2"]),
49+
vol.Required(ATTR_STORAGE_DRIVER): vol.In(["overlayfs"]),
5050
}
5151
)
5252

tests/api/test_docker.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,6 @@ async def test_api_migrate_docker_storage_driver(
118118
in coresys.resolution.suggestions
119119
)
120120

121-
# Test migration back to overlay2 (graph driver)
122-
system_service.MigrateDockerStorageDriver.calls.clear()
123-
resp = await api_client.post(
124-
"/docker/migrate-storage-driver",
125-
json={"storage_driver": "overlay2"},
126-
)
127-
assert resp.status == 200
128-
assert system_service.MigrateDockerStorageDriver.calls == [("overlay2",)]
129-
130121

131122
@pytest.mark.parametrize("os_available", ["17.0.rc1"], indirect=True)
132123
async def test_api_migrate_docker_storage_driver_invalid_backend(

tests/dbus_service_mocks/agent_system.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ def MigrateDockerStorageDriver(self, backend: "s") -> None:
3535
"""Migrate Docker storage driver."""
3636
if isinstance(self.response_migrate_docker_storage_driver, DBusError):
3737
raise self.response_migrate_docker_storage_driver # pylint: disable=raising-bad-type
38-
if backend not in ("overlayfs", "overlay2"):
38+
if backend != "overlayfs":
3939
raise DBusError(
4040
ErrorType.FAILED,
41-
f"unsupported driver: {backend} (only 'overlayfs' and 'overlay2' are supported)",
41+
f"unsupported driver: {backend} (only 'overlayfs' is currently supported)",
4242
)

0 commit comments

Comments
 (0)