feat!: remove autoscaling configuration and apply miscellaneous fixes

README.rst

@@ -56,19 +56,13 @@ To customize the configuration, update the following settings in Tutor:
 
 - ``CODEJAIL_APPARMOR_DOCKER_IMAGE``: (default: ``docker.io/ednxops/codejail_apparmor_loader:latest``)
 - ``CODEJAIL_DOCKER_IMAGE``: (default: ``docker.io/ednxops/codejailservice:{{__version__}}``)
-- ``CODEJAIL_ENFORCE_APPARMOR`` (default: ``True``)
 - ``CODEJAIL_ENABLE_K8S_DAEMONSET`` (default: ``False``)
-- ``CODEJAIL_SKIP_INIT`` (default: ``False``)
+- ``CODEJAIL_ENFORCE_APPARMOR`` (default: ``True``)
+- ``CODEJAIL_EXTRA_PIP_REQUIREMENTS`` (default: ``[]``)
 - ``CODEJAIL_SANDBOX_PYTHON_VERSION`` (default: ``3.11.9``)
-- ``CODEJAIL_EXTRA_PIP_REQUIREMENTS`` (optional) A list of pip requirements to add to your sandbox.
-- ``CODEJAIL_SERVICE_VERSION`` (default: ``release/teak.1``),
 - ``CODEJAIL_SERVICE_REPOSITORY`` (default ``https://github.com/edunext/codejailservice.git```)
-
-.. code-block:: yaml
-
-    CODEJAIL_EXTRA_PIP_REQUIREMENTS:
-    - pybryt
-
+- ``CODEJAIL_SERVICE_VERSION`` (default: ``release/teak.1``),
+- ``CODEJAIL_SKIP_INIT`` (default: ``False``)
 
 Custom Image
 ~~~~~~~~~~~~

tutorcodejail/patches/k8s-deployments

@@ -30,13 +30,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:
@@ -61,7 +54,11 @@ spec:
     spec:
       containers:
       - name: apparmor-loader
-        image: google/apparmor-loader:latest
+        image: {{ CODEJAIL_APPARMOR_DOCKER_IMAGE }} 
+        command:
+          - /usr/bin/loader
+          - -logtostderr
+          - -v=2
         args:
           # Tell the loader to pull the /profiles directory every 30 seconds.
           - -poll

tutorcodejail/patches/kustomization-configmapgenerator

@@ -1,6 +1,12 @@
 - name: codejail-profile
   files:
   - plugins/codejail/apps/profiles/docker-edx-sandbox
+  options:
+    labels:
+        app.kubernetes.io/name: codejail-aa-loader
 - name: settings-codejail
   files:
   - plugins/codejail/apps/config/tutor.py
+  options:
+    labels:
+        app.kubernetes.io/name: codejailservice

tutorcodejail/plugin.py

@@ -17,24 +17,17 @@
         "SECRET_KEY": "{{ 24|random_string }}",
     },
     "defaults": {
-        "VERSION": __version__,
         "APPARMOR_DOCKER_IMAGE": "docker.io/ednxops/codejail_apparmor_loader:apparmor-3",
         "DOCKER_IMAGE": f"docker.io/ednxops/codejailservice:{__version__}",
         "ENABLE_K8S_DAEMONSET": False,
         "ENFORCE_APPARMOR": True,
+        "EXTRA_PIP_REQUIREMENTS": [],
         "HOST": "codejailservice",
         "SANDBOX_PYTHON_VERSION": "3.11.9",
-        "SKIP_INIT": False,
-        "LIMIT_CPU": "1",
-        "LIMIT_MEMORY": "1Gi",
-        "REQUEST_CPU": "512m",
-        "REQUEST_MEMORY": "512Mi",
-        "ENABLE_HPA": False,
-        "MIN_REPLICAS": 1,
-        "MAX_REPLICAS": 4,
-        "AVG_CPU": 65,
-        "SERVICE_VERSION": "release/teak.1",
         "SERVICE_REPOSITORY": "https://github.com/edunext/codejailservice.git",
+        "SERVICE_VERSION": "release/teak.1",
+        "SKIP_INIT": False,
+        "VERSION": __version__,
     },
     "overrides": {},
 }

tutorcodejail/templates/codejail/build/codejail/Dockerfile

@@ -58,10 +58,13 @@ RUN mkdir -p common/lib/
 ADD $EDX_PLATFORM_REPOSITORY#$EDX_PLATFORM_VERSION:requirements/edx-sandbox/ .
 RUN pip3 install -r releases/teak.txt
 
+{% if CODEJAIL_EXTRA_PIP_REQUIREMENTS %}
 # Allows you to add extra pip requirements to your codejail sandbox.
-{% if CODEJAIL_EXTRA_PIP_REQUIREMENTS is defined %}
-{% for extra_requirements in CODEJAIL_EXTRA_PIP_REQUIREMENTS %}RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install '{{ extra_requirements }}'
-{% endfor %}
+RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install \
+{%- for extra_requirements in CODEJAIL_EXTRA_PIP_REQUIREMENTS %}
+  '{{ extra_requirements }}' \
+{%- endfor %}
+;
 {% endif %}
 
 ##### Prod image