creates rollout restart route for grader setup service

Makefile

@@ -60,7 +60,7 @@ push-all: ## push jupyterhub images to docker hub
 	@docker push ${OWNER}/k8s-hub:${JUPYTERHUB_DOCKER_K8_TAG}
 
 test: dev ## run tests for all packages
-	${VENV_BIN}/pytest -v src/async_nbgrader
+
 	${VENV_BIN}/pytest -v src/formgradernext/tests
 	${VENV_BIN}/pytest -v src/graderservice
 	${VENV_BIN}/pytest -v src/illumidesk

src/formgradernext/requirements.txt

@@ -89,7 +89,6 @@ jupyterlab-widgets==1.0.2
     # via ipywidgets
 mako==1.1.5
     # via alembic
-markupsafe==2.0.1
     # via
     #   jinja2
     #   mako
@@ -212,6 +211,7 @@ webencodings==0.5.1
     # via bleach
 widgetsnbextension==3.5.2
     # via ipywidgets
+secretsmanager-illumidesk==0.0.2
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

src/graderservice/graderservice/graderservice.py

@@ -6,10 +6,11 @@
 from os import path
 from pathlib import Path
 from secrets import token_hex
-
 from kubernetes import client
 from kubernetes import config
 from kubernetes.config import ConfigException
+from kubernetes.client.rest import ApiException
+import time
 
 from .templates import NBGRADER_COURSE_CONFIG_TEMPLATE
 from .templates import NBGRADER_HOME_CONFIG_TEMPLATE
@@ -61,6 +62,7 @@
 nbgrader_db_name = os.environ.get("POSTGRES_NBGRADER_DB_NAME")
 
 
+
 class GraderServiceLauncher:
     def __init__(self, org_name: str, course_id: str):
         """
@@ -358,3 +360,35 @@ def update_jhub_deployment(self):
                     name="hub", namespace=NAMESPACE, body=deployment
                 )
                 logger.info(f"Jhub patch response:{api_response}")
+
+    # Restarts deployment in namespace
+    def restart_deployment(self, deployment, namespace):
+        now = datetime.utcnow()
+        now = str(now.isoformat("T") + "Z")
+        body = {
+            'spec': {
+                'template':{
+                    'metadata': {
+                        'annotations': {
+                            'kubectl.kubernetes.io/restartedAt': now
+                        }
+                    }
+                }
+            }
+        }
+        deployment_status = f'{deployment} failed to deploy to organization: {namespace}', 404
+        try:
+            restart_deployment = self.apps_v1.patch_namespaced_deployment(deployment, namespace, body, pretty='true')
+        except ApiException as e:
+            logger.error("Exception when calling AppsV1Api->read_namespaced_deployment_status: %s\n" % e)
+        except Exception as e:
+            logger.error(deployment_status, e)
+        else:
+            while restart_deployment.status.updated_replicas != restart_deployment.spec.replicas:
+                logger.info(f'Waiting for status to update for grader{deployment} to organization {namespace}')
+                time.sleep(5)
+            deployment_status = f'{deployment} successfully deployed to organization {namespace}', 200
+        return deployment_status
+
+
+

src/graderservice/graderservice/routes.py

@@ -203,6 +203,24 @@ def assignment_dir_creation(org_name: str, course_id: str, assignment_name: str)
         success=True,
         message=f"Created new assignment directory: {assignment_dir}",
     )
+@grader_setup_bp.route(
+    "/services/<org_name>/<course_id>/restart", methods=["POST"]
+)
+def restart_grader(org_name: str, course_id: str):
+    launcher = GraderServiceLauncher(org_name=org_name, course_id=course_id)
+    try:
+        restart_deployment_status = launcher.restart_deployment(f'grader-{course_id}',org_name)
+    except Exception as e:
+        logger.error(f"Error restarting grader: {e}")
+
+    logger.info(restart_deployment_status)
+    success = True if restart_deployment_status[1]==200 else False
+    return jsonify(
+        success=success,
+        message=f"{restart_deployment_status[0]}"
+    ), restart_deployment_status[1]
+
+
 
 
 @grader_setup_bp.route("/healthcheck")

src/graderservice/requirements.txt

@@ -30,11 +30,11 @@ idna==2.10
     # via requests
 itsdangerous==2.0.0
     # via flask
-jinja2==3.0.0
+jinja2==3.0.3
     # via flask
 kubernetes==12.0.1
     # via graderservice (src/graderservice/setup.py)
-markupsafe==2.0.0
+markupsafe==2.1.1
     # via jinja2
 oauthlib==3.1.0
     # via requests-oauthlib
@@ -73,5 +73,6 @@ websocket-client==0.59.0
 werkzeug==2.0.0
     # via flask
 
+secretsmanager-illumidesk==0.0.2
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

src/illumidesk/requirements.txt

@@ -37,7 +37,7 @@ jupyter-core==4.7.1       # via jupyter-client, nbconvert, nbformat, nbgrader, n
 jupyter-telemetry==0.1.0  # via jupyterhub
 jupyter==1.0.0            # via nbgrader
 jupyterhub-kubespawner==0.14.1  # via illumidesk (setup.py)
-git+git://github.com/jupyterhub/ltiauthenticator.git@71d86a9da2562df4bdcc9f374af834a172ac52d5  # via illumidesk (setup.py)
+jupyterhub-ltiauthenticator==1.3.0  # via illumidesk (setup.py)
 jupyterhub==1.4.1         # via jupyterhub-kubespawner, jupyterhub-ltiauthenticator, oauthenticator
 jupyterlab-widgets==1.0.0  # via ipywidgets
 jwcrypto==0.8             # via illumidesk (setup.py)

src/illumidesk/setup.py

@@ -38,7 +38,7 @@
     install_requires=[
         "josepy==1.4.0",
         "jupyterhub-kubespawner==0.14.1",
-        "jupyterhub-ltiauthenticator@git+git://github.com/jupyterhub/ltiauthenticator.git@71d86a9da2562df4bdcc9f374af834a172ac52d5",
+        "jupyterhub-ltiauthenticator==1.3.0",
         "jwcrypto==0.8",
         "nbgrader==0.6.2",
         "oauthlib==3.1",