Skip to content

Commit

Permalink
#58 Pass both the plugin job name and app label
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmourafiq
mmourafiq committed Mar 7, 2018
1 parent 0a74c31 commit c09f0c2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
21 changes: 12 additions & 9 deletions polyaxon/spawner/spawner.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,8 @@ def start_tensorboard(self, image, resources=None):
outputs_path = get_project_outputs_path(project_name=self.project_name)
deployment = deployments.get_deployment(
namespace=self.namespace,
name=settings.APP_LABELS_TENSORBOARD,
app=settings.APP_LABELS_TENSORBOARD,
name=self.TENSORBOARD_JOB_NAME,
project_name=self.project_name,
project_uuid=self.project_uuid,
volume_mounts=volume_mounts,
Expand All @@ -472,8 +473,8 @@ def start_tensorboard(self, image, resources=None):
role=settings.ROLE_LABELS_DASHBOARD,
type=settings.TYPE_LABELS_EXPERIMENT)
deployment_name = constants.DEPLOYMENT_NAME.format(
project_uuid=self.project_uuid, name=settings.APP_LABELS_TENSORBOARD)
deployment_labels = deployments.get_labels(name=settings.APP_LABELS_TENSORBOARD,
project_uuid=self.project_uuid, name=self.TENSORBOARD_JOB_NAME)
deployment_labels = deployments.get_labels(app=settings.APP_LABELS_TENSORBOARD,
project_name=self.project_name,
project_uuid=self.project_uuid,
role=settings.ROLE_LABELS_DASHBOARD,
Expand Down Expand Up @@ -508,7 +509,7 @@ def start_tensorboard(self, image, resources=None):

def stop_tensorboard(self):
deployment_name = constants.DEPLOYMENT_NAME.format(project_uuid=self.project_uuid,
name=settings.APP_LABELS_TENSORBOARD)
name=self.TENSORBOARD_JOB_NAME)
self.delete_deployment(name=deployment_name)
self.delete_service(name=deployment_name)
if self._use_ingress():
Expand All @@ -520,7 +521,8 @@ def get_notebook_url(self):
def get_notebook_token(self):
return get_hmac(settings.APP_LABELS_NOTEBOOK, self.project_uuid)

def get_notebook_code_volume(self):
@staticmethod
def get_notebook_code_volume():
volume = pods.get_volume(volume=constants.REPOS_VOLUME,
claim_name=settings.REPOS_CLAIM_NAME,
volume_mount=settings.REPOS_ROOT)
Expand All @@ -546,7 +548,7 @@ def start_notebook(self, image, resources=None):
volumes.append(code_volume)
volume_mounts.append(code_volume_mount)
deployment_name = constants.DEPLOYMENT_NAME.format(
project_uuid=self.project_uuid, name=settings.APP_LABELS_NOTEBOOK)
project_uuid=self.project_uuid, name=self.NOTEBOOK_JOB_NAME)
notebook_token = self.get_notebook_token()
notebook_url = self._get_proxy_url(
namespace=self.namespace,
Expand All @@ -557,7 +559,8 @@ def start_notebook(self, image, resources=None):
notebook_dir = '{}/{}'.format(notebook_dir, notebook_dir.split('/')[-1])
deployment = deployments.get_deployment(
namespace=self.namespace,
name=settings.APP_LABELS_NOTEBOOK,
app=settings.APP_LABELS_NOTEBOOK,
name=self.NOTEBOOK_JOB_NAME,
project_name=self.project_name,
project_uuid=self.project_uuid,
volume_mounts=volume_mounts,
Expand All @@ -581,7 +584,7 @@ def start_notebook(self, image, resources=None):
resources=resources,
role=settings.ROLE_LABELS_DASHBOARD,
type=settings.TYPE_LABELS_EXPERIMENT)
deployment_labels = deployments.get_labels(name=settings.APP_LABELS_NOTEBOOK,
deployment_labels = deployments.get_labels(app=settings.APP_LABELS_NOTEBOOK,
project_name=self.project_name,
project_uuid=self.project_uuid,
role=settings.ROLE_LABELS_DASHBOARD,
Expand Down Expand Up @@ -616,7 +619,7 @@ def start_notebook(self, image, resources=None):

def stop_notebook(self):
deployment_name = constants.DEPLOYMENT_NAME.format(project_uuid=self.project_uuid,
name=settings.APP_LABELS_NOTEBOOK)
name=self.NOTEBOOK_JOB_NAME)
self.delete_deployment(name=deployment_name)
self.delete_service(name=deployment_name)
if self._use_ingress():
Expand Down
11 changes: 7 additions & 4 deletions polyaxon/spawner/templates/deployments.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
from spawner.templates import pods


def get_labels(name, project_name, project_uuid, role=None, type=None):
labels = {'app': name, 'project_name': project_name, 'project_uuid': project_uuid}
def get_labels(app, project_name, project_uuid, role=None, type=None):
labels = {'app': app, 'project_name': project_name, 'project_uuid': project_uuid}
if role:
labels['role'] = role
if type:
Expand Down Expand Up @@ -50,6 +50,7 @@ def get_project_pod_spec(volume_mounts,


def get_deployment_spec(namespace,
app,
name,
project_name,
project_uuid,
Expand All @@ -64,7 +65,7 @@ def get_deployment_spec(namespace,
role=None,
type=None,
replicas=1):
labels = get_labels(name=name,
labels = get_labels(app=app,
project_name=project_name,
project_uuid=project_uuid,
role=role,
Expand All @@ -86,6 +87,7 @@ def get_deployment_spec(namespace,


def get_deployment(namespace,
app,
name,
project_name,
project_uuid,
Expand All @@ -100,7 +102,7 @@ def get_deployment(namespace,
role=None,
type=None,
replicas=1):
labels = get_labels(name=name,
labels = get_labels(app=app,
project_name=project_name,
project_uuid=project_uuid,
role=role,
Expand All @@ -110,6 +112,7 @@ def get_deployment(namespace,
labels=labels,
namespace=namespace)
spec = get_deployment_spec(namespace=namespace,
app=app,
name=name,
project_name=project_name,
project_uuid=project_uuid,
Expand Down

0 comments on commit c09f0c2

Please sign in to comment.