Skip to content

Commit 81c4af3

Browse files
MoisesGSalasMoisesGSalas
authored
feat!: support teak release (#163)
* feat!: support teak release * ci: bump test requirements
1 parent 58272bf commit 81c4af3

File tree

7 files changed

+78
-39
lines changed

7 files changed

+78
-39
lines changed

‎.github/requirements.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
tutor~=19.0
2-
tutor-mfe~=19.0
3-
tutor-minio~=19.0
1+
tutor~=20.0
2+
tutor-mfe~=20.0
3+
tutor-forum~=20.0
4+
tutor-minio~=20.0
5+
tutor-notes~=20.0
6+
tutor-contrib-s3 @ git+https://github.com/edunext/tutor-contrib-s3@da2a122949b5df012d7fe6ee2a09462b3a2efb44
47
setuptools
5-
git+https://github.com/edunext/tutor-contrib-s3@sumac

‎drydock/__about__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "19.2.0"
1+
__version__ = "20.0.0"

‎drydock/patches/kustomization-resources‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
- plugins/drydock/k8s/ingress/lms.yml
99
- plugins/drydock/k8s/ingress/cms.yml
1010
- plugins/drydock/k8s/ingress/mfe.yml
11+
- plugins/drydock/k8s/ingress/meilisearch.yml
12+
- plugins/drydock/k8s/ingress/notes.yml
1113
- plugins/drydock/k8s/ingress/extra-hosts.yml
1214
- plugins/drydock/k8s/ingress/static-cache.yml
1315
{%- endif %}

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

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -101,36 +101,3 @@ spec:
101101
secretName: lms-host-tls
102102
{%- endif %}
103103
{%- endif %}
104-
---
105-
apiVersion: networking.k8s.io/v1
106-
kind: Ingress
107-
metadata:
108-
name: ingress-lms-preview
109-
namespace: {{ K8S_NAMESPACE }}
110-
annotations:
111-
{%- if DRYDOCK_AUTO_TLS and not DRYDOCK_CUSTOM_CERTS %}
112-
cert-manager.io/issuer: letsencrypt
113-
{%- endif %}
114-
spec:
115-
ingressClassName: nginx
116-
rules:
117-
- host: {{ PREVIEW_LMS_HOST }}
118-
http:
119-
paths:
120-
- pathType: Prefix
121-
path: "/"
122-
backend:
123-
service:
124-
name: {% if DRYDOCK_BYPASS_CADDY -%}lms{% else -%}caddy{% endif %}
125-
port:
126-
number: {% if DRYDOCK_BYPASS_CADDY -%}8000{% else -%}80{% endif %}
127-
{%- if DRYDOCK_AUTO_TLS or DRYDOCK_CUSTOM_CERTS %}
128-
tls:
129-
- hosts:
130-
- {{ PREVIEW_LMS_HOST }}
131-
{%- if DRYDOCK_CUSTOM_CERTS %}
132-
secretName: {{ DRYDOCK_CUSTOM_CERTS["secret_name"]|default("custom-tls-certs") }}
133-
{%- else %}
134-
secretName: lms-preview-host-tls
135-
{%- endif %}
136-
{%- endif %}

‎drydock/templates/drydock/k8s/ingress/meilisearch.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{%- if RUN_MEILISEARCH %}
2+
apiVersion: networking.k8s.io/v1
3+
kind: Ingress
4+
metadata:
5+
name: meilisearch
6+
namespace: {{ K8S_NAMESPACE }}
7+
{%- if DRYDOCK_AUTO_TLS and not DRYDOCK_CUSTOM_CERTS %}
8+
annotations:
9+
cert-manager.io/issuer: letsencrypt
10+
{%- endif %}
11+
spec:
12+
ingressClassName: nginx
13+
rules:
14+
- host: {{ MEILISEARCH_HOST }}
15+
http:
16+
paths:
17+
- pathType: Prefix
18+
path: "/"
19+
backend:
20+
service:
21+
name: {% if DRYDOCK_BYPASS_CADDY -%}meilisearch{% else -%}caddy{% endif %}
22+
port:
23+
number: {% if DRYDOCK_BYPASS_CADDY -%}7700{% else -%}80{% endif %}
24+
{%- if DRYDOCK_AUTO_TLS or DRYDOCK_CUSTOM_CERTS %}
25+
tls:
26+
- hosts:
27+
- {{ MEILISEARCH_HOST }}
28+
{%- if DRYDOCK_CUSTOM_CERTS %}
29+
secretName: {{ DRYDOCK_CUSTOM_CERTS["secret_name"]|default("custom-tls-certs") }}
30+
{%- else %}
31+
secretName: meilisearch-host-tls
32+
{%- endif %}
33+
{%- endif %}
34+
{%- endif %}

‎drydock/templates/drydock/k8s/ingress/notes.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{%- if 'notes' in PLUGINS %}
2+
apiVersion: networking.k8s.io/v1
3+
kind: Ingress
4+
metadata:
5+
name: notes
6+
namespace: {{ K8S_NAMESPACE }}
7+
{%- if DRYDOCK_AUTO_TLS and not DRYDOCK_CUSTOM_CERTS %}
8+
annotations:
9+
cert-manager.io/issuer: letsencrypt
10+
{%- endif %}
11+
spec:
12+
ingressClassName: nginx
13+
rules:
14+
- host: {{ NOTES_HOST }}
15+
http:
16+
paths:
17+
- pathType: Prefix
18+
path: "/"
19+
backend:
20+
service:
21+
name: {% if DRYDOCK_BYPASS_CADDY -%}notes{% else -%}caddy{% endif %}
22+
port:
23+
number: {% if DRYDOCK_BYPASS_CADDY -%}7700{% else -%}80{% endif %}
24+
{%- if DRYDOCK_AUTO_TLS or DRYDOCK_CUSTOM_CERTS %}
25+
tls:
26+
- hosts:
27+
- {{ NOTES_HOST }}
28+
{%- if DRYDOCK_CUSTOM_CERTS %}
29+
secretName: {{ DRYDOCK_CUSTOM_CERTS["secret_name"]|default("custom-tls-certs") }}
30+
{%- else %}
31+
secretName: notes-host-tls
32+
{%- endif %}
33+
{%- endif %}
34+
{%- endif %}

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ classifiers = [
2424
"Programming Language :: Python :: 3.12",
2525
]
2626
dependencies = [
27-
"tutor>=19.0.0,<20.0.0"
27+
"tutor~=20.0"
2828
]
2929

3030
[project.optional-dependencies]

0 commit comments

Comments
 (0)