Skip to content

Commit

Permalink
feat: sumac release
Browse files Browse the repository at this point in the history
  • Loading branch information
Henrrypg authored and MoisesGSalas committed Dec 18, 2024
1 parent 17a742b commit 17054b3
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 10 deletions.
1 change: 1 addition & 0 deletions .github/environments/minio_enabled/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
DRYDOCK_INIT_JOBS: true
K8S_NAMESPACE: testing-openedx
PLUGINS:
- forum
- mfe
- drydock
- minio
Expand Down
6 changes: 4 additions & 2 deletions .github/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
tutor[full]<18
tutor~=19.0
tutor-mfe~=19.0
tutor-minio~=19.0
setuptools
git+https://github.com/hastexo/tutor-contrib-s3@v1.4.0
git+https://github.com/edunext/tutor-contrib-s3@sumac
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Python Semantic Release
uses: actions/setup-python@v2
with:
python-version: 3.8
python-version: 3.12

- name: Install dependencies
run: |
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ appropriate one:
| Maple | `>=13.2, <14` | Not supported | 0.7.x |
| Nutmeg | `>=14.0, <15` | Not supported | 0.7.x |
| Olive | `>=15.0, <16` | Not supported | 15.x.x |
| Palm | `>=16.0, <17` | `palm` | 16.x.x |
| Palm | `>=16.0, <17` | Not supported | 16.x.x |
| Quince | `>=17.0, <18` | `quince` | 17.x.x |
| Redwood | `>=18.0, <19` | `main` | >=18.0.0 |
| Redwood | `>=18.0, <19` | `redwood` | 18.x.x |
| Sumac | `>=19.0, <20` | `main` | >=19.0.0 |

Installation
------------
Expand All @@ -57,7 +58,7 @@ The following configuration options are available:
- `DRYDOCK_INIT_JOBS`: Whether run the initialization jobs or not. Defaults to `false`.
- `DRYDOCK_CMS_SSO_USER`: The username of the CMS SSO user. Defaults to `cms`.
- `DRYDOCK_AUTO_TLS`: Whether to use cert-manager to automatically generate TLS certificates. Defaults to `true`.
- `DRYDOCK_INGRESS`: Whether to deploy an ingress for the LMS and CMS. Defaults to `false`.
- `DRYDOCK_INGRESS`: Whether to deploy an ingress for the LMS and CMS. Defaults to `true`.
- `DRYDOCK_INGRESS_EXTRA_HOSTS`: A list of extra hosts to add to the ingress. Defaults to `[]`.
- `DRYDOCK_INGRESS_LMS_EXTRA_HOSTS`: A list of extra hosts to add to the LMS ingress. Defaults to `[]`.
- `DRYDOCK_CUSTOM_CERTS`: A dictionary of custom certificates to use with cert-manager. Defaults to `{}`.
Expand Down
2 changes: 1 addition & 1 deletion drydock/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def get_sync_waves_for_resource(resource_name: str) -> SYNC_WAVES_ORDER_ATTRS_TY
"CMS_SSO_USER": "cms",
"AUTO_TLS": True,
"MIGRATE_FROM": 0,
"INGRESS": False,
"INGRESS": True,
"INGRESS_EXTRA_HOSTS": [],
"INGRESS_LMS_EXTRA_HOSTS": [],
"NEWRELIC_LICENSE_KEY": "",
Expand Down
18 changes: 18 additions & 0 deletions drydock/templates/drydock/k8s/ingress/cms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,24 @@ spec:
- host: {{ CMS_HOST }}
http:
paths:
{%- for app_name, app in iter_mfes() %}
{%- if app_name == "authoring" %}
- pathType: Prefix
path: "/course-authoring"
backend:
service:
name: {% if DRYDOCK_BYPASS_CADDY -%}mfe{% else -%}caddy{% endif %}
port:
number: {% if DRYDOCK_BYPASS_CADDY -%}8002{% else -%}80{% endif %}
- pathType: Prefix
path: "/{{app_name}}"
backend:
service:
name: {% if DRYDOCK_BYPASS_CADDY -%}mfe{% else -%}caddy{% endif %}
port:
number: {% if DRYDOCK_BYPASS_CADDY -%}8002{% else -%}80{% endif %}
{%- endif %}
{%- endfor %}
- pathType: Prefix
path: "/"
backend:
Expand Down
2 changes: 2 additions & 0 deletions drydock/templates/drydock/k8s/ingress/lms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@ spec:
port:
number: {% if DRYDOCK_BYPASS_CADDY -%}8002{% else -%}80{% endif %}
{% for app_name, app in iter_mfes() %}
{%- if app_name != "authoring" %}
- pathType: Prefix
path: "/{{app_name}}"
backend:
service:
name: {% if DRYDOCK_BYPASS_CADDY -%}mfe{% else -%}caddy{% endif %}
port:
number: {% if DRYDOCK_BYPASS_CADDY -%}8002{% else -%}80{% endif %}
{%- endif %}
{%- endfor %}
- pathType: Prefix
path: "/"
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name = "drydock"
dynamic = ["version"]
description = "A Tutor plugin to manage our opinionated Open edX operations"
readme = "README.md"
requires-python = ">=3.8"
requires-python = ">=3.9"
license = { text = "AGPLv3" }
authors = [
{ name = "eduNEXT" }
Expand All @@ -18,18 +18,18 @@ classifiers = [
"License :: OSI Approved :: GNU Affero General Public License v3",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
]
dependencies = [
"tutor>=18.1.3,<19.0.0"
"tutor>=19.0.0,<20.0.0"
]

[project.optional-dependencies]
dev = [
"build",
"python-semantic-release",
]

Expand Down

0 comments on commit 17054b3

Please sign in to comment.