creates rollout restart route for grader setup service

src/async_nbgrader/dev-requirements.txt

@@ -16,3 +16,4 @@ sphinx-autodoc-typehints
 nbval
 requests-mock
 wheel
+

src/formgradernext/requirements.txt

@@ -58,7 +58,7 @@ ipywidgets==7.6.5
     # via jupyter
 jedi==0.18.0
     # via ipython
-jinja2==3.0.2
+jinja2==3.1.0
     # via
     #   nbconvert
     #   notebook
@@ -214,4 +214,4 @@ widgetsnbextension==3.5.2
     # via ipywidgets
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools
+# 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,9 +30,9 @@ idna==2.10
     # via requests
 itsdangerous==2.0.0
     # via flask
-jinja2==3.0.0
+jinja2==3.1.0
     # via flask
-kubernetes==12.0.1
+kubernetes==17.17.0
     # via graderservice (src/graderservice/setup.py)
 markupsafe==2.0.0
     # via jinja2
@@ -70,8 +70,8 @@ urllib3==1.26.5
     #   requests
 websocket-client==0.59.0
     # via kubernetes
-werkzeug==2.0.0
+werkzeug==2.0.2
     # via flask
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools
+# setuptools

src/graderservice/setup.py

@@ -37,7 +37,7 @@
         "flask==1.1.2",
         "flask-sqlalchemy==2.5.1",
         "gunicorn==20.0.4",
-        "kubernetes==12.0.1",
+        "kubernetes==17.17.0",
     ],  # noqa: E231
     package_data={
         "": ["*.html"],

src/illumidesk/requirements.txt

@@ -28,7 +28,7 @@ ipython-genutils==0.2.0   # via nbformat, notebook, qtconsole, traitlets
 ipython==7.23.1           # via ipykernel, ipywidgets, jupyter-console
 ipywidgets==7.6.3         # via jupyter
 jedi==0.18.0              # via ipython
-jinja2==3.0.0             # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook
+jinja2==3.1.0             # via jupyterhub, jupyterhub-kubespawner, nbconvert, notebook
 josepy==1.4.0             # via illumidesk (setup.py)
 jsonschema==3.2.0         # via jupyter-telemetry, nbformat, nbgrader
 jupyter-client==6.1.12    # via ipykernel, jupyter-console, nbgrader, notebook, qtconsole
@@ -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)
@@ -104,4 +104,4 @@ websocket-client==0.59.0  # via kubernetes
 widgetsnbextension==3.5.1  # via ipywidgets
 
 # The following packages are considered to be unsafe in a requirements file:
-# setuptools
+# setuptools

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",