Skip to content

Commit 17054b3

Browse files
HenrrypgMoisesGSalas
authored andcommitted
feat: sumac release
1 parent 17a742b commit 17054b3

File tree

8 files changed

+34
-10
lines changed

8 files changed

+34
-10
lines changed

.github/environments/minio_enabled/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
DRYDOCK_INIT_JOBS: true
22
K8S_NAMESPACE: testing-openedx
33
PLUGINS:
4+
- forum
45
- mfe
56
- drydock
67
- minio

.github/requirements.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
tutor[full]<18
1+
tutor~=19.0
2+
tutor-mfe~=19.0
3+
tutor-minio~=19.0
24
setuptools
3-
git+https://github.com/hastexo/tutor-contrib-s3@v1.4.0
5+
git+https://github.com/edunext/tutor-contrib-s3@sumac

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Python Semantic Release
1919
uses: actions/setup-python@v2
2020
with:
21-
python-version: 3.8
21+
python-version: 3.12
2222

2323
- name: Install dependencies
2424
run: |

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ appropriate one:
2929
| Maple | `>=13.2, <14` | Not supported | 0.7.x |
3030
| Nutmeg | `>=14.0, <15` | Not supported | 0.7.x |
3131
| Olive | `>=15.0, <16` | Not supported | 15.x.x |
32-
| Palm | `>=16.0, <17` | `palm` | 16.x.x |
32+
| Palm | `>=16.0, <17` | Not supported | 16.x.x |
3333
| Quince | `>=17.0, <18` | `quince` | 17.x.x |
34-
| Redwood | `>=18.0, <19` | `main` | >=18.0.0 |
34+
| Redwood | `>=18.0, <19` | `redwood` | 18.x.x |
35+
| Sumac | `>=19.0, <20` | `main` | >=19.0.0 |
3536

3637
Installation
3738
------------
@@ -57,7 +58,7 @@ The following configuration options are available:
5758
- `DRYDOCK_INIT_JOBS`: Whether run the initialization jobs or not. Defaults to `false`.
5859
- `DRYDOCK_CMS_SSO_USER`: The username of the CMS SSO user. Defaults to `cms`.
5960
- `DRYDOCK_AUTO_TLS`: Whether to use cert-manager to automatically generate TLS certificates. Defaults to `true`.
60-
- `DRYDOCK_INGRESS`: Whether to deploy an ingress for the LMS and CMS. Defaults to `false`.
61+
- `DRYDOCK_INGRESS`: Whether to deploy an ingress for the LMS and CMS. Defaults to `true`.
6162
- `DRYDOCK_INGRESS_EXTRA_HOSTS`: A list of extra hosts to add to the ingress. Defaults to `[]`.
6263
- `DRYDOCK_INGRESS_LMS_EXTRA_HOSTS`: A list of extra hosts to add to the LMS ingress. Defaults to `[]`.
6364
- `DRYDOCK_CUSTOM_CERTS`: A dictionary of custom certificates to use with cert-manager. Defaults to `{}`.

drydock/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def get_sync_waves_for_resource(resource_name: str) -> SYNC_WAVES_ORDER_ATTRS_TY
132132
"CMS_SSO_USER": "cms",
133133
"AUTO_TLS": True,
134134
"MIGRATE_FROM": 0,
135-
"INGRESS": False,
135+
"INGRESS": True,
136136
"INGRESS_EXTRA_HOSTS": [],
137137
"INGRESS_LMS_EXTRA_HOSTS": [],
138138
"NEWRELIC_LICENSE_KEY": "",

drydock/templates/drydock/k8s/ingress/cms.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,24 @@ spec:
3333
- host: {{ CMS_HOST }}
3434
http:
3535
paths:
36+
{%- for app_name, app in iter_mfes() %}
37+
{%- if app_name == "authoring" %}
38+
- pathType: Prefix
39+
path: "/course-authoring"
40+
backend:
41+
service:
42+
name: {% if DRYDOCK_BYPASS_CADDY -%}mfe{% else -%}caddy{% endif %}
43+
port:
44+
number: {% if DRYDOCK_BYPASS_CADDY -%}8002{% else -%}80{% endif %}
45+
- pathType: Prefix
46+
path: "/{{app_name}}"
47+
backend:
48+
service:
49+
name: {% if DRYDOCK_BYPASS_CADDY -%}mfe{% else -%}caddy{% endif %}
50+
port:
51+
number: {% if DRYDOCK_BYPASS_CADDY -%}8002{% else -%}80{% endif %}
52+
{%- endif %}
53+
{%- endfor %}
3654
- pathType: Prefix
3755
path: "/"
3856
backend:

drydock/templates/drydock/k8s/ingress/lms.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,15 @@ spec:
4141
port:
4242
number: {% if DRYDOCK_BYPASS_CADDY -%}8002{% else -%}80{% endif %}
4343
{% for app_name, app in iter_mfes() %}
44+
{%- if app_name != "authoring" %}
4445
- pathType: Prefix
4546
path: "/{{app_name}}"
4647
backend:
4748
service:
4849
name: {% if DRYDOCK_BYPASS_CADDY -%}mfe{% else -%}caddy{% endif %}
4950
port:
5051
number: {% if DRYDOCK_BYPASS_CADDY -%}8002{% else -%}80{% endif %}
52+
{%- endif %}
5153
{%- endfor %}
5254
- pathType: Prefix
5355
path: "/"

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "drydock"
77
dynamic = ["version"]
88
description = "A Tutor plugin to manage our opinionated Open edX operations"
99
readme = "README.md"
10-
requires-python = ">=3.8"
10+
requires-python = ">=3.9"
1111
license = { text = "AGPLv3" }
1212
authors = [
1313
{ name = "eduNEXT" }
@@ -18,18 +18,18 @@ classifiers = [
1818
"License :: OSI Approved :: GNU Affero General Public License v3",
1919
"Operating System :: OS Independent",
2020
"Programming Language :: Python",
21-
"Programming Language :: Python :: 3.8",
2221
"Programming Language :: Python :: 3.9",
2322
"Programming Language :: Python :: 3.10",
2423
"Programming Language :: Python :: 3.11",
2524
"Programming Language :: Python :: 3.12",
2625
]
2726
dependencies = [
28-
"tutor>=18.1.3,<19.0.0"
27+
"tutor>=19.0.0,<20.0.0"
2928
]
3029

3130
[project.optional-dependencies]
3231
dev = [
32+
"build",
3333
"python-semantic-release",
3434
]
3535

0 commit comments

Comments
 (0)