Merge pull request #113 from helxplatform/develop

Merge develop to main

Chart.yaml

@@ -12,7 +12,7 @@ description: A Helm chart for Kubernetes
 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.
-version: 4.1.6
+version: 4.1.7
 # This is the version number of the application being deployed. This version
 # number should be incremented each time you make changes to the application.
 appVersion: 4.1.0

README.md

@@ -2,7 +2,7 @@
 
 A Helm chart for Kubernetes
 
-![Version: 4.1.6](https://img.shields.io/badge/Version-4.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.0](https://img.shields.io/badge/AppVersion-4.1.0-informational?style=flat-square)
+![Version: 4.1.7](https://img.shields.io/badge/Version-4.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.0](https://img.shields.io/badge/AppVersion-4.1.0-informational?style=flat-square)
 
 ## CI/CD
 
@@ -68,6 +68,7 @@ Additionally there is a workflow that allows bumping the chart version, if this
 | global.ambassador_mapping_name | string | `"appstore-mapping"` | specify the mapping name for ambassador |
 | global.ambassador_service_name | string | `"ambassador"` | specify the service name for ambassador |
 | global.stdnfsPvc | string | `"stdnfs"` | the name of the PVC to use for user's files |
+| graderApiUrl | string | `""` |  |
 | gunicorn.workers | int | `5` | Set the number of gunicorn workers.  (2*CPU)+1 is recommended. |
 | image.pullPolicy | string | `"IfNotPresent"` | pull policy |
 | image.repository | string | `"containers.renci.org/helxplatform/appstore"` | repository where image is located |

templates/deployment.yaml

@@ -60,6 +60,10 @@ spec:
         - name: GITEA_SERVICE_NAME
           value: {{ .Values.gitea.serviceName }}
         {{- end }} 
+        {{- if .Values.graderApiUrl }}
+        - name: GRADER_API_URL
+          value: {{ .Values.graderApiUrl }}
+        {{- end }}
         - name: GUNICORN_WORKERS
           valueFrom:
             configMapKeyRef:

values.yaml

@@ -98,6 +98,8 @@ gunicorn:
   # -- Set the number of gunicorn workers.  (2*CPU)+1 is recommended.
   workers: 5
 
+graderApiUrl: ""
+
 django:
   # -- Note that these only run on a user's primary alias.
   # If a user has [email protected] as their primary alias,