PodmanPod is a NetworkedMixin but not a ResolvableModel; PodmanPodMod…

…el is a NetworkedModel
Hadron · Feb 11, 2025 · cc958d3 · cc958d3
1 parent c40a1ed
commit cc958d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/carthage/podman/base.py b/carthage/podman/base.py
@@ -1,4 +1,4 @@
-# Copyright (C)  2022, 2023, 2024, Hadron Industries, Inc.
+# Copyright (C)  2022, 2023, 2024, 2025, Hadron Industries, Inc.
 # Carthage is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License version 3
 # as published by the Free Software Foundation. It is distributed
@@ -205,7 +205,7 @@ async def resolve_networking(self, force:bool = False):
 @inject(
     podman_pod_options=InjectionKey('podman_pod_options', _optional=NotPresent),
 )
-class PodmanPod(HasContainerHostMixin, PodmanNetworkMixin, carthage.machine.NetworkedModel, OciPod):
+class PodmanPod(HasContainerHostMixin, PodmanNetworkMixin, carthage.machine.NetworkedMixin, OciPod):
 
     #: A list of extra options to pass to pod create
     podman_pod_options = []

diff --git a/carthage/podman/modeling.py b/carthage/podman/modeling.py
@@ -1,4 +1,4 @@
-# Copyright (C)  2022, 2023, Hadron Industries, Inc.
+# Copyright (C)  2022, 2023, 2025, Hadron Industries, Inc.
 # Carthage is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License version 3
 # as published by the Free Software Foundation. It is distributed
@@ -82,12 +82,6 @@ def __init_subclass__(cls, template=False, **kwargs):
                          close=False,
                          propagate=cls.pod_name_global,
                          transclusion_overrides=cls.pod_name_global)
-            cls.add_provider(InjectionKey(carthage.machine.ResolvableModel, name=cls.name_for(), role='pod', _globally_unique=cls.pod_name_global),
-                         injector_access(InjectionKey(PodmanPod)),
-                         close=False,
-                         propagate=cls.pod_name_global,
-                         transclusion_overrides=cls.pod_name_global)
-            propagate_key(InjectionKey(carthage.machine.ResolvableModel, name=cls.name_for()+'-pod', _globally_unique=True))(cls)
             propagate_key(cls.our_key(), cls)