Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop to main #113

Merged
merged 5 commits into from
Jun 25, 2024
Merged

Merge develop to main #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4278a6a
Add grader api url field optionally
frostyfan109 May 23, 2024
04ea942
Running helm-docs and adding updated Readme.mds if any
frostyfan109 May 29, 2024
13fd327
Merge branch 'develop' of https://github.com/helxplatform/appstore-ch…
Hoid Jun 24, 2024
cffae92
Running helm-docs and adding updated Readme.mds if any
Hoid Jun 24, 2024
8b55e04
Merge pull request #111 from helxplatform/grader-api-url
Hoid Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 |
Expand Down
4 changes: 4 additions & 0 deletions templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down