feat!: support for the ulmo release

Author: MoisesGSalas

setup.py

@@ -43,8 +43,8 @@ def load_about():
     long_description=load_readme(),
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
-    install_requires=["tutor>=20.0.0,<21"],
     python_requires=">=3.10",
+    install_requires=["tutor~=21.0"],
     entry_points={"tutor.plugin.v1": ["codejail = tutorcodejail.plugin"]},
     classifiers=[
         "Development Status :: 3 - Alpha",

tutorcodejail/__about__.py

@@ -1,2 +1,2 @@
 """Helps you keep your cool when creating dozens of open edX and eduNEXT environments."""
-__version__ = "20.0.0"
+__version__ = "21.0.0"

tutorcodejail/patches/k8s-deployments

@@ -14,10 +14,13 @@ spec:
       labels:
         app.kubernetes.io/name: codejailservice
       annotations:
-        {% if CODEJAIL_ENFORCE_APPARMOR %}
-        container.apparmor.security.beta.kubernetes.io/codejailservice: "localhost/docker-edx-sandbox"
-        {% endif %}
     spec:
+      {% if CODEJAIL_ENFORCE_APPARMOR %}
+      securityContext:
+        appArmorProfile: 
+          type: Localhost
+          localhostProfile: docker-edx-sandbox
+      {% endif %}
       containers:
         - name: codejailservice
           image: {{ CODEJAIL_DOCKER_IMAGE }}
@@ -30,13 +33,6 @@ spec:
             - mountPath: /openedx/codejailservice/codejailservice/tutor.py
               name: settings-codejail
               subPath: tutor.py
-          resources:
-            limits:
-              cpu: "{{ CODEJAIL_LIMIT_CPU }}"
-              memory: "{{ CODEJAIL_LIMIT_MEMORY }}"
-            requests:
-              cpu: "{{ CODEJAIL_REQUEST_CPU }}"
-              memory: "{{ CODEJAIL_REQUEST_MEMORY }}"
       volumes:
         - name: settings-codejail
           configMap:

tutorcodejail/patches/kustomization-resources

@@ -23,9 +23,9 @@
         "ENABLE_K8S_DAEMONSET": False,
         "ENFORCE_APPARMOR": True,
         "HOST": "codejailservice",
-        "SANDBOX_PYTHON_VERSION": "3.11.9",
+        "SANDBOX_PYTHON_VERSION": "3.11.14",
         "SKIP_INIT": False,
-        "SERVICE_VERSION": "release/teak.1",
+        "SERVICE_VERSION": "{{ OPENEDX_COMMON_VERSION }}",
         "SERVICE_REPOSITORY": "https://github.com/edunext/codejailservice.git",
     },
     "overrides": {},

tutorcodejail/plugin.py

@@ -14,9 +14,9 @@ RUN apt update && \
     libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev \
     xz-utils tk-dev libffi-dev liblzma-dev python3-openssl git subversion
 ENV PYENV_ROOT=/opt/pyenv
-RUN git clone https://github.com/pyenv/pyenv $PYENV_ROOT --branch v2.4.0 --depth 1
+RUN git clone https://github.com/pyenv/pyenv $PYENV_ROOT --branch v2.6.12 --depth 1
 
-ARG CODEJAILSERVICE_PYTHON_VERSION=3.11.9
+ARG CODEJAILSERVICE_PYTHON_VERSION=3.11.14
 RUN $PYENV_ROOT/bin/pyenv install $CODEJAILSERVICE_PYTHON_VERSION
 
 ARG SANDBOX_PYTHON_VERSION="{{ CODEJAIL_SANDBOX_PYTHON_VERSION }}"
@@ -56,7 +56,7 @@ WORKDIR /var/tmp
 RUN mkdir -p common/lib/
 
 ADD $EDX_PLATFORM_REPOSITORY#$EDX_PLATFORM_VERSION:requirements/edx-sandbox/ .
-RUN pip3 install -r releases/teak.txt
+RUN pip3 install -r base.txt
 
 # Allows you to add extra pip requirements to your codejail sandbox.
 {% if CODEJAIL_EXTRA_PIP_REQUIREMENTS is defined %}
@@ -82,15 +82,16 @@ RUN groupadd -r sandbox && useradd -m -r -g sandbox sandbox && chown -R sandbox:
 
 ENV PATH=/openedx/venv/bin:${PATH}
 ENV VIRTUAL_ENV=/openedx/venv/
+ENV UWSGI_WORKERS=2
 WORKDIR /openedx/codejailservice
 
 EXPOSE 8550
-CMD uwsgi \
-    --http 0.0.0.0:8550 \
-    --thunder-lock \
-    --single-interpreter \
-    --enable-threads \
-    --processes=${UWSGI_WORKERS:-2} \
-    --buffer-size=8192 \
-    --max-requests=1000 \
-    --wsgi-file /openedx/codejailservice/wsgi.py
+
+CMD [ "uwsgi", \
+    "--http=0.0.0.0:8550", \
+    "--thunder-lock", \
+    "--single-interpreter", \
+    "--enable-threads", \
+    "--buffer-size=8192", \
+    "--max-requests=1000", \
+    "--wsgi-file=/openedx/codejailservice/wsgi.py" ]