revert WiP

Author: jkotiuk

flux_local/kustomize_controller/controller.py

@@ -26,7 +26,7 @@
 from dataclasses import dataclass
 
 from flux_local.store import Store, Status, Artifact
-from flux_local.source_controller.artifact import GitArtifact, OCIArtifact, ExternalArtifact
+from flux_local.source_controller.artifact import GitArtifact, OCIArtifact
 from flux_local.manifest import (
     NamedResource,
     Kustomization,
@@ -275,7 +275,7 @@ async def reconcile(
                     self._store.update_status(resource_id, Status.FAILED, error=msg)
                     return
 
-                if isinstance(artifact, (GitArtifact, OCIArtifact, ExternalArtifact)):
+                if isinstance(artifact, (GitArtifact, OCIArtifact)):
                     ks_path_part = kustomization.path.strip("./")
                     # Ensure Path objects are used for joining
                     resolved_path = Path(artifact.local_path)
@@ -293,7 +293,7 @@ async def reconcile(
                 else:
                     msg = (
                         f"Source artifact {source_ref_id.namespaced_name} for Kustomization {resource_id.namespaced_name} "
-                        f"is not a GitArtifact, OCIArtifact, or ExternalArtifact (type: {type(artifact).__name__})"
+                        f"is not a GitArtifact or OCIArtifact (type: {type(artifact).__name__})"
                     )
                     self._store.update_status(resource_id, Status.FAILED, error=msg)
                     return

flux_local/source_controller/__init__.py

@@ -12,5 +12,4 @@
     "SourceControllerConfig",
     "GitArtifact",
     "OCIArtifact",
-    "ExternalArtifact",
 ]

flux_local/source_controller/artifact.py

@@ -41,15 +41,3 @@ class OCIArtifact(Artifact):
 
     ref: OCIRepositoryRef | None = None
     """Information about the version of the OCI repository."""
-
-
-@dataclass(frozen=True, kw_only=True)
-class ExternalArtifact(Artifact):
-    """External artifact.
-
-    This object is written when the ExternalArtifact is reconciled. The path
-    references a local filesystem path at the specified ref of the artifact.
-    """
-
-    local_path: str
-    """Local filesystem path to the external artifact."""

flux_local/tool/selector.py

@@ -77,9 +77,9 @@ def add_selector_flags(args: ArgumentParser) -> None:
     )
     args.add_argument(
         "--sources",
-        help="Optional GitRepository, OCIRepository or ExternalArtifact"
-        "sources to restrict to e.g. `flux-system`. Can include optional"
-        "map of repository source to relative path e.g. `cluster=./k8s/`",
+        help="Optional GitRepository or OCIRepository sources to restrict "
+        "to e.g. `flux-system`. Can include optional map of repository "
+        "source to relative path e.g. `cluster=./k8s/`",
         action=SourceAppendAction,
     )
     args.add_argument(