Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Kubernetes container for latest releases. #306

Merged
merged 1 commit into from
Oct 11, 2022
+10 −4
Merged

Update Kubernetes container for latest releases. #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions docker/coexecutor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ RUN apt-get update \

ADD pulsar_app-*-py2.py3-none-any.whl /pulsar_app-*-py2.py3-none-any.whl

RUN pip install --upgrade setuptools && pip install pyOpenSSL --upgrade && pip install cryptography --upgrade
RUN pip install --no-cache-dir /pulsar_app-*-py2.py3-none-any.whl[galaxy_extended_metadata]
RUN pip install --upgrade 'importlib-metadata<5.0'
RUN _pulsar-configure-galaxy-cvmfs
RUN _pulsar-conda-init --conda_prefix=/pulsar_dependencies/conda
2 changes: 1 addition & 1 deletion docker/coexecutor/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ dist:
cd ../..; make dist; cp dist/pulsar*whl docker/coexecutor

docker-image:
docker build -t 'galaxy/pulsar-pod-staging:0.14.1' .
docker build -t 'galaxy/pulsar-pod-staging:0.14.15.0' .

all: dist docker-image
3 changes: 2 additions & 1 deletion pulsar/client/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,8 @@ def __init__(self, destination_params, job_id, client_manager):
ensure_pykube()
super().__init__(destination_params, job_id, client_manager)
self.instance_id = galaxy_instance_id(destination_params)
self.pulsar_container_image = destination_params.get("pulsar_container_image", "galaxy/pulsar-pod-staging:0.13.0")
# Previously working and published image... "galaxy/pulsar-pod-staging:0.13.0"
self.pulsar_container_image = destination_params.get("pulsar_container_image", "galaxy/pulsar-pod-staging:0.14.15.0")
self._default_pull_policy = pull_policy(destination_params)

def launch(
Expand Down
2 changes: 1 addition & 1 deletion pulsar/client/test/check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ def on_update(message):

self.client_manager.ensure_has_status_update_callback(on_update)

def wait(self, seconds=15):
def wait(self, seconds=120):
final_status = None
if not self.background:
i = 0
Expand Down
5 changes: 4 additions & 1 deletion test/integration_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,9 @@ def test_integration_external_rabbit(self):
**self.default_kwargs
)

# PULSAR_RABBIT_MQ_CONNECTION="amqp://guest:guest@localhost:5672"
# PULSAR_TEST_INFRASTRUCTURE_HOST="docker.for.mac.localhost"
# Setup MQ and expose it on 0.0.0.0 by setting NODE_IP_ADDRESS= to empty string
@integration_test
@skip_unless_environ("PULSAR_RABBIT_MQ_CONNECTION")
def test_integration_kubernetes(self):
Expand All @@ -260,7 +263,7 @@ def test_integration_kubernetes(self):
manager_url=message_queue_url,
inject_files_endpoint=True,
k8s_enabled=True,
container="conda/miniconda2",
container="conda/miniconda3",
remote_pulsar_app_config=remote_pulsar_app_config,
**self.default_kwargs
)
Expand Down