Skip to content

Commit

Permalink
Remove Code and Configs for Swarm/podman support (#407)
Browse files Browse the repository at this point in the history
- remove swarm / podman support
- remove docker-compose.yml, btrixcloud.swarm package, and podman/swarm scripts from scripts/ dir-
- remove python-on-whales
- add error if not running in k8s
- remove python-on-whales
  • Loading branch information
ikreymer authored Dec 9, 2022
1 parent e2025da commit 61c63d0
Show file tree
Hide file tree
Showing 26 changed files with 10 additions and 1,370 deletions.
8 changes: 0 additions & 8 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
ARG PODMAN_VERSION=4

FROM docker.io/mgoltzsche/podman:${PODMAN_VERSION}-remote as podmanremote

FROM docker.io/library/python:3.10-slim

WORKDIR /app
Expand All @@ -10,12 +6,8 @@ ADD requirements.txt /app

RUN pip install -r requirements.txt

RUN python-on-whales download-cli

ADD btrixcloud/ /app/btrixcloud/

COPY --from=podmanremote /usr/local/bin/podman-remote /usr/bin/podman

CMD uvicorn btrixcloud.main:app_root --host 0.0.0.0 --access-log --log-level info

EXPOSE 8000
20 changes: 10 additions & 10 deletions backend/btrixcloud/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
from .colls import init_collections_api
from .crawls import init_crawls_api

from .k8s.k8sman import K8SManager


API_PREFIX = "/api"
app_root = FastAPI(
Expand Down Expand Up @@ -67,16 +69,14 @@ def main():
user_manager.set_archive_ops(archive_ops)

# pylint: disable=import-outside-toplevel
if os.environ.get("KUBERNETES_SERVICE_HOST"):
from .k8s.k8sman import K8SManager

crawl_manager = K8SManager()
else:
# from .docker.dockerman import DockerManager
# crawl_manager = DockerManager(archive_ops)
from .swarm.swarmmanager import SwarmManager

crawl_manager = SwarmManager()
if not os.environ.get("KUBERNETES_SERVICE_HOST"):
print(
"Sorry, the Browsertrix Cloud Backend must be run inside a Kubernetes environment.\
Kubernetes not detected (KUBERNETES_SERVICE_HOST is not set), Exiting"
)
sys.exit(1)

crawl_manager = K8SManager()

init_storages_api(archive_ops, crawl_manager, current_active_user)

Expand Down
Empty file.
102 changes: 0 additions & 102 deletions backend/btrixcloud/swarm/base_job.py

This file was deleted.

113 changes: 0 additions & 113 deletions backend/btrixcloud/swarm/crawl_job.py

This file was deleted.

15 changes: 0 additions & 15 deletions backend/btrixcloud/swarm/profile_job.py

This file was deleted.

Loading

0 comments on commit 61c63d0

Please sign in to comment.