christianlight/tutor
6
0
Fork 0
mirror of https://github.com/ChristianLight/tutor.git synced 2024-12-13 14:43:03 +00:00
Code Issues Releases Activity

fix: Include the forum job only if RUN_FORUM is set

Browse Source 
When running "tutor k8s" we can disable the forum deployment and
service by setting RUN_FORUM to false, but the corresponding job is
added to jobs.yml unconditionally.

Add a conditional to tutor/templates/k8s/jobs.yml so that the forum
job definition is only included when RUN_FORUM is true.

Fixes #525.
This commit is contained in:
Florian Haas 2021-11-17 09:37:46 +01:00 committed by Régis Behmo
parent 0a4a2bbac2
commit 0c3a160fce
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ Note: Breaking changes between versions are indicated by "💥".
- [Feature] Add [tutor-richie](https://github.com/overhangio/tutor-richie) to the plugins that are bundled with the tutor binary. - [Feature] Add [tutor-richie](https://github.com/overhangio/tutor-richie) to the plugins that are bundled with the tutor binary.
- [Improvement] Make `tutor plugins list` print plugins sorted by name. - [Improvement] Make `tutor plugins list` print plugins sorted by name.
- [Improvement] Ignore Python plugins which cannot be loaded. - [Improvement] Ignore Python plugins which cannot be loaded.
- [Bugfix] When configured with `RUN_FORUM: false`, omit forum-related [Jobs](https://kubernetes.io/docs/concepts/workloads/controllers/job/) from the manifests that `tutor k8s` generates. (#525)
## v12.1.6 (2021-11-02) ## v12.1.6 (2021-11-02)

2
tutor/templates/k8s/jobs.yml
View File

@ -77,6 +77,7 @@ spec:
containers: containers:
- name: mysql - name: mysql
image: {{ DOCKER_IMAGE_MYSQL }} image: {{ DOCKER_IMAGE_MYSQL }}
{% if RUN_FORUM %}
--- ---
apiVersion: batch/v1 apiVersion: batch/v1
kind: Job kind: Job
@ -102,5 +103,6 @@ spec:
value: "{{ MONGODB_PORT }}" value: "{{ MONGODB_PORT }}"
- name: MONGODB_DATABASE - name: MONGODB_DATABASE
value: "{{ FORUM_MONGODB_DATABASE }}" value: "{{ FORUM_MONGODB_DATABASE }}"
{% endif %}
{{ patch("k8s-jobs") }} {{ patch("k8s-jobs") }}