Skip to content

Commit a835a2b

Browse files
committed
chore(k8s): rebase onto post-#284 main, restore k8s extras, drop redundant provider-specific hostfactory scripts
Post-#284 rebase dropped the k8s optional-dependencies stanza and its test-k8s dep group; restore both plus the kubernetes-stubs-elephant-fork type stubs so mypy/pyright resolve the SDK. Delete src/orb/providers/k8s/hostfactory/ — its per-provider scripts hardcoded --provider-type k8s and duplicated the shared scheduler scripts under src/orb/infrastructure/scheduler/hostfactory/scripts/. The shared scripts already route to the correct provider via invoke_provider.sh, so the per-provider copies are pure duplication with a worse routing story. Lockfile regenerated.
1 parent b4a77b1 commit a835a2b

8 files changed

Lines changed: 944 additions & 327 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ test-aws = [
181181
"requests-mock>=1.11.0,<2.0.0",
182182
]
183183

184-
# k8s test dependencies — kmock HTTP-level API mock server.
185-
# kmock runs an in-process aiohttp server that mimics the Kubernetes apiserver.
184+
# Kubernetes test dependencies — kmock is an in-process HTTP-level K8s API mock.
186185
# Tests point the real kubernetes SDK client at the kmock URL so the full
187186
# client stack is exercised without a live cluster.
188187
test-k8s = [
@@ -439,7 +438,6 @@ include-package-data = true
439438
"orb.k8s_legacy.alembic" = ["alembic.ini", "script.py.mako"]
440439
"orb.k8s_legacy.alembic.versions" = ["*.py"]
441440
"orb.k8s_legacy.tests.resources" = ["*.yml", "*.tpl"]
442-
"orb.providers.k8s.hostfactory" = ["providers/k8s-hf/scripts/*.sh"]
443441

444442
[tool.setuptools.data-files]
445443
"orb_scripts" = ["src/orb/infrastructure/scheduler/hostfactory/scripts/*.sh", "src/orb/infrastructure/scheduler/hostfactory/scripts/*.bat"] # keep in sync with .project.yml build.package_root

src/orb/providers/k8s/hostfactory/__init__.py

Whitespace-only changes.

src/orb/providers/k8s/hostfactory/providers/k8s-hf/scripts/getAvailableTemplates.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/orb/providers/k8s/hostfactory/providers/k8s-hf/scripts/getRequestStatus.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/orb/providers/k8s/hostfactory/providers/k8s-hf/scripts/getReturnRequests.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/orb/providers/k8s/hostfactory/providers/k8s-hf/scripts/requestMachines.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/orb/providers/k8s/hostfactory/providers/k8s-hf/scripts/requestReturnMachines.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

uv.lock

Lines changed: 943 additions & 289 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)