Merge Develop into Master (v1.25)

.circleci/config.yml

@@ -69,7 +69,7 @@ jobs:
 
       - run:
           name: "Tests: Run unit/integration tests (excluding e2e)"
-          command: docker compose exec django py.test src/ -m "not e2e"
+          command: docker compose exec django py.test src/
 
       # We give the name of the test files manually because we need test_auth.py to be run before the others for state.json file to be created
       # CI="true" to skip some tests that fail in the CI for now

.gitignore

@@ -24,6 +24,8 @@ src/static/generated/*
 db.sqlite3
 
 celerybeat-schedule
+celerybeat-schedule-shm
+celerybeat-schedule-wal
 celerybeat-schedule.db
 package-lock.json
 artifacts/
@@ -44,3 +46,4 @@ caddy_data/
 home_page_counters.json
 my-postgres.conf
 tests/config/state.json
+

charts/Chart.yaml

@@ -0,0 +1,34 @@
+apiVersion: v2
+name: codabench-chart
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
+
+dependencies:
+  - name: rabbitmq
+    version: "14.7.0"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
+    condition: rabbitmq.enabled
+  - name: redis
+    version: "19.5.4"
+    repository: "oci://registry-1.docker.io/bitnamicharts"
+    condition: redis.enabled

charts/templates/app-state-pvc.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ .Values.appState.pvcName }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.appState.storage }}
+  storageClassName: {{ .Values.appState.storageClass }}

charts/templates/compute-worker-deployment.yaml

@@ -0,0 +1,55 @@
+{{- range .Values.compute_worker.brokers }}
+{{- $isDefault := eq .name "default" }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: compute-worker{{ if not $isDefault }}-{{ .name }}{{ end }}
+  labels:
+    app: compute-worker
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: compute-worker
+  template:
+    metadata:
+      labels:
+        app: compute-worker
+    spec:
+      serviceAccountName: compute-worker-sa
+      containers:
+        - name: compute-worker
+          image: "{{ $.Values.compute_worker.image.repository }}:{{ $.Values.compute_worker.image.tag }}"
+          imagePullPolicy: {{ $.Values.compute_worker.image.pullPolicy | default "IfNotPresent" }}
+          command:
+            - bash
+            - -c
+            - >
+              watchmedo auto-restart -p '*.py' --recursive -- celery -A compute_worker worker -l info -Q compute-worker -n compute-worker{{ if not $isDefault }}-{{ .name }}{{ end }}@%n
+          workingDir: /app
+          env:
+            - name: BROKER_URL
+              value: "{{ if .url }}{{ .url }}{{ else }}pyamqp://{{ $.Values.env.RABBITMQ_DEFAULT_USER }}:{{ $.Values.env.RABBITMQ_DEFAULT_PASS }}@{{ $.Values.env.RABBITMQ_HOST }}:{{ $.Values.env.RABBITMQ_PORT }}//{{ end }}"
+            - name: CODALAB_IGNORE_CLEANUP_STEP
+              value: "1"
+            {{- range $key, $value := $.Values.env }}
+            - name: {{ $key }}
+              value: "{{ $value }}"
+            {{- end }}
+          resources:
+            {{- toYaml $.Values.compute_worker.resources | nindent 12 }}
+          volumeMounts:
+            - name: docker-socket
+              mountPath: /var/run/docker.sock
+            - name: codabench-storage
+              mountPath: /codabench
+      volumes:
+        - name: docker-socket
+          hostPath:
+            path: /var/run/docker.sock
+            type: Socket
+        - name: codabench-storage
+          persistentVolumeClaim:
+            claimName: {{ $.Values.compute_worker.volumes.pvcName }}
+{{- end }}

charts/templates/compute-worker-rbac.yaml

@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: compute-worker-sa
+  namespace: {{ .Release.Namespace }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: compute-worker-role
+  namespace: {{ .Release.Namespace }}
+rules:
+  - apiGroups: ["batch"]
+    resources: ["jobs"]
+    verbs: ["create", "get", "list", "watch", "delete"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list", "watch", "delete"]
+  - apiGroups: [""]
+    resources: ["pods/exec", "pods/log"]
+    verbs: ["create", "get", "list"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: compute-worker-bind
+  namespace: {{ .Release.Namespace }}
+subjects:
+  - kind: ServiceAccount
+    name: compute-worker-sa
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: Role
+  name: compute-worker-role
+  apiGroup: rbac.authorization.k8s.io

charts/templates/django-deployment.yaml

@@ -0,0 +1,41 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: django
+spec:
+  replicas: {{ .Values.django.replicas }}
+  selector:
+    matchLabels:
+      app: django
+  template:
+    metadata:
+      labels:
+        app: django
+    spec:
+      containers:
+        - name: django
+          image: "{{ .Values.django.image.repository }}:{{ .Values.django.image.tag }}"
+          imagePullPolicy: {{ .Values.django.image.pullPolicy }}
+          command:
+            - bash
+            - -c
+            - >
+              python manage.py migrate --no-input &&
+              python manage.py collectstatic --no-input &&
+              cd {{ .Values.django.workingDir }} &&
+              watchmedo auto-restart -p '*.py' --recursive --
+              python3 ./gunicorn_run.py
+          env:
+          {{- range $key, $value := .Values.env }}
+            - name: {{ $key }}
+              value: "{{ $value }}"
+          {{- end }}
+            - name: DATABASE_URL
+              value: "postgres://{{ .Values.db.username }}:{{ .Values.db.password }}@{{ .Values.db.host }}:{{ .Values.db.port }}/{{ .Values.db.name }}"
+          volumeMounts:
+            - name: app-state
+              mountPath: /app/app-state
+      volumes:
+        - name: app-state
+          persistentVolumeClaim:
+            claimName: {{ .Values.appState.pvcName }}

charts/templates/django-service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: django
+spec:
+  selector:
+    app: django
+  ports:
+    - protocol: TCP
+      port: 8000
+      targetPort: 8000
+

charts/templates/flower-deployment.yaml

@@ -0,0 +1,27 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: flower
+  labels:
+    app: flower
+spec:
+  replicas: {{ .Values.flower.replicas }}
+  selector:
+    matchLabels:
+      app: flower
+  template:
+    metadata:
+      labels:
+        app: flower
+    spec:
+      containers:
+      - name: flower
+        image: "{{ .Values.flower.image.repository }}:{{ .Values.flower.image.tag }}"
+        imagePullPolicy: {{ .Values.flower.image.pullPolicy }}
+        ports:
+        - containerPort: {{ .Values.flower.service.port }}
+        env:
+        - name: CELERY_BROKER_URL
+          value: "pyamqp://{{ .Values.env.RABBITMQ_DEFAULT_USER }}:{{ .Values.env.RABBITMQ_DEFAULT_PASS }}@{{ .Values.env.RABBITMQ_HOST }}:{{ .Values.env.RABBITMQ_PORT }}//"
+        - name: FLOWER_PORT
+          value: "{{ .Values.flower.service.port }}"

charts/templates/flower-service.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: flower
+  labels:
+    app: flower
+spec:
+  type: ClusterIP
+  ports:
+  - port: {{ .Values.flower.service.port }}
+    targetPort: 5555
+  selector:
+    app: flower

charts/templates/ingress.yaml

@@ -0,0 +1,7 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: sample-http-ingress
+spec:
+  {{- toYaml .Values.ingress.spec | nindent 2 }}
+

charts/templates/istio.yaml

@@ -0,0 +1,11 @@
+{{- if .Values.istio.enableVirtualService}}
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+  name: codabench-vs
+spec:
+  {{- toYaml .Values.istio.spec | nindent 12 }}
+
+{{- else }}
+{{- end }}
+

charts/templates/shared-pvc.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ .Values.sharedJob.pvcName }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.sharedJob.storage }}
+  storageClassName: {{ .Values.sharedJob.storageClass }}
+

charts/templates/site-worker-deployment.yaml

@@ -0,0 +1,54 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: site-worker
+  labels:
+    app: site-worker
+spec:
+  replicas: {{ .Values.siteWorker.replicas }}
+  selector:
+    matchLabels:
+      app: site-worker
+  template:
+    metadata:
+      labels:
+        app: site-worker
+        {{- if .Values.siteWorker.metadata }}
+        {{- with .Values.siteWorker.metadata.labels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+        {{- end }}
+    spec:
+      {{- with .Values.siteWorker.securityContext }}
+      securityContext:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: site-worker
+          image: "{{ .Values.siteWorker.image.repository }}:{{ .Values.siteWorker.image.tag }}"
+          imagePullPolicy: {{ .Values.siteWorker.image.pullPolicy }}
+          workingDir: {{ .Values.siteWorker.workingDir }}
+          env:
+            - name: PYTHONPATH
+              value: {{ .Values.siteWorker.workingDir }}
+            - name: DATABASE_URL
+              value: "postgres://{{ .Values.db.username }}:{{ .Values.db.password }}@{{ .Values.db.host }}:{{ .Values.db.port }}/{{ .Values.db.name }}"
+            {{- range $key, $value := .Values.env }}
+            - name: {{ $key }}
+              value: "{{ $value }}"
+            {{- end }}
+          command:
+            - bash
+            - -c
+            - >
+              watchmedo auto-restart -p '*.py' --recursive --
+              celery -A celery_config worker -B -Q site-worker -l info
+              -n site-worker@%n --concurrency={{ .Values.siteWorker.concurrency }}
+          volumeMounts:
+            - name: app-state
+              mountPath: /app/app-state
+      volumes:
+        - name: app-state
+          persistentVolumeClaim:
+            claimName: {{ .Values.siteWorker.volumes.pvcName }}
+